diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 809f78ddc..24cbecb81 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -98,6 +98,9 @@ class WelcomeController < ApplicationController end def course + redirect_to signin_path + return + @course_page = FirstPage.find_by_page_type('course') @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117 @logoLink ||= logolink() @@ -140,6 +143,9 @@ class WelcomeController < ApplicationController def contest + redirect_to signin_path + return + @contest_page = FirstPage.find_by_page_type('contest') @contest_notifications = Contestnotification.order("created_at desc").limit(5) end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7f93345b4..7b83bb1c2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2254,6 +2254,21 @@ module ApplicationHelper technical_title end + def get_user_roll user + technical_title = "" + case user.user_extensions.identity.to_s + when "0" + technical_title = get_technical_title user + when "1" + technical_title = l(:label_account_identity_student) + when "2" + technical_title = l(:label_account_identity_enterprise) + when "3" + technical_title = l(:label_account_identity_developer) + end + technical_title + end + def ie8? request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/ diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 32813b58d..20a626c12 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -50,9 +50,11 @@ <% end %>
-- <%= get_technical_title @user %> -
+ <% if @user.user_extensions && @user.user_extensions.identity %> ++ <%= get_user_roll @user %> +
+ <% end%>