新版样式header调整

app/helpers/application_helper.rb

@@ -95,6 +95,20 @@ module ApplicationHelper
     end
   end
 
+  #重载上面方法，增加样式显示
+  def link_to_user_header user,canShowRealName=false,options={}
+    if user.is_a?(User)
+      if canShowRealName
+        name = h(user.realname(options[:format]))
+      else
+        name = h(user.name(options[:format]))
+      end
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => options[:class]
+    else
+      h(user.to_s)
+    end
+  end
+
   # Displays a link to +issue+ with its subject.
   # Examples:
   #

app/views/layouts/_new_header.html.erb

@@ -12,24 +12,17 @@
   </div>
 
   <div id="TopUser" class="fr">
-    <div class="topuser_nav">
-      <ul id="TopUserNav">
+    <div id="menu">
+      <ul class="menu">
         <!--右侧登录、登出、注册按钮-->
-        <%= header_render_menu :account_menu -%>
         <% if User.current.logged? -%>
-            <!-- 用户信息 -->
-            <li class="fr">
-              <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
-                         { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain },
-                         {:class => 'my-message'} if User.current.logged?%>
-            </li>
 
-            <li class="fr" id="current_user_li">
-              <%= link_to_user(User.current)%>
+            <li id="current_user_li">
+              <%= link_to_user_header(User.current,false,:class =>'parent')%>
               <ul id="user_sub_menu">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
-                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
+                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain}, :class => "parent" %>
                       <ul id="my_projects_ul">
                         <% User.current.projects.each do |project| %>
                             <li title="<%=project.name%>">
@@ -42,10 +35,9 @@
 
                 <% if @show_course == 1 && User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) %>
                     <% user_course = get_user_course User.current%>
-
                     <% unless user_course.empty? %>
                         <li  id="my_courses_li">
-                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
+                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id}, :class => "parent"  %>
                           <ul id="my_courses_ul">
                             <% user_course.each do |course| %>
                                 <li title="<%=course.name%>">
@@ -62,6 +54,7 @@
               </ul>
             </li>
         <% end -%>
+        <%= header_render_menu :account_menu -%>
       </ul>
     </div><!--topuser_nav end-->
   </div>

lib/redmine/menu_manager.rb

@@ -110,7 +110,7 @@ module Redmine
         menu_items_for(menu, project) do |node|
           links << render_menu_node(node, project)
         end
-        links.empty? ? nil : links.reverse.join("\n").html_safe
+        links.empty? ? nil : links.join("\n").html_safe
       end
 
       def bootstrap_render_menu(menu, project=nil)
@@ -131,7 +131,7 @@ module Redmine
         else
           caption, url, selected = extract_node_details(node, project)
           unless url.to_s.include?( 'code_review')
-          return content_tag('li',render_single_menu_node(node, caption, url, selected),:class => 'fr')
+          return content_tag('li',render_single_menu_node(node, caption, url, selected))
           end
         end
       end