diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 88a524d1e..cad57b49f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -100,7 +100,7 @@ class UsersController < ApplicationController
         else
           @user_activity_id = -1
         end
-        @is_in_course = params[:is_in_course]
+        @is_in_course = params[:is_in_course].to_i
         @course_activity = params[:course_activity].to_i
     end
     respond_to do |format|
@@ -3236,6 +3236,38 @@ class UsersController < ApplicationController
     end
   end
 
+  def all_journals
+    if params[:type].present?
+      case params[:type]
+        when 'OrgDocumentComment'
+          obj = OrgDocumentComment.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_at desc")
+        when 'Message'
+          obj = Message.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_on desc")
+        when 'News'
+          obj = News.where('id = ?', params[:id].to_i).first
+          @journals = obj.comments.reorder("created_on desc")
+        when 'JournalsForMessage'
+          obj = JournalsForMessage.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_on desc")
+        when 'Issue'
+          obj = Issue.where('id = ?', params[:id].to_i).first
+          @journals = obj.journals.reorder("created_on desc")
+        when 'BlogComment'
+          obj = BlogComment.where('id = ?', params[:id].to_i).first
+          @journals = obj.children.reorder("created_on desc")
+        when 'HomeworkCommon'
+          obj = HomeworkCommon.where('id = ?', params[:id].to_i).first
+          @journals = obj.journals_for_messages.reorder("created_on desc")
+          @is_in_course = params[:is_in_course].to_i if params[:is_in_course]
+          @course_activity = params[:course_activity].to_i if params[:course_activity]
+          @is_teacher = User.current.allowed_to?(:as_teacher,obj.course)
+          @user_activity_id = params[:user_activity_id].to_i if params[:user_activity_id]
+      end
+    end
+  end
+
   private
 
   def find_user
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index 05ae02fe2..8959e9c29 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -76,6 +76,18 @@ class BlogComment < ActiveRecord::Base
   def project
   end
 
+  def creator_user
+    self.author
+  end
+
+  def created_time
+    self.created_at
+  end
+
+  def content_detail
+    self.content
+  end
+
   #博客回复微信模板消息
   # def blog_wechat_message
   #   ws = WechatService.new
diff --git a/app/models/comment.rb b/app/models/comment.rb
index edb5e472f..80b52a8f4 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -104,4 +104,16 @@ class Comment < ActiveRecord::Base
     end
   end
 
+  def creator_user
+    self.author
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.comments
+  end
+
 end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index bea273a41..0f88fcb7f 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -137,6 +137,18 @@ class Journal < ActiveRecord::Base
   end
   ##
 
