diff --git a/Gemfile.lock b/Gemfile.lock index 189cbabce..1767afd4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,4 +185,5 @@ DEPENDENCIES sass-rails (~> 3.2.3) seems_rateable! shoulda (> 3.3.2) + therubyracer uglifier (>= 1.0.3) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index b4e1e4eef..5579dfb5b 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -121,16 +121,6 @@ - diff --git a/app/views/open_source_projects/master_apply.html.erb b/app/views/open_source_projects/master_apply.html.erb index 0288692fc..f99701932 100644 --- a/app/views/open_source_projects/master_apply.html.erb +++ b/app/views/open_source_projects/master_apply.html.erb @@ -39,11 +39,7 @@
- <%= l(:label_user_grade) %>: <%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users', - :action => 'show_score', - :remote => true, - :id => user.id}, - :style=>"color: #EC6300;") %> + <%= l(:label_user_grade) %>: <%= render :partial => 'users/user_score', :locals => {:user => user}%>
diff --git a/app/views/users/_user_score.html.erb b/app/views/users/_user_score.html.erb index 836daa175..d047c11d0 100644 --- a/app/views/users/_user_score.html.erb +++ b/app/views/users/_user_score.html.erb @@ -1,5 +1,5 @@ <%= l(:label_user_grade)%>: -<%= link_to(format("%.2f" , @user.user_score_attr.total_score).to_f, {:controller => 'users', +<%= link_to(format("%.2f" , user.user_score_attr.total_score).to_f, {:controller => 'users', :action => 'show_new_score', :remote => true, :id => user.id diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb index 60ab6b152..bf97ad298 100644 --- a/app/views/users/_user_show.html.erb +++ b/app/views/users/_user_show.html.erb @@ -40,11 +40,7 @@
<%= l(:label_user_grade) %>: - <%= link_to( format("%.2f" , finall_user_score).to_f, {:controller => 'users', - :action => 'show_score', - :remote => true, - :id => user.id}, - :style=>"color: #EC6300;") %> + <%= render :partial => 'users/user_score', :locals => {:user => user}%>