From 036129a6221eb08af1a6ba80612dabc80529f420 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Sep 2015 10:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/comments/create.js.erb          | 4 ++--
 app/views/issues/add_journal.js.erb       | 4 ++--
 app/views/messages/reply.js.erb           | 6 +++---
 app/views/users/_course_news.html.erb     | 1 +
 app/views/users/_project_issue.html.erb   | 1 +
 app/views/users/_project_message.html.erb | 1 +
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index dd3c3dfb2..f0e7a6a11 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data('<%= @user_activity_id%>');
+init_KindEditor_data('<%= @user_activity_id%>',"30px","85%");
diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb
index efa5750c2..c5b698702 100644
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data(<%= @user_activity_id%>);
\ No newline at end of file
+init_KindEditor_data(<%= @user_activity_id%>,"30px","85%");
\ No newline at end of file
diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb
index 9d3d68855..883051365 100644
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@@ -1,6 +1,6 @@
 <%if @project%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 <%elsif @course%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 <%end%>
-init_KindEditor_data(<%= @user_activity_id%>);
\ No newline at end of file
+init_KindEditor_data(<%= @user_activity_id%>,"30px","85%");
\ No newline at end of file
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index c540d38a9..9cf72276e 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -77,6 +77,7 @@
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
             <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+            <div class="cl"></div>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
         <% end%>
       </div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 301489510..97930795f 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -122,6 +122,7 @@
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
             <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+            <div class="cl"></div>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
         <% end%>
       </div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index ef4fa080f..01842c28b 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -92,6 +92,7 @@
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
             <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
             <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+            <div class="cl"></div>
             <p nhname='contentmsg_<%= user_activity_id%>'></p>
         <% end%>
       </div>