diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb index 869c12f72..dc759a809 100644 --- a/app/views/users/_my_joinedcourse.html.erb +++ b/app/views/users/_my_joinedcourse.html.erb @@ -26,9 +26,9 @@

<% end %> - + diff --git a/app/views/users/_score_index.html.erb b/app/views/users/_score_index.html.erb index 210f45bf8..8c2f98541 100644 --- a/app/views/users/_score_index.html.erb +++ b/app/views/users/_score_index.html.erb @@ -26,8 +26,8 @@
<%= l(:label_user_score) %>
= <%= l(:label_user_score_of_topic) %> + <%= l(:label_user_score_of_project) %> + - <%= l(:label_user_score_of_activity) %>
-
   + <%= l(:label_user_score_of_influence) %>
+ <%= l(:label_user_score_of_activity)%> + <%= l(:label_user_score_of_influence) %> +
= <%= format("%.2f" , finall_messages_score).to_f %> + <%= format("%.2f" , finall_user_project_score).to_f %> + <%= format("%.2f" , finall_activity_score).to_f %> + <%= format("%.2f" , finall_influence_score).to_f %>
= <%= format("%.2f" , finall_user_score).to_f %>
diff --git a/app/views/users/_show_score.html.erb b/app/views/users/_show_score.html.erb index d17b2bfa9..655b1de6a 100644 --- a/app/views/users/_show_score.html.erb +++ b/app/views/users/_show_score.html.erb @@ -34,7 +34,7 @@ - +
<%= h @user.show_name %>
<%= @user.user_extensions.show_identity %>
<%= @user.user_extensions.show_identity %>
@@ -44,10 +44,36 @@ + + + + + + <%= link_to l(:label_user_score), {:controller => 'users', :action => 'score_index', :remote => true} %> : + <%= format("%.2f" , finall_user_score).to_f %> +
+ + <%= link_to l(:label_user_score_of_topic), {:controller => 'users', :action => 'topic_score_index', :remote => true} %> : + <%= format("%.2f" , finall_messages_score).to_f %> +
+ + <%= link_to l(:label_user_score_of_project), {:controller => 'users', :action => 'project_score_index', :remote => true} %> : + <%= format("%.2f" , finall_user_project_score).to_f %> +
+ + <%= link_to l(:label_user_score_of_activity), {:controller => 'users', :action => 'activity_score_index', :remote => true} %> : + <%= format("%.2f" , finall_activity_score).to_f %> +
+ + <%= link_to l(:label_user_score_of_influence), {:controller => 'users', :action => 'influence_score_index', :remote => true} %> : + <%= format("%.2f" , finall_influence_score).to_f %> +
+
+ -
+ +
<%= render :partial => 'users/score_index', :locals => {:index => 0 } %>
\ No newline at end of file diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb index 813815a29..44447d47c 100644 --- a/app/views/users/user_activities.html.erb +++ b/app/views/users/user_activities.html.erb @@ -29,10 +29,10 @@ - + - +
<%= content_tag('span', h(e.project), :class => 'project') %> <%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %>

<%= format_activity_description(e.event_description) %>

<%= format_activity_day(day) %>