diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index ac5cc104d..5958e18bd 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -167,7 +167,7 @@ <%= l(:label_teacher_work_unit) %> : - <%= link_to @course.teacher.user_extensions.school,options={:controller => 'welcome',:action => 'course',:school_id => @course.teacher.user_extensions.school.id}, html_options={:method => 'get'} %> + <%= @course.teacher.user_extensions.school %> <% else %> diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index fd95f8c32..e4b5db1bf 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -121,7 +121,7 @@ <%= l(:label_teacher_work_unit) %> : <% unless @user.user_extensions.nil? || @user.user_extensions.school.nil? %> - <%= link_to @user.user_extensions.school,options={:controller => 'welcome',:action => 'course',:school_id => @user.user_extensions.school.id}, html_options={:method => 'get'} %> + <%= link_to @user.user_extensions.school,"http://course.trustie.net/?school_id=#{@user.user_extensions.school.id}" %> <% end %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 0f7c273f1..172bd67af 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -168,7 +168,7 @@
- +
@@ -178,7 +178,7 @@ @@ -189,7 +189,7 @@
<%= l(:label_user_joinin) %>:<%= format_time(@user.created_on) %>
<%= l(:field_occupation) %>: <% unless @user.user_extensions.school.nil? %> - <%= link_to @user.user_extensions.school.name, options={:controller => 'welcome',:action => 'course',:school_id => @user.user_extensions.school.id}, html_options={:method => 'get'} %> + <%= @user.user_extensions.school.name %> <% end %>