From eb7e2539b8de7904a34d4674a280f6d3014b2caf Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Thu, 23 Jan 2014 21:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=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_header.html.erb                  | 9 +++++----
 lib/redmine.rb                                           | 1 -
 .../themes/redpenny-master/stylesheets/application.css   | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 3e3ea5a80..127dfe8a7 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -9,7 +9,6 @@
 	<div id="loggedas">
 	<ul style="padding:0 0; margin:0 0;display:inline;">
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;" class="loggedas_li">
-
 			<%=link_to_user(User.current)%>
 			<ul class="sub_menu">
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
@@ -18,7 +17,9 @@
 				<li><%=link_to l(:label_my_projects), user_projects_user_path(User.current), target:'my_path' %></li>
 				<li><%=link_to l(:label_user_edit), my_account_path, target:'my_path' %></li>
 			</ul>
-
+		</li>
+		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
+			<%=link_to l(:label_my_message), { :controller => 'users', :action => 'user_newfeedback', id: User.current.id }, {:class => 'my-message'} if User.current.logged?%>
 		</li>
 	</ul>
 	</div>	
@@ -32,12 +33,12 @@
 
 <script type="text/javascript">
 	function setMessageCount () {
-		var mes = $('#account .my-message')
+		var mes = $('#loggedas .my-message')
 		mes.html(mes.html()+'('+<%=User.current.count_new_jour.to_s%>+")")
 	}
 
 	function addSlipMenu () {
-		var loggedas = $('#loggedas')
+		var loggedas = $('#loggedas ul li:first')
 		var sub_menu = $('.sub_menu')
 		loggedas.mouseenter(function(event) {
 				sub_menu.show();
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 8a3edbfc9..a013ebaca 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -261,7 +261,6 @@ 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_message, { :controller => 'users', :action => 'user_newfeedback', id: User.current.id }, :if => Proc.new { User.current.logged? }
   menu.push :logout, :signout_path, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? }
 end
 ########fq
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 4956101d9..f55078750 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -2195,10 +2195,10 @@ ul.messages-for-user-reply li {
 	border-bottom: 1px solid #129DAD;
 	color: white;
 	list-style:  none ;
-	width: 90%;
 	padding: 6px 0px;
 	margin-left: 5%;
 }
+
 #loggedas li span{
 	cursor: pointer;
 }
@@ -2209,6 +2209,7 @@ ul.messages-for-user-reply li {
 
 }
 #loggedas .sub_menu {
+	
 	box-shadow: 2px 2px 6px #b0b0b0 ;
 	display: none;
 	background: #13AEBF 0 0 no-repeat;
@@ -2217,11 +2218,14 @@ ul.messages-for-user-reply li {
 	position: absolute;
 	top: 40px;
 	font-size: 1.1em;
-	margin: 0px;
+	margin: 0px auto;
 	padding: 0px 0px;
 	text-align: center;
 	z-index: 1;
 }
 #loggedas .sub_menu a{
 	margin: 0px;
+}
+.sub_menu li{
+	width: 90%;
 }
\ No newline at end of file