From 20ff1430fc6be8eced2f6c7e7b20316ff3ff44cd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 14 Oct 2015 14:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA3=E4=B8=AA=EF=BC=8C=E2=80=9C?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7=E5=9B=9E=E5=A4=8D=E2=80=9D=E3=80=81=E2=80=9C?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D=E5=90=8E=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=9B=9E=E5=A4=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb              | 5 +++--
 app/views/boards/_project_show.html.erb             | 4 ++--
 app/views/courses/_course_activity.html.erb         | 5 +++--
 app/views/memos/show.html.erb                       | 5 +++--
 app/views/messages/_course_show.html.erb            | 5 +++--
 app/views/users/_course_journalsformessage.html.erb | 4 ++--
 app/views/users/_course_message.html.erb            | 4 ++--
 app/views/users/_course_news.html.erb               | 4 ++--
 app/views/users/_project_issue.html.erb             | 4 ++--
 app/views/users/_project_message.html.erb           | 4 ++--
 app/views/users/_user_activities.html.erb           | 5 +++--
 app/views/users/_user_journalsformessage.html.erb   | 4 ++--
 12 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 871aa7e39..783531027 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -26,14 +26,15 @@
                   var btn = $(btnid);
                   if (btn.data('init') == '0') {
                       btn.data('init', 1);
-                      btn.html('收起回复(' + btn.data('count') + ')');
+                      btn.html('收起回复');
                       target.show();
                   } else {
                       btn.data('init', 0);
-                      btn.html('展开更多(' + btn.data('count') + ')');
+                      btn.html('展开更多');
                       target.hide();
                       target.eq(0).show();
                       target.eq(1).show();
+                      target.eq(2).show();
                   }
               }
 
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 4f022261f..84e25974a 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -209,11 +209,11 @@
             btn.click(function(){
                 if($(this).data('init')=='0'){
                     $(this).data('init',1);
-                    $(this).html('收起回复('+$(this).data('count')+')');
+                    $(this).html('收起回复');
                     target.show();
                 }else{
                     $(this).data('init',0);
-                    $(this).html('展开回复('+$(this).data('count')+')');
+                    $(this).html('展开回复'+$(this).data('count')+')');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index 44b72868d..74856197e 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -56,14 +56,15 @@
                 var btn = $(btnid);
                 if (btn.data('init') == '0') {
                     btn.data('init', 1);
-                    btn.html('收起回复(' + btn.data('count') + ')');
+                    btn.html('收起回复');
                     target.show();
                 } else {
                     btn.data('init', 0);
-                    btn.html('展开更多(' + btn.data('count') + ')');
+                    btn.html('展开更多');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();
+                    target.eq(2).show();
                 }
             }
 
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index d6acabd9e..53b972025 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -17,14 +17,15 @@
         var btn = $(btnid);
         if(btn.data('init')=='0'){
             btn.data('init',1);
-            btn.html('收起回复('+btn.data('count')+')');
+            btn.html('收起回复');
             target.show();
         }else{
             btn.data('init',0);
-            btn.html('展开更多('+btn.data('count')+')');
+            btn.html('展开更多');
             target.hide();
             target.eq(0).show();
             target.eq(1).show();
+            target.eq(2).show();
         }
     }
     $(function() {
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 1c603caf6..f9822f70c 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -12,14 +12,15 @@
         var btn = $(btnid);
         if(btn.data('init')=='0'){
             btn.data('init',1);
-            btn.html('收起回复('+btn.data('count')+')');
+            btn.html('收起回复');
             target.show();
         }else{
             btn.data('init',0);
-            btn.html('展开更多('+btn.data('count')+')');
+            btn.html('展开更多');
             target.hide();
             target.eq(0).show();
             target.eq(1).show();
+            target.eq(2).show();
         }
     }
     $(function() {
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index ac4652a32..93e7f0c29 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -34,7 +34,7 @@
         回复（<%= count %>）
       </div>
       <div class="homepagePostReplyBannerTime"></div>
-      <%if count>2 %>
+      <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
@@ -49,7 +49,7 @@
           <ul>
             <% course.journals_for_messages.where('m_parent_id IS NULL').reorder("created_on desc").each do |comment| %>
                 <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
                   </div>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 9ce308014..08ab39cd6 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -58,7 +58,7 @@
         <%= count %>
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-      <%if count > 2 %>
+      <%if count > 3 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
@@ -74,7 +74,7 @@
           <ul>
             <% activity.children.reorder("created_on desc").each do |reply|%>
                 <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
                   </div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 4b5b73ceb..c74b43031 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -32,7 +32,7 @@
         回复（<%= count %>）
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <%if count>2 %>
+      <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
@@ -47,7 +47,7 @@
           <ul>
             <% activity.comments.reorder("created_on desc").each do |comment| %>
                 <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.author_id), :alt => "用户头像" %>
                   </div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 02d1940a6..34e840b50 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -69,7 +69,7 @@
     <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
       <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复（<%= count %>）</div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <% if count > 2 %>
+      <% if count > 3 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
               展开更多
@@ -84,7 +84,7 @@
           <ul>
             <% activity.journals.reorder("created_on desc").each do |reply| %>
                 <% replies_all_i=replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.user_id), :alt => "用户头像" %>
                   </div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index ead43d7e4..1d0a5ce8c 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -49,7 +49,7 @@
         <%=count %>
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-      <%if count>2 %>
+      <%if count>3 %>
           <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
@@ -61,7 +61,7 @@
           <ul>
             <% activity.children.reorder("created_on desc").each do |reply| %>
                 <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.author_id), :alt => "用户头像" %>
                   </div>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2f10e6f1c..dcb6cd9da 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -20,14 +20,15 @@
                 var btn = $(btnid);
                 if(btn.data('init')=='0'){
                     btn.data('init',1);
-                    btn.html('收起回复('+btn.data('count')+')');
+                    btn.html('收起回复');
                     target.show();
                 }else{
                     btn.data('init',0);
-                    btn.html('展开更多('+btn.data('count')+')');
+                    btn.html('展开更多');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();
+                    target.eq(2).show();
                 }
             }
 
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 691911008..43ec2a0c2 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -32,7 +32,7 @@
         回复（<%= count %>）
       </div>
       <div class="homepagePostReplyBannerTime"></div>
-      <%if count>2 %>
+      <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
@@ -47,7 +47,7 @@
           <ul>
             <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
                 <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 2 ? 'none' : '' %>">
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
                     <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
                   </div>