From 4b064f3c2ad82be0add4f3d18e1761530d385e59 Mon Sep 17 00:00:00 2001 From: nwb Date: Thu, 15 May 2014 13:53:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E7=AB=9E=E8=B5=9B=E7=B1=BB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=202.=E4=BC=98=E5=8C=96=E8=B7=B3=E8=BD=AC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 2774ea4d4..997ff1728 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -42,9 +42,15 @@ <%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%= link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <% end %> -

<%=textilizable act.notes %> - <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %>

- + +

<%= textilizable act.notes %>

+
<%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> +
+ + + + +
<%=(l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
@@ -174,9 +180,26 @@
<%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
-
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.journals.count)%>
+
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.journals.count)%>
+<% when 'Contest' %> + + <% if e.user == User.current%> + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> + <% else %> + <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> + <% end %> + +

<%= h act.description %>

+ + +
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+ +<% else %> + <% f=1 %> <% end %>