+  def creator_user
+    self.user
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.notes
+  end
+
   private
 
   def split_private_notes
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index d8819515c..68cb9da15 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -329,4 +329,16 @@ class JournalsForMessage < ActiveRecord::Base
       down_course_score_num(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
+
+  def creator_user
+    self.user
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.notes
+  end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 393fd3a60..14add0d02 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -221,6 +221,18 @@ class Message < ActiveRecord::Base
     update_org_activity(self.class, self.id)
   end
 
+  def creator_user
+    self.author
+  end
+
+  def created_time
+    self.created_on
+  end
+
+  def content_detail
+    self.content
+  end
+
   private
 
   def add_author_as_watcher
diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb
index dd070c825..dd7734a54 100644
--- a/app/models/org_document_comment.rb
+++ b/app/models/org_document_comment.rb
@@ -35,4 +35,15 @@ class OrgDocumentComment < ActiveRecord::Base
 
   end
 
+  def creator_user
+    self.creator
+  end
+
+  def created_time
+    self.created_at
+  end
+
+  def content_detail
+    self.content
+  end
 end
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index 763748ad7..16d151d83 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -52,23 +52,6 @@
 </style>
 <% course_activities.includes(:course_act).each do |activity| if course_activities %>
         <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             $(function () {
                 sd_create_editor_from_data(<%= activity.id%>, null, "100%", "<%= activity.class.to_s %>");
             });
diff --git a/app/views/news/_project_news_detail.html.erb b/app/views/news/_project_news_detail.html.erb
index b3e6de5cf..e1a5237ab 100644
--- a/app/views/news/_project_news_detail.html.erb
+++ b/app/views/news/_project_news_detail.html.erb
@@ -6,23 +6,6 @@
 <% if all_news %>
     <% all_news.each do |news| %>
         <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             function expand_reply_input(id) {
                 $(id).toggle();
             }
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 2c135cd2e..7ee94215c 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -53,34 +53,34 @@
         <% if act.container_type == 'Project' %>
             <% case act.org_act_type.to_s %>
             <% when 'Issue' %>
-                <%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message' %>
-                <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Project'%>
-                <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
             <% end %>
         <% end %>
         <% if act.container_type ==  'Course' %>
             <% case act.org_act_type.to_s %>
             <% when 'HomeworkCommon' %>
-                <%= render :partial => 'org_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
+                <%= render :partial => 'users/course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
             <% when 'News' %>
-                <%= render :partial => 'org_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message'%>
-                <%= render :partial => 'org_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
+                <%= render :partial => 'users/course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id,:is_course=>0,:is_board=>0} %>
             <% when 'Poll' %>
-                <%= render :partial => 'org_course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
+                <%= render :partial => 'users/course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
             <% when 'Course'%>
-                <%= render :partial => 'org_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
+                <%= render :partial => 'users/course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
             <% end %>
         <% end %>
         <% if act.container_type == 'OrgSubfield' %>
             <% if act.org_act_type == 'Message' and act.org_act_id and Message.where("id=#{act.org_act_id}").count > 0 %>
                 <% message = Message.find(act.org_act_id) %>
                 <% if !message.board.course_id.nil? %>
-                    <%= render :partial => 'org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                    <%= render :partial => 'users/course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
                 <% elsif message.board.project_id != -1 %>
-                    <%= render :partial => 'organizations/project_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
+                    <%= render :partial => 'users/project_message', :locals => {:activity => message,:user_activity_id =>act.id,:is_course=>0,:is_board=>0} %>
                 <% elsif message.board.org_subfield_id %>
                     <%= render :partial => 'organizations/org_subfield_message', :locals => {:activity => message, :user_activity_id  => act.id} %>
                 <% end %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index bcc43610e..ef8ea55d9 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -88,46 +88,15 @@
         </span>
       </div>
       <%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>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                        autoUrl('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <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"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 662a965e9..a822b4a0d 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -70,48 +70,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <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"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                        <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 3042ca9ae..f9ca06d90 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -6,7 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo">
-        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
+        <%= link_to document.creator.show_name, user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
             <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
@@ -61,7 +61,7 @@
       <% end %>
     </div>
   </div>
-  <% comments_for_doc = document.children.reorder("created_at desc") %>
+  <% comments_for_doc = document.children.reorder("created_at desc").limit(3) %>
   <% count = document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
@@ -74,41 +74,14 @@
       </div>
       <% if count > 3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+            <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>',<%= document.id %>,'OrgDocumentComment',<%= document.id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
               展开更多
             </a>
           </div>
       <% end %>
     </div>
     <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
-      <ul>
-        <% reply_id = 0 %>
-        <% comments_for_doc.each do |comment| %>
-            <script type="text/javascript">
-                $(function(){
-                    showNormalImage('reply_content_<%= comment.id %>');
-                    autoUrl('reply_content_<%= comment.id %>');
-                });
-            </script>
-            <% reply_id += 1 %>
-            <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
-              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
-              <div class="homepagePostReplyDes">
-                <div class="homepagePostReplyPublisher">
-                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
-                  <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
-                  <span id="reply_praise_count_<%=comment.id %>">
-                    <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                  </span>
-                </div>
-                <% unless comment.content.blank? %>
-                    <div class="homepagePostReplyContent" id="reply_content_<%= comment.id %>"><%= comment.content.html_safe %></div>
-                <% end %>
-              </div>
-              <div class="cl"></div>
-            </li>
-        <% end %>
-      </ul>
+      <%= render :partial => 'users/all_replies', :locals => {:comments => comments_for_doc}%>
     </div>
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
@@ -134,22 +107,6 @@
 </div>
 
 <script type="text/javascript">
-    function expand_reply(container, btnid) {
-        var target = $(container);
-        var btn = $(btnid);
-        if (btn.data('init') == '0') {
-            btn.data('init', 1);
-            btn.html('收起回复');
-            target.show();
-        } else {
-            btn.data('init', 0);
-            btn.html('展开更多');
-            target.hide();
-            target.eq(0).show();
-            target.eq(1).show();
-            target.eq(2).show();
-        }
-    }
     $(function(){
         user_card_show_hide();
     });
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index bb6cdad0c..6322a532a 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -50,23 +50,6 @@
 <% unless forge_acts.empty? %>
     <% forge_acts.each do |activity| -%>
         <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             $(function () {
                 sd_create_editor_from_data(<%= activity.id %>, null, "100%", "<%= activity.class.to_s %>");
             });
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 7baf93e4f..b974b4499 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -50,48 +50,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <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"), user_path(comment.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
new file mode 100644
index 000000000..15c8944fd
--- /dev/null
+++ b/app/views/users/_all_replies.html.erb
@@ -0,0 +1,39 @@
+<ul>
+  <% comments.each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
+        <div class="homepagePostReplyPortrait">
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+            <%= format_activity_day(comment.created_time) %> <%= format_time(comment.created_time, false) %>
+            <span id="reply_praise_count_<%=comment.id %>">
+                 <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+            </span>
+          </div>
+          <% unless comment.content_detail.blank? %>
+              <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                <% if comment.class == 'Journal' %>
+                    <% if comment.details.any? %>
+                        <% details_to_strings(comment.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= comment.notes.html_safe %></P>
+                <% else %>
+                    <%= comment.content_detail.html_safe %>
+                <% end %>
+              </div>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb
index 895eda8a9..77dcea1f2 100644
--- a/app/views/users/_comment_reply.html.erb
+++ b/app/views/users/_comment_reply.html.erb
@@ -4,24 +4,5 @@
         <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
       </div>
   <% end %>
-  <!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
-      <%# if comment.user == User.current %>
-        <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
-      <%# else %>
-        <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-      <%# end %>
-  </span>-->
-  <div class="orig_user fl">
-    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
-  </div>
-  <div class="orig_right fl">
-    <% if comment.try(:user).try(:realname) == ' ' %>
-        <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
-    <% else %>
-        <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
-    <% end %>
-    <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
-    <div class="orig_content "><%= comment.notes.html_safe %></div>
-  </div>
-  <div class="cl"></div>
+  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => comment} %>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index e694f471e..701f81da1 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -302,91 +302,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply_homework('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'HomeworkCommon',<%=user_activity_id %>,-1,<%=course_activity %>,<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.journals_for_messages.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.journals_for_messages.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" 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>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= time_from_now(comment.created_on) %>
-                    </div>
-                    <% unless comment.m_parent_id.nil? %>
-                        <% parents_rely = [] %>
-                        <% parents_rely = get_reply_parents parents_rely, comment %>
-                        <% length = parents_rely.length %>
-                        <div id="comment_reply_<%=comment.id %>">
-                          <% if length <= 3 %>
-                              <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                          <% else %>
-                              <div class="orig_cont clearfix">
-                                <div class="orig_cont clearfix">
-                                  <div id="comment_reply_<%=parents_rely[length - 1].id %>">
-                                    <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
-                                  </div>
-                                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-                                </div>
-                                <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
-                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                              </div>
-                          <% end %>
-                        </div>
-                    <% end %>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                    <div class="orig_reply mb10 mt-10">
-                      <div class="reply">
-                                <span class="reply-right">
-                                    <span id="reply_praise_count_<%=comment.id %>">
-                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                    </span>
-                                    <span style="position: relative" class="fr mr20">
-                                        <%= link_to(
-                                                    l(:button_reply),
-                                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
-                                                    :remote => true,
-                                                    :method => 'get',
-                                                    :title => l(:button_reply)) %>
-                                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                                    </span>
-                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
-                                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
-                                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
-                                    <% end %>
-                                </span>
-                        <div class="cl"></div>
-                      </div>
-                    </div>
-                    <p id="reply_message_<%= comment.id%>"></p>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%=render :partial => 'users/homework_replies', :locals => {:comments => comments, :is_in_course => -1,:course_activity=>course_activity, :is_teacher => is_teacher, :user_activity_id => user_activity_id} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index a76081859..e04dd3006 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -43,50 +43,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% fetch_user_leaveWord_reply(activity).each do |comment| unless fetch_user_leaveWord_reply(activity).nil? %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <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>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-              <% end %>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index c0e667396..76971e240 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -97,7 +97,7 @@
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
@@ -105,43 +105,10 @@
     </div>
 
     <% activity= activity.parent ? activity.parent : activity%>
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <%  if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.includes(:author).reorder("created_on desc").each do |reply|%>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                        autoUrl('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <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"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index b89873b43..5ffa78158 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -75,48 +75,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <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"), user_path(comment.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
new file mode 100644
index 000000000..de6e96ae3
--- /dev/null
+++ b/app/views/users/_homework_replies.html.erb
@@ -0,0 +1,78 @@
+<ul>
+  <% comments.reorder("created_on desc").each do |comment| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
+          });
+      </script>
+      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();">
+        <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>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher">
+            <% if comment.try(:user).try(:realname) == ' ' %>
+                <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+            <% else %>
+                <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+            <% end %>
+            <%= time_from_now(comment.created_on) %>
+          </div>
+          <% unless comment.m_parent_id.nil? %>
+              <% parents_rely = [] %>
+              <% parents_rely = get_reply_parents parents_rely, comment %>
+              <% length = parents_rely.length %>
+              <div id="comment_reply_<%=comment.id %>">
+                <% if length <= 3 %>
+                    <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+                <% 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 - 2]} %>
+                      </div>
+                      <div class="orig_cont_hide clearfix">
+                        <span class="orig_icon" >&darr; </span>
+                        <span class="orig_icon" style="display:none;" > &uarr;</span>
+                        <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %>
+                      </div>
+                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                    </div>
+                <% end %>
+              </div>
+          <% end %>
+          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
+            <%= comment.notes.html_safe %></div>
+          <div class="orig_reply mb10 mt-10">
+            <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%=comment.id %>">
+                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                        <%= link_to(
+                                    l(:button_reply),
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :user_activity_id => user_activity_id, :course_activity => course_activity},
+                                    :remote => true,
+                                    :method => 'get',
+                                    :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
+                  <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => course_activity},
+                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
+                    <% end %>
+                </span>
+              <div class="cl"></div>
+            </div>
+          </div>
+          <p id="reply_message_<%= comment.id%>"></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 2b43d8acf..1f4c4b44b 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -10,54 +10,17 @@
     <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
     <% 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 id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Issue',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
             展开更多
           </a>
         </div>
     <% end %>
   </div>
 
