From 67d23a2161f3cb7030cebc659699f3ffa4352827 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 9 Dec 2016 10:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E5=9B=9E=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/_project_issue_contents.html.erb | 23 +++++++++++-----
 .../_project_message_contents.html.erb        | 23 +++++++++++-----
 app/views/users/_message_contents.html.erb    | 26 ++++++++++++-------
 app/views/users/_news_contents.html.erb       | 26 ++++++++++++-------
 public/stylesheets/css/public.css             |  2 +-
 5 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/app/views/projects/_project_issue_contents.html.erb b/app/views/projects/_project_issue_contents.html.erb
index 87e977024..a7ea27f9a 100644
--- a/app/views/projects/_project_issue_contents.html.erb
+++ b/app/views/projects/_project_issue_contents.html.erb
@@ -7,17 +7,26 @@
     <% parents_rely = get_reply_parents parents_rely, comment %>
     <% length = parents_rely.length %>
     <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
           <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => comment.parent, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
       <% else %>
           <div class="orig_cont clearfix">
             <div class="orig_cont clearfix">
-              <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide_issue clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_issue', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_issue', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[3], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[2], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
             </div>
             <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[0], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
           </div>
diff --git a/app/views/projects/_project_message_contents.html.erb b/app/views/projects/_project_message_contents.html.erb
index 9d99e4c83..e1bcedc51 100644
--- a/app/views/projects/_project_message_contents.html.erb
+++ b/app/views/projects/_project_message_contents.html.erb
@@ -7,17 +7,26 @@
     <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
     <% length = parents_rely.length %>
     <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
           <%=render :partial => 'projects/journal_comment_reply', :locals => {:comment => comment.parent, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
       <% else %>
           <div class="orig_cont clearfix">
             <div class="orig_cont clearfix">
-              <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide_issue clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_message', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => 'is_project_message', :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[3], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[2], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[1], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
             </div>
             <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[0], :user_activity_id => user_activity_id, :parent_id => comment.id} %>
           </div>
diff --git a/app/views/users/_message_contents.html.erb b/app/views/users/_message_contents.html.erb
index 52ebc9577..265a4ab0e 100644
--- a/app/views/users/_message_contents.html.erb
+++ b/app/views/users/_message_contents.html.erb
@@ -7,20 +7,26 @@
     <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
     <% length = parents_rely.length %>
     <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
           <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent, :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
       <% else %>
           <div class="orig_cont clearfix">
             <div class="orig_cont clearfix">
-              <!--<div>-->
-                <!--<%#=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>-->
-              <!--</div>-->
-              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id),:remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id),:remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[3], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[2], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
             </div>
             <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
           </div>
diff --git a/app/views/users/_news_contents.html.erb b/app/views/users/_news_contents.html.erb
index 6db9170d8..e421fd442 100644
--- a/app/views/users/_news_contents.html.erb
+++ b/app/views/users/_news_contents.html.erb
@@ -7,20 +7,26 @@
     <% parents_rely = get_reply_parents parents_rely, comment %>
     <% length = parents_rely.length %>
     <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 2 %>
+      <% if length <= 5 %>
           <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent, :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
       <% else %>
           <div class="orig_cont clearfix">
             <div class="orig_cont clearfix">
-              <!--<div>-->
-                <!--<%#=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>-->
-              <!--</div>-->
-              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
-            </div>
-            <div class="orig_cont_hide clearfix">
-              <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id), :remote=>true, :class => 'linkBlue2' %>
+              <div class="orig_cont clearfix">
+                <div class="orig_cont clearfix">
+                  <div class="orig_cont clearfix">
+                    <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                  </div>
+                  <div class="orig_cont_hide clearfix">
+                    <span class="orig_icon" >&darr; </span>
+                    <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 5).to_s %>个楼层</span>
+                    <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => user_activity_id, :parent_id => comment.id),:remote=>true, :class => 'linkBlue2' %>
+                  </div>
+                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[3], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+                </div>
+                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[2], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[1], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
             </div>
             <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0], :type => type, :user_activity_id => user_activity_id, :parent_id => comment.id} %>
           </div>
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index 986ebfbdf..5db18ec57 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -1402,7 +1402,7 @@ a:hover.comment_ding_link{ color:#269ac9;}
 .orig_textarea{width:90%;  margin-bottom:10px;}
 .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
 .orig_sub:hover{ background:#297fb8;}
-.orig_cont_hide{ text-align:center; width:632px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;}
+.orig_cont_hide{ text-align:center; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;}
 .orig_cont_hide_issue{ text-align:center; width:882px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;}
 .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}