diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index fbde9717b..d8268d698 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -94,7 +94,7 @@
回复 - <%= count>0 ? "(#{count})" : "" %>▪ + <%= count>0 ? "(#{count})" : "" %> <% if activity.author == User.current %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 0b861c8c0..75940b32c 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -91,9 +91,17 @@ <% count=activity.children.count%> <% end %>
-
-
-
回复(<%=count %>)
+
+
回复 + <%= count>0 ? "(#{count})" : "" %> + + <% if activity.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> + <% end %> + +
<%#=format_date(activity.updated_on)%>
<%if count>3 %> @@ -124,6 +132,13 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_time(reply.created_on) %> + + <% if reply.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> + <% end %> +
<%= reply.content.html_safe %>