-  <% replies_all_i = 0 %>
+  <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
       <div class="" id="reply_div_<%= user_activity_id %>">
-        <ul>
-          <% activity.journals.includes(:user, :details).reorder("created_on desc").each do |reply| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_content_<%= reply.id %>');
-                      autoUrl('reply_content_<%= reply.id %>');
-                  });
-              </script>
-              <% replies_all_i=replies_all_i + 1 %>
-              <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"), user_path(reply.user_id), :alt => "用户头像" %>
-                </div>
-                <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <% if reply.try(:user).try(:realname) == ' ' %>
-                        <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                    <% else %>
-                        <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                    <% end %>
-                    <%= format_time(reply.created_on) %>
-                    <span id="reply_praise_count_<%= reply.id %>">
-                       <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                    </span>
-                  </div>
-                  <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                    <% if reply.details.any? %>
-                        <% details_to_strings(reply.details).each do |string| %>
-                            <p><%= string %></p>
-                        <% end %>
-                    <% end %>
-                    <P><%= reply.notes.html_safe %></P>
-                  </div>
-                </div>
-                <div class="cl"></div>
-              </li>
-          <% end %>
-        </ul>
+        <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
       </div>
   <% end %>
 
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index b3c2fea59..f82dc35e7 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -95,46 +95,15 @@
       </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%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>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'Message',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.includes(:author).reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                        autoUrl('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <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"), user_path(reply.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index b354bc668..43b22b193 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -72,48 +72,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'News',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.comments.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <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"), user_path(comment.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.comments.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 432074191..3b327c080 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -29,23 +29,6 @@
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
-            function expand_reply(container,btnid){
-                var target = $(container);
-                var btn = $(btnid);
-                if(btn.data('init')=='0'){
-                    btn.data('init',1);
-                    btn.html('收起回复');
-                    target.show();
-                }else{
-                    btn.data('init',0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
             function expand_reply_input(id) {
                 $(id).toggle();
             }
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 522bdc835..97b2737c8 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -56,48 +56,17 @@
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'BlogComment',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <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"), user_path(comment.author_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.content.html_safe %></div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index a01418d2f..97eeec89f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -312,95 +312,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
           <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=homework_common.id%>" onclick="expand_reply('#reply_div_<%= homework_common.id %> li','#reply_btn_<%=homework_common.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+            <a id="reply_btn_<%=homework_common.id%>" onclick="expand_reply_homework('#reply_div_<%= homework_common.id %> li','#reply_btn_<%=homework_common.id%>',<%= homework_common.id %>,'HomeworkCommon',<%=homework_common.id %>,<%=is_in_course %>,-1, -1)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = homework_common.journals_for_messages.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= homework_common.id %>">
-          <ul>
-            <% homework_common.journals_for_messages.reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_edit_<%= comment.id%>').show();" onmouseout="$('#message_edit_<%= comment.id%>').hide();" 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>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= time_from_now(comment.created_on) %>
-                    </div>
-                    <% unless comment.m_parent_id.nil? %>
-                        <% parents_rely = [] %>
-                        <% parents_rely = get_reply_parents parents_rely, comment %>
-                        <% length = parents_rely.length %>
-                        <div id="comment_reply_<%=comment.id %>">
-                          <% if length <= 3 %>
-                            <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                          <% 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 - 2]} %>
-                              </div>
-                              <div class="orig_cont_hide clearfix">
-                                <span class="orig_icon" >&darr; </span>
-                                <span class="orig_icon" style="display:none;" > &uarr;</span>
-                                <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %>
-                              </div>
-                              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                            </div>
-                          <% end %>
-                        </div>
-                    <% end %>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth t_txt" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                    <div class="orig_reply mb10 mt-10">
-                      <div class="reply">
-                                <span class="reply-right">
-                                    <span id="reply_praise_count_<%=comment.id %>">
-                                      <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                                    </span>
-                                    <span style="position: relative" class="fr mr20">
-                                        <%= link_to(
-                                                  l(:button_reply),
-                                                  {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :course_activity => -1},
-                                                  :remote => true,
-                                                  :method => 'get',
-                                                  :title => l(:button_reply)) %>
-                                        <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
-                                    </span>
-                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
-                                    <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => -1},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
-                                    <% end %>
-                                </span>
-                        <div class="cl"></div>
-                      </div>
-                    </div>
-                    <p id="reply_message_<%= comment.id%>"></p>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%=render :partial => 'users/homework_replies', :locals => {:comments => comments, :is_in_course => is_in_course, :course_activity=> -1, :is_teacher => is_teacher, :user_activity_id => -1} %>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 6967bb398..e7f42c661 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -70,57 +70,17 @@
       <div class="homepagePostReplyBannerTime"></div>
       <%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 id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>',<%= activity.id %>,'JournalsForMessage',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
               展开更多
             </a>
           </div>
       <% end %>
     </div>
 
-    <% replies_all_i = 0 %>
+    <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= comment.id %>');
-                        autoUrl('reply_content_<%= comment.id %>');
-                    });
-                </script>
-                <% replies_all_i = replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#message_delete_<%= comment.id%>').show();" onmouseout="$('#message_delete_<%= comment.id%>').hide();"  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>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher">
-                      <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <span id="reply_praise_count_<%=comment.id %>">
-                         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                      </span>
-                      <div id="message_delete_<%=comment.id %>" style="display: none" class="mr10 fr">
-                          <% if comment.user == User.current|| User.current.admin? %>
-                              <%= link_to(l(:label_bid_respond_delete),
-                                          {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
-                                          :class => "delete", :title => l(:button_delete))  %>
-                          <% end %>
-                      </div>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
+          <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
         </div>
     <% end %>
 
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 94d2998ae..afd498d06 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -7,22 +7,6 @@
     <% jours.each do |jour|%>
         <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
             <script type="text/javascript">
-                function expand_reply(container,btnid){
-                    var target = $(container);
-                    var btn = $(btnid);
-                    if(btn.data('init')=='0'){
-                        btn.data('init',1);
-                        btn.html('收起回复');
-                        target.show();
-                    }else{
-                        btn.data('init',0);
-                        btn.html('展开更多');
-                        target.hide();
-                        target.eq(0).show();
-                        target.eq(1).show();
-                        target.eq(2).show();
-                    }
-                }
                 $(function(){
                     sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");
                 });
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
new file mode 100644
index 000000000..c18c6aae4
--- /dev/null
+++ b/app/views/users/all_journals.js.erb
@@ -0,0 +1,5 @@
+<% if params[:type] == 'HomeworkCommon' %>
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+<% else %>
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 3a34f0a6b..e4b462d93 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -549,6 +549,7 @@ RedmineApp::Application.routes.draw do
       get 'user_messages_unviewed'
       post "user_commit_homework"
       post 'user_select_homework'
+      get 'all_journals'
     end
 
     member do
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 468bf64e9..9e77249c6 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1283,21 +1283,72 @@ function clear_data(k,mdu){
     }
 }
 
