From 8d22ccd23a74481ba1635d12a3885135d8cb6b76 Mon Sep 17 00:00:00 2001 From: nwb Date: Thu, 3 Jul 2014 15:45:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 5a440aff3..69abf7ff3 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -63,7 +63,7 @@ <%= 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) %> + <%= l :label_update_time %>: <%= format_time(@course.created_at) %> From 5c0b1f3a47467d1331b5bab867881757b7efdd47 Mon Sep 17 00:00:00 2001 From: nwb Date: Thu, 3 Jul 2014 15:51:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 69abf7ff3..988143299 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -52,7 +52,6 @@ <% if format_date(day) == format_date(@date_to - @days) %> -

Test

From 52ddee2b2f3b148a955214c1784c3ab363d2768a Mon Sep 17 00:00:00 2001 From: nwb Date: Thu, 3 Jul 2014 16:07:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 95 +++++++++++++++----------------- app/views/projects/show.html.erb | 28 ++-------- 2 files changed, 49 insertions(+), 74 deletions(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 988143299..f34250d44 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,59 +57,45 @@ <% end %> - - <% if format_date(day) == format_date(@date_to - @days) %> -
- - - - - -
<%= 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_at) %> -
-
- <% 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..b7e0e3416 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -48,27 +48,8 @@ <% 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 -%> + + <% end -%> -<% else %> + <%end%> +
@@ -103,6 +85,6 @@
-<% end %> + From 9f7951a22c4822966986038bc76b1d34f5beef8b Mon Sep 17 00:00:00 2001 From: nwb Date: Thu, 3 Jul 2014 16:16:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 12 +++++++----- app/views/projects/show.html.erb | 14 ++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index f34250d44..59d6720c7 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -60,11 +60,6 @@ <% end -%> - <% end %> @@ -98,4 +93,11 @@ + + + diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index b7e0e3416..b4f767a5c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -51,12 +51,7 @@ <% end -%> - - + <%end%> @@ -88,3 +83,10 @@ + + +