From ca7ad03a0558ca690e78a5e6f3cb09f5d7f22737 Mon Sep 17 00:00:00 2001 From: nwb Date: Wed, 16 Jul 2014 10:36:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=AF=BE=E7=A8=8B=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E4=BF=A1=E6=81=AF=202.=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8A=A8=E6=80=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 82 ++++++++++++------- app/views/projects/show.html.erb | 130 ++++++++++++++++++------------- 2 files changed, 132 insertions(+), 80 deletions(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index f0cc62140..8b713476e 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -58,39 +58,65 @@ <% end -%> + <% if (@events_pages.page == @events_pages.last_page) %> +
+ + + + + +
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> + + + + + +
+ <% if @canShowRealName %> + (<%= link_to_user(@user, @canShowRealName) %> + ) + <% else %> + <%= link_to_user(@user)%> + <% end %> + + <%= l(:label_user_create_project) %> <%= link_to @course.name %> + !
<%= l :label_create_time %> + : <%= format_time(@course.created_at) %> +
+
+
+ <% end %> + + <%else%> +
+ + + + + +
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> + + + + + +
+ <% if @canShowRealName %> + (<%= link_to_user(@user, @canShowRealName) %> + ) + <% else %> + <%= link_to_user(@user)%> + <% end %> + <%= l(:label_user_create_project) %> <%= link_to @course.name %> + !
<%= l :label_create_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_create_time %> - : <%= format_time(@course.created_at) %> -
-
-