From 032e28067ddefe3f2bc3e9f8744c06d2214d3e4f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 4 Mar 2015 11:34:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#1959=20=E9=A1=B9=E7=9B=AE=E8=AF=84?= =?UTF-8?q?=E5=88=86=E6=98=AF0=E7=9A=84=EF=BC=8C=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=86=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d33a33a14..fc6713a94 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -96,21 +96,21 @@ <%= image_tag(url_to_avatar(@project), :class => 'avatar2') %> -
- <%= link_to @project.name, project_path(@project)%> -
-
- - <% if @project.project_type == 0 %> - <%= l(:label_project_grade)%> : - <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id - }, :style => "color: #EC6300;")%> - <% end %> - -
+ <% project_score = format("%.2f" ,project_scores(@project)).to_i%> +
+ <%= link_to @project.name, project_path(@project)%> +
+
+ <% if @project.project_type == 0 && project_score != 0 %> + <%= l(:label_project_grade)%> : + <%= link_to(project_score, {:controller => 'projects', + :action => 'show_projects_score', + :remote => true, + :id => @project.id + }, :style => "color: #EC6300;")%> + <% end %> + +
<%= render 'layouts/join_exit_project' %>
From a2d986f70c73376a00a114130af6a8436cd172f6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 4 Mar 2015 16:55:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index fc6713a94..9007e4c3c 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -104,10 +104,9 @@ <% if @project.project_type == 0 && project_score != 0 %> <%= l(:label_project_grade)%> : <%= link_to(project_score, {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id - }, :style => "color: #EC6300;")%> + :action => 'show_projects_score', + :remote => true, + :id => @project.id}, :style => "color: #EC6300;")%> <% end %> From 7f249d29f41d0a36bcbd4956b7c6f3f0a77eb82d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 5 Mar 2015 08:45:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 63 ++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 23 deletions(-) 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) %> +