diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 5a440aff3..59d6720c7 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -11,7 +11,7 @@
- + +
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%><%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %> @@ -19,7 +19,9 @@ <%= h(e.event_title) if @course.nil? || (e.course != nil && @course.id != e.course.id) %> <% if @canShowRealName %> - <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>(<%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>) + <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> + (<%= link_to_user(e.event_author, @canShowRealName) if e.respond_to?(:event_author) %> + ) <% else %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <% end %> @@ -31,18 +33,23 @@ - - + <% if e.event_type == "issue" %> - + <% end %> -
+

- <%= h(truncate(strip_tags(e.event_description).gsub(/ /,' '), length: 30, omission:'...')) %> + <%= h(truncate(strip_tags(e.event_description).gsub(/ /, ' '), length: 30, omission: '...')) %>

<%= l :label_activity_time %>：  <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> <%= l :label_activity_time %> + ：  <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> + <%= 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) %> +
+
@@ -50,60 +57,47 @@ <% end %> - - <% if format_date(day) == format_date(@date_to - @days) %> -

Test

-
- - - - - -
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> - - - - - -
<%= link_to (h @user.try(:name)), user_path(@user) if @user %> <%= l(:label_user_create_project) %> <%= link_to @course.name %> !
<%= l :label_update_time %>: <%= format_time(@course.created_on) %> -
-
- <% end %> <% end -%> - -<% else %> -
- - - - - -
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> - - - - - -
- <% - #判断是否显示真名 - if @canShowRealName - %> - <%= link_to (h @user.try(:name)), user_path(@user) if @user %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>) - <% else %> - <%= link_to (h @user.try(:name)), user_path(@user) if @user %> - <% end %> - <%= l(:label_user_create_project) %> <%= link_to @course.name %> !
<%= l :label_update_time %>: <%= format_time(@course.created_at) %> -
-
<% end %> +
+ + + + + +
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> + + + + + +
+ <% + #判断是否显示真名 + if @canShowRealName + %> + <%= link_to (h @user.try(:name)), user_path(@user) if @user %> + (<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>) + <% else %> + <%= link_to (h @user.try(:name)), user_path(@user) if @user %> + <% end %> + <%= l(:label_user_create_project) %> <%= link_to @course.name %> + !
<%= l :label_update_time %> + : <%= format_time(@course.created_at) %> +
+
+
+ + + + diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 6be2a4d72..b4f767a5c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -48,37 +48,14 @@ <% end %> + + <% end -%> - - <% if format_date(day) == format_date(@date_to - @days) %> -

Test

-
- - - - - -
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> - - - - - -
<%= link_to (h @user.try(:name)), user_path(@user) if @user %> <%= l(:label_user_create_project) %> <%= link_to @project.name %> !
<%= l :label_update_time %>: <%= format_time(@project.created_on) %> -
-
- <% end %> - <% end -%> - - - + -<% else %> + <%end%> +
@@ -103,6 +80,13 @@
-<% end %> + + + +