The following menus can now be extended by plugins: top_menu, account_menu, application_menu (empty by default).

Sligth layout change: links in the top menu are now li elements.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1137 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/application_helper.rb

@@ -31,14 +31,6 @@ module ApplicationHelper
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
     link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
   end
-  
-  def link_to_signin
-    link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin'
-  end
-  
-  def link_to_signout
-    link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout'
-  end
 
   # Display a link to user's account page
   def link_to_user(user)

app/views/layouts/base.rhtml

@@ -21,20 +21,10 @@
 <div id="wrapper">
 <div id="top-menu">
     <div id="account">
-        <% if User.current.logged? %>
-            <%=l(:label_logged_as)%> <%= User.current.login %> -
-            <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
-            <%= link_to_signout %>
-        <% else %>
-            <%= link_to_signin %>
-            <%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
-        <% end %>
+        <%= render_menu :account_menu -%>
     </div>
-    <%= link_to l(:label_home), home_url, :class => 'home' %>
-    <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => 'mypage' if User.current.logged? %>
-    <%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => 'projects' %>
-    <%= link_to l(:label_administration), { :controller => 'admin' }, :class => 'admin' if User.current.admin? %>
-    <%= link_to l(:label_help), Redmine::Info.help_url, :class => 'help' %>
+    <%= content_tag('div', "#{l(:label_logged_as)} #{User.current.login}", :id => 'loggedas') if User.current.logged? %>
+    <%= render_menu :top_menu -%>
 </div>
       
 <div id="header">