-function expand_reply(container,btnid){
-  var target = $(container);
-  var btn = $(btnid);
-  if(btn.data('init')=='0'){
-    btn.data('init',1);
-    btn.html('收起回复');
-    target.show();
-  }else{
-    btn.data('init',0);
-    btn.html('展开更多');
-    target.hide();
-    target.eq(0).show();
-    target.eq(1).show();
-    target.eq(2).show();
-  }
+function expand_reply(container, btnid, id, type, div_id) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id
+            },
+            function(data) {
+
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
+}
+
+function expand_reply_homework(container, btnid, id, type, div_id, is_in_course, course_activity, user_activity_id) {
+    var target = $(container);
+    var btn = $(btnid);
+    if (btn.data('init') == '0') {
+        btn.data('init', 1);
+        $.get(
+            '/users/all_journals',
+            {
+                type: type,
+                id: id,
+                div_id: div_id,
+                is_in_course: is_in_course,
+                course_activity: course_activity,
+                user_activity_id: user_activity_id
+            },
+            function(data) {
+            }
+        );
+        btn.html('收起回复');
+        //target.show();
+    } else if(btn.data('init') == '1') {
+        btn.data('init', 3);
+        btn.html('展开更多');
+        target.hide();
+        target.eq(0).show();
+        target.eq(1).show();
+        target.eq(2).show();
+    }
+    else {
+        btn.data('init', 1);
+        btn.html('收起回复');
+        target.show();
+    }
 }
 
 //by yk 列表描述将文字和起来去掉空格多于100就显示省略号