From 3f8beaf97c6d6b449441c8dbce4ec8c161f4fa60 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 16:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8Dbanner?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blog_comments/show.html.erb         | 17 ++----------
 app/views/courses/syllabus.html.erb           | 17 ++----------
 app/views/memos/show.html.erb                 |  5 ----
 app/views/messages/_course_show.html.erb      | 12 ++-------
 .../messages/_org_subfield_show.html.erb      | 17 ++----------
 .../_org_subfield_message.html.erb            | 18 ++-----------
 .../organizations/_org_subfield_news.html.erb | 24 +++--------------
 .../organizations/_show_org_document.html.erb | 17 ++----------
 app/views/projects/_project_news.html.erb     | 24 +++--------------
 app/views/users/_course_homework.html.erb     |  7 ++---
 .../users/_course_journalsformessage.html.erb | 24 +++--------------
 app/views/users/_course_message.html.erb      | 23 ++--------------
 app/views/users/_course_news.html.erb         | 24 +++--------------
 app/views/users/_project_issue_reply.html.erb | 17 +-----------
 app/views/users/_project_message.html.erb     | 19 ++------------
 app/views/users/_project_news.html.erb        | 26 +++----------------
 app/views/users/_reply_banner.html.erb        | 18 +++++++++++++
 app/views/users/_user_blog.html.erb           | 24 +++--------------
 .../users/_user_journalsformessage.html.erb   | 17 +-----------
 public/stylesheets/public.css                 |  2 ++
 20 files changed, 59 insertions(+), 293 deletions(-)
 create mode 100644 app/views/users/_reply_banner.html.erb

diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 9617b7f76..7d8aaed86 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -87,11 +87,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @article.try(:author).try(:realname) == ' ' %>
-            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
@@ -126,11 +122,6 @@
             </span>
           </div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @article.id %>">
           <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
@@ -146,11 +137,7 @@
                 </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 %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index f2d9cbdbd..f369f2b49 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -75,11 +75,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @article.try(:author).try(:realname) == ' ' %>
-            <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
@@ -109,11 +105,6 @@
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @article.id %>">
           <%@article.children.reorder('created_on desc').each_with_index  do |reply,i| %>
@@ -129,11 +120,7 @@
                 </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 %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 9b3e82447..69e36ca34 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -81,11 +81,6 @@
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
       <div class="homepagePostReplyBannerTime"></div>
-      <!--<div class="homepagePostReplyBannerMore">-->
-        <!--<%# if @reply_count > 2%>-->
-        <!--<a# href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @memo.id%>" onclick="expand_reply('#reply_div_<%#= @memo.id %>','#reply_btn_<%#= @memo.id%>')" data-count="<%= @reply_count %>" data-init="0" >点击展开更多回复</a>-->
-        <!--<%# end %>-->
-      <!--</div>-->
     </div>
     <div class="" id="reply_div_<%=  @memo.id %>">
     <% @replies.each_with_index  do |reply,i| %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 746881bdc..560925070 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -71,11 +71,7 @@
       </div>
       <div class="cl"></div>
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
@@ -114,11 +110,7 @@
             </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 %>
+                <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
               </div>
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 145afcfd7..e5455bc85 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -103,11 +103,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
+        <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>
@@ -127,11 +123,6 @@
         <div class="homepagePostReplyBanner">
           <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
           <div class="homepagePostReplyBannerTime"></div>
-          <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
         </div>
         <div class="" id="reply_div_<%=  @topic.id %>">
           <% @replies.each_with_index  do |reply,i| %>
@@ -147,11 +138,7 @@
                 </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 %>
+                    <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                   </div>
                   <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe%>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 245651daf..19a6f0eaa 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
       </div>
@@ -80,17 +76,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 22f88e91b..d6e27daf1 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+         <%= link_to activity.author.show_name, user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -60,22 +57,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%= user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index cfbbcb5e6..06950258e 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -71,21 +71,8 @@
   <% count = document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=document.id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= document.id %>,'OrgDocumentComment',<%= document.id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => document, :user_activity_id => document.id} %>
+
     <div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
       <%= render :partial => 'users/all_replies', :locals => {:comments => comments_for_doc}%>
     </div>
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 0ca46e59b..2d498e827 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO
         <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -40,22 +37,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 8de9b3dce..ee12c04dd 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -7,11 +7,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %> TO <!--+"(课程名称)" -->
+        <%= link_to activity.user.show_name, user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+         TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 9ed7e6e76..85e0e9335 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <% end %> TO
+        <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
+         TO
         <% course=Course.find(activity.jour_id) %>
         <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
       </div>
@@ -43,22 +40,7 @@
   </div>
   <% count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 88fbcef6c..135013a62 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
@@ -89,22 +85,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent ? activity.parent : activity%>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index dd234ac90..efd3770aa 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+         <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -67,22 +64,7 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index d1f7363a7..3dac8026a 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -1,21 +1,6 @@
 <% count = activity.journals.count %>
 <div class="homepagePostReply">
-  <div class="homepagePostReplyBanner">
-    <div class="homepagePostReplyBannerCount">回复
-      <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-    </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%>',<%= 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>
+  <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
   <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 502706289..1abc36a31 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -6,11 +6,7 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
@@ -88,18 +84,7 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% activity= activity.parent_id.nil? ? activity : activity.parent %>
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 04edc05e0..cdceb490d 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(名称)"-->
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(名称)"-->
         <%= link_to activity.project.name.to_s+" | 新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
@@ -64,23 +61,8 @@
   </div>
   <% count=activity.comments.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
-
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+    
     <% comments = activity.comments.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb
new file mode 100644
index 000000000..0d7e0b2bd
--- /dev/null
+++ b/app/views/users/_reply_banner.html.erb
@@ -0,0 +1,18 @@
+<div class="homepagePostReplyBanner">
+  <div class="homepagePostReplyBannerCount">
+    <span>回复</span>
+    <span  class="reply_iconup" > ︿</span>
+    <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+        </span>
+  </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%>',<%= activity.id %>,'<%=activity.class %>',<%=user_activity_id %>)" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+          展开更多
+        </a>
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index f0761ff78..77510c858 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -6,11 +6,8 @@
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
-        <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %> TO  <!--+"(课程名称)"-->
+        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+         TO  <!--+"(课程名称)"-->
         <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
@@ -46,22 +43,7 @@
   </div>
   <% count=activity.children.count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index b84adf5fe..dd36d1328 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -64,22 +64,7 @@
   </div>
   <% count=fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-         <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-        </span>
-      </div>
-      <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%>',<%= 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>
+    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
     <% comments = activity.children.reorder("created_on desc").limit(3) %>
     <% if count > 0 %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 6c7bde896..74cbff5dd 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1166,3 +1166,5 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
\ No newline at end of file