diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index e9aeea165..f0a170ed3 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -6,17 +6,8 @@ <%= render_menu :account_menu -%> <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%if User.current.logged?%> - <%if [2,3].include?(User.current.user_extensions.identity) %> - <%= render_menu :top_enterprise_menu -%> - <% else %> - <%= render_menu :top_college_menu -%> - <% end %> - <% else %> - <%= content_tag('li', "#{link_to(l(:label_enter_college), :controller =>'projects', :action => 'course_enterprise', :project_type => 1 )}".html_safe, :id=> 'account-enterprise') %> - <%= content_tag('li', "#{link_to(l(:lable_enter_enterprise), :controller => 'projects', :action =>'enterprise_course', :project_type => 0)}".html_safe, :id=> 'account-college') %> - <% end %> + <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> + <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 1687ff34c..c7d4d48b4 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -19,13 +19,7 @@
-<% if session[:enterprise_college] == 2 %> -<%=render :partial => 'layouts/base_enterprise_header'%> -<% elsif session[:enterprise_college] == 1 %> -<%=render :partial => 'layouts/base_college_header'%> -<% else %> <%=render :partial => 'layouts/base_header'%> -<% end %>
<%= render_flash_messages %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 55b98675d..1227df7a2 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -20,13 +20,9 @@
- <% if session[:enterprise_college] == 2 %> - <%= render :partial => 'layouts/base_enterprise_header'%> - <% elsif session[:enterprise_college] == 1 %> - <%= render :partial => 'layouts/base_college_header'%> - <% else %> - <%= render :partial => 'layouts/base_header'%> - <% end %> + + <%= render :partial => 'layouts/baseheader'%> +
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 486f20aa9..e86ed8d98 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -17,16 +17,8 @@
-
- - <% if session[:enterprise_college] == 2 %> - <%= render :partial => 'layouts/base_enterprise_header'%> - <% elsif session[:enterprise_college] == 1 %> - <%= render :partial => 'layouts/base_college_header'%> - <% else %> - <%= render :partial => 'layouts/base_header'%> - <% end %> - +
+ <%= render :partial => 'layouts/base_header'%>