From a184ab4b696d1404b32bf89da9d370c34ac67f7b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Sep 2015 15:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=8F=AA=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B6=E5=AE=83=E7=9A=84=E9=9C=80=E7=82=B9=E5=87=BB=E6=89=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 | 17 +++++++++++------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 114852a06..395afea53 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -49,7 +49,7 @@
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <% count=0 %>
-      <div class="homepagePostReplyBannerCount">回复(
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
         <% if activity.parent %>
             <% count=activity.parent.children.count%>
        <% else %>
@@ -67,7 +67,7 @@
       <% end %>
     </div>
 
-    <div class="homepagePostReplyInputContainer">
+    <div class="homepagePostReplyInputContainer" id="reply_input_<%= user_activity_id %>" style="display: <%= (page==0 && first_user_activity == user_activity_id) ? '' : 'none'%>">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="quote[quote]" value="">
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 54c1fd51d..f92b4e6b2 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -27,7 +27,7 @@
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <% count=activity.comments.count %>
-      <div class="homepagePostReplyBannerCount">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
         回复（<%= count %>）
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -40,7 +40,7 @@
       <% end %>
     </div>
 
-    <div class="homepagePostReplyInputContainer">
+    <div class="homepagePostReplyInputContainer" id="reply_input_<%= user_activity_id %>" style="display: <%= (page==0 && first_user_activity == user_activity_id) ? '' : 'none'%>">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 0413d6811..afe7560be 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -67,7 +67,7 @@
 
     <div class="homepagePostReplyBanner">
       <% count = activity.journals.count %>
-      <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
+      <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 %>
           <div class="homepagePostReplyBannerMore">
@@ -78,7 +78,7 @@
       <% end %>
     </div>
 
-    <div class="homepagePostReplyInputContainer">
+    <div class="homepagePostReplyInputContainer" id="reply_input_<%= user_activity_id %>" style="display: <%= (page==0 && first_user_activity == user_activity_id) ? '' : 'none'%>">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index ac96ee562..918a11bb2 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -39,7 +39,7 @@
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <% count = 0 %>
-      <div class="homepagePostReplyBannerCount">回复(
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
         <% if activity.parent %>
             <% count=activity.parent.children.count%>
         <% else %>
@@ -53,7 +53,7 @@
       <% end %>
     </div>
 
-    <div class="homepagePostReplyInputContainer">
+    <div class="homepagePostReplyInputContainer" id="reply_input_<%= user_activity_id %>" style="display: <%= (page==0 && first_user_activity == user_activity_id) ? '' : 'none'%>">
       <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
         <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
             <input type="hidden" name="quote[quote]" value="">
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 6955f5f69..443dbf3d5 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -10,6 +10,7 @@
     div.ke-toolbar .ke-outline{border:none;}
     .ke-inline-block{display: none;}
 </style>
+<% first_user_activity = user_activities.first.id %>
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
@@ -29,6 +30,10 @@
                 }
             }
 
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
             $(function() {
                 init_KindEditor_data(<%= user_activity.id%>);
             });
@@ -39,22 +44,22 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'Message'%>
-                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'Poll' %>
-                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% end %>
             <% end %>
         <% when 'Project' %>
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'Message' %>
-                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% end %>
             <% end %>
         <% end %>