From 36329200b7a91995df9afc603d0c022ade7fc5e5 Mon Sep 17 00:00:00 2001 From: z9hang Date: Thu, 4 Sep 2014 14:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=AE=BF=E9=97=AE=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E9=93=BE=E6=8E=A5=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=9B=A0=EF=BC=9A1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=9C=89=E4=B8=AA=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=90=8D=E5=AD=97=E6=AD=A4=E5=A4=84=E6=9C=AA?= =?UTF-8?q?=E6=94=B9=E3=80=822=E4=B8=AA=E4=BA=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E9=93=BE=E6=9C=89=E4=B8=AA=E5=8F=98=E9=87=8F=E6=9C=AA=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show_projects_score.html.erb | 7 +++---- app/views/users/_score_new_index.html.erb | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/projects/show_projects_score.html.erb b/app/views/projects/show_projects_score.html.erb index 94f3dfaf8..b16f46f91 100644 --- a/app/views/projects/show_projects_score.html.erb +++ b/app/views/projects/show_projects_score.html.erb @@ -1,4 +1,3 @@ - @@ -16,7 +15,7 @@ <%= yield :header_tags -%> - +<% if @project %>

<%= l(:label_projects_score) %>

@@ -54,7 +53,7 @@
  • <%= link_to l(:label_file_score), {:controller => 'projects', :action => 'file_score_index', :remote => true}%> : - <%= format("%.2f" , document_score(@project)).to_i %> + <%= format("%.2f" , documents_score(@project)).to_i %>
  • <%= link_to l(:label_code_submit_score), {:controller => 'projects', :action => 'code_submit_score_index', :remote => true}%> : @@ -69,4 +68,4 @@
    <%= render :partial => 'projects/project_score_index', :locals => {:index => 0 } %>
    - \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/users/_score_new_index.html.erb b/app/views/users/_score_new_index.html.erb index d0647d8e3..733088067 100644 --- a/app/views/users/_score_new_index.html.erb +++ b/app/views/users/_score_new_index.html.erb @@ -1,5 +1,5 @@ - +<% option_num = get_option_number(@user,1) %>
    <%= l(:label_user_score) %>
    = <%= l(:label_user_score_of_collaboration) %> + <%= l(:label_user_score_of_influence) %> + <%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %>
    @@ -11,4 +11,4 @@ <% else %>
    = <%= format("%.2f" ,option_num.total_score).to_i %>
    <% end %> - +