diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 494b8333f..ae5b18291 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -801,6 +801,11 @@ class UsersController < ApplicationController
else
@user = User.find(params[:id])
end
+ if @user.user_score.nil?
+ us = UserScore.new
+ us.user_id = @user.id
+ us.save
+ end
rescue ActiveRecord::RecordNotFound
render_404
end
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index dfdf0a102..adedb66c5 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -73,7 +73,8 @@
- <%= @project.name %> |
+
+ <%= link_to @project.name,project_path(@project) %> |
@@ -180,7 +181,8 @@
<% unless @course.teacher.user_extensions.nil? %>
|
<%= l(:label_teacher_work_unit) %> : |
-
+
+
<% else %>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 91120feb8..a14f25cd6 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -62,7 +62,7 @@
- <%= h @contest.name %> |
+ <%= link_to @contest.name, show_contest_contest_path(@contest) %> |
<% if User.current.login? %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 433e8aae6..bd15b128e 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -57,7 +57,7 @@
<%= image_tag(url_to_avatar(@project), :class => 'avatar2') %> |
- <%= @project.name %>
+ <%= link_to @project.name, project_path(@project)%>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 8c9531b55..193171e69 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -56,7 +56,9 @@
- <%= h (@user.name) %>
+
+
+ | <%= link_to h (@user.name) %>
<%= image_tag(gender_avatar_uri(@user), weight:"25px", height:"25px") if (@user.user_extensions && (@user.user_extensions.identity != 2) )%> |
@@ -92,7 +94,8 @@
<% comments_score = comments_count * 0.1 %>
<% finall_influence_score = news_score + wiki_contents_score + comments_score %>
<% finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %>
-
+
+
<%= l(:label_user_grade)%>:
<%= link_to(format("%.2f" , @user.user_score.total_score).to_f, {:controller => 'users',
@@ -102,6 +105,7 @@
}, :style => 'color :#E8770D;') %>
|
+
<%= l(:label_user_grade)%>:
<%= link_to(format("%.2f" , finall_user_score).to_f, {:controller => 'users',
@@ -174,12 +178,13 @@
-->
+
<% unless @user.user_extensions.nil? %>
<% unless @user.user_extensions.identity == 2 %>
|
<%= l(:field_occupation) %>: |
diff --git a/app/views/projects/_course.html.erb b/app/views/projects/_course.html.erb
index 6ea802037..6c4bfe9a6 100644
--- a/app/views/projects/_course.html.erb
+++ b/app/views/projects/_course.html.erb
@@ -18,7 +18,11 @@
<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
<%# unless @project.course_extra.school.nil? %>
- <%= @project.course_extra.teacher.user_extensions.school.try(:name) %>
+
+ <% unless @project.course_extra.teacher.user_extensions.school.nil? %>
+ <%= link_to @project.course_extra.teacher.user_extensions.school.try(:name),options={:controller => 'welcome',:action => 'course',:school_id => @project.course_extra.teacher.user_extensions.school.id}, html_options={:method => 'get'}%>
+ <% end %>
+
<%# end %>
<% end %>
| | | |