From 5fb0bc945c7cc361e041fbf6d20594c61c148bd0 Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Wed, 30 Oct 2013 21:22:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E2=80=9C=E6=88=91=E7=9A=84=E8=B4=A6=E5=8F=B7=E2=80=9D=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_college_header.html.erb    | 4 +++-
 app/views/layouts/_base_enterprise_header.html.erb | 3 +++
 lib/redmine.rb                                     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_base_college_header.html.erb b/app/views/layouts/_base_college_header.html.erb
index 3de3f5788..da9a58045 100644
--- a/app/views/layouts/_base_college_header.html.erb
+++ b/app/views/layouts/_base_college_header.html.erb
@@ -2,7 +2,9 @@
 	<div class="welcome_logo">
 		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px"), home_path %>
 	</div>
-	
+	<div id="account">
+		<%= render_menu :account_menu -%>
+	</div>
 		<%= 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 06b3fb2bd..7fd21afe1 100644
--- a/app/views/layouts/_base_enterprise_header.html.erb
+++ b/app/views/layouts/_base_enterprise_header.html.erb
@@ -14,6 +14,9 @@
 <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
 	<div class="welcome_logo">
 		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px"), home_path %>
+	</div>
+	<div id="account">
+		<%= render_menu :account_menu -%>
 	</div>
 		<%= 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 38b1a063e..4de558af3 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