From 7fbf6f401173cb7bc52efc2790cd4a9b45f97282 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 4 May 2016 11:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=BA=8C=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_show_newstyle.html.erb | 29 +++++++++------- .../_show_sub_document_newstyle.html.erb | 33 +++---------------- public/stylesheets/org2.css | 26 ++++++++++++--- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/app/views/sub_document_comments/_show_newstyle.html.erb b/app/views/sub_document_comments/_show_newstyle.html.erb index 20ecedea7..e450c21f5 100644 --- a/app/views/sub_document_comments/_show_newstyle.html.erb +++ b/app/views/sub_document_comments/_show_newstyle.html.erb @@ -29,21 +29,26 @@

全部评论

-
- <% comments_for_doc.each_with_index do |reply,i| %> -
- - <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "sn-reply-username fl" %><%= time_from_now(reply.created_at) %> -

<%= reply.content.html_safe unless reply.content.nil? %>

- -
+ +
+ <% comments_for_doc.each_with_index do |reply,i| %> +
+ + <%= link_to User.find(reply.creator_id).realname, user_url_in_org(reply.creator_id), :class => "sn-reply-username fl" %><%= time_from_now(reply.created_at) %> +

<%= reply.content.html_safe unless reply.content.nil? %>

+ +
+
+ <% end %> +
+ <% if count > 3 %> +
+ + 展开回复 +
<% end %> -
- 加载更多 -
-
<% end %> \ No newline at end of file diff --git a/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb index cdeb64181..52fd2148c 100644 --- a/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb +++ b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb @@ -14,38 +14,13 @@ <% end %> +
-
-
-
-
    -
  • 上一页
    • -
  • 1
    • -
  • 2
    • -
  • 3
    • -
  • 4
    • -
  • 5
    • -
  • ...
    • -
  • 25
    • -
  • 下一页
    • -
-
-
- - -
- 上一页 - 1 - 2 - 3 - ... - 31 - 下一页 -
-
\ No newline at end of file diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index 27dc5c05a..ad9169670 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -166,11 +166,7 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou .sn-inner-newslist a:hover{ color:#24366e;} a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;} -.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; } -.sn-inner-pages a:hover{ background-color:#24366e; color:#fff;} -a.sn-inner-pages-big{ width:50px;} -a.sn-pages-active{ background-color:#24366e; color:#fff;} -.sn-inner-pages{width:330px; margin:40px auto 100px;} + /* 内页新闻展示 */ .sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; } .sn-inner-pcon{text-indent:2em;} @@ -214,3 +210,23 @@ a.sn-reply-username { color:#24366e; margin-right:15px; } .org-popup-wrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;} .org-popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:block; position: absolute; z-index: 1000; right:10px; top:5px;} +/****翻页***/ +/*ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }*/ +/*ul.wlist li{float: left;}*/ +/*ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}*/ +/*ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}*/ +/*.wlist_select {display:block; font-size:12px; border:1px solid #d1d1d1; color:#24366e; float:left; width:50px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }*/ +.wlist_select a{background-color: #24366e;cursor: default;width: 30px;} + +.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:50px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; } +.sn-inner-pages a:hover{ background-color:#24366e; color:#fff;} +a.sn-inner-pages-big{ width:50px;} +a.sn-pages-active{ background-color:#24366e; color:#fff;} +.sn-inner-pages{width:330px; margin:40px auto 100px;} + +ul.sn-inner-pages{ float:right; border-bottom:none; height:30px; margin-top:20px; } +ul.sn-inner-pages li{float: left;} +ul.sn-inner-pages li a{border: 1px solid #d1d1d1;padding: 1px 4px 1px 4px;margin-left: 3px;} +ul.sn-inner-pages li a:hover{ background-color:#24366e; color:#fff; text-decoration:none;} +.sn-inner-pages_select { background-color:#24366e; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;} +.sn-inner-pages_select a{background-color: #24366e; color: #fff;cursor: default;}