diff --git a/app/views/layouts/_base_college_header.html.erb b/app/views/layouts/_base_college_header.html.erb index 3de3f578..da9a5804 100644 --- a/app/views/layouts/_base_college_header.html.erb +++ b/app/views/layouts/_base_college_header.html.erb @@ -2,7 +2,9 @@ - +
+ <%= 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? %> diff --git a/app/views/layouts/_base_enterprise_header.html.erb b/app/views/layouts/_base_enterprise_header.html.erb index 06b3fb2b..7fd21afe 100644 --- a/app/views/layouts/_base_enterprise_header.html.erb +++ b/app/views/layouts/_base_enterprise_header.html.erb @@ -14,6 +14,9 @@
+
+ <%= 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? %> diff --git a/lib/redmine.rb b/lib/redmine.rb index 38b1a063..4de558af 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -254,7 +254,7 @@ end Redmine::MenuManager.map :account_menu do |menu| menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? } menu.push :register, :register_path, :if => Proc.new { !User.current.logged? && Setting.self_registration? } - menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } + # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } menu.push :logout, :signout_path, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } end ########fq