diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 7a06c57cd..84b3768a2 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,7 +1,7 @@ <% if @events_by_day.size >0 %>

- <% # 暂时隐藏时间的显示%> + <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>

@@ -12,7 +12,9 @@ <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
- <%= h(e.project) if @project.nil? || @project.id != e.project.id %> + + <%= h(e.project) if @project.nil? || @project.id != e.project.id %> + <% if @canShowRealName %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> @@ -30,10 +32,18 @@
<%= l :label_activity_time %> - :  <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> + :  + <%= format_activity_day(day) %> + <%= format_time(e.event_datetime, false) %> + <% if e.event_type == "issue" %>
- <%= link_to l(:label_find_all_comments), issue_path(e) %> <%= l(:label_comments_count, :count => e.journals.count) %> + + <%= link_to l(:label_find_all_comments), issue_path(e) %> + + + <%= l(:label_comments_count, :count => e.journals.count) %> +
<% end %>
@@ -48,21 +58,24 @@ <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
- - <% if @canShowRealName %> - (<%= link_to_user(@user, @canShowRealName) %> - ) - <% else %> - <%= link_to_user(@user) %> - <% end %> - <%#= l(:label_new_activity) %> - - <%= l(:label_user_create_project) %> <%= link_to @project.name %> + + <% if @canShowRealName %> + (<%= link_to_user(@user, @canShowRealName) %>) + <% else %> + <%= link_to_user(@user) %> + <% end %> + <%#= l(:label_new_activity) %> + + <%= l(:label_user_create_project) %> + <%= link_to @project.name %> !
- <%= l :label_activity_time %>: <%= format_time(@project.created_on) %> + + <%= l :label_activity_time %>: + <%= format_time(@project.created_on) %> +
@@ -75,20 +88,24 @@
- <% if @canShowRealName %> - (<%= link_to_user(@user, @canShowRealName) %> - ) - <% else %> - <%= link_to_user(@user) %> - <% end %> + <% if @canShowRealName %> + (<%= link_to_user(@user, @canShowRealName) %>) + <% else %> + <%= link_to_user(@user) %> + <% end %> <%#= l(:label_new_activity) %> - <%= l(:label_user_create_project) %> <%= link_to @project.name %> + <%= @user.to_s %> + <%= l(:label_user_create_project) %> + <%= link_to @project.name %> !
- <%= l :label_activity_time %>: <%= format_time(@project.created_on) %> + + <%= l :label_activity_time %>: + <%= format_time(@project.created_on) %> +