Merged r3909 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3959 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml
index a8de8885068dd06f31c45b4249c94d158678f2ae..bd3abebe11fe1fd214131d3106e36fdc455a5a6e 100644 (file)
--- a/app/views/admin/_menu.rhtml
+++ b/app/views/admin/_menu.rhtml
@@ -1,20 +1,5 @@
 <div id="admin-menu">
-       <ul>
-               <li><%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %></li>
-               <li><%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %></li>
-               <li><%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %></li>
-               <li><%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %></li>
-               <li><%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %></li>
-               <li><%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %></li>
-               <li><%= link_to l(:label_workflow), {:controller => 'workflows', :action => 'edit'}, :class => 'workflows' %></li>
-               <li><%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %></li>
-               <li><%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %></li>
-               <li><%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %></li>
-               <li><%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %></li>
-               <% menu_items_for(:admin_menu) do |item| -%>
-                       <li><%= link_to h(item.caption), item.url, item.html_options %></li>
-               <% end -%>
-               <li><%= link_to l(:label_plugins), {:controller => 'admin', :action => 'plugins'}, :class => 'plugins' %></li>
-               <li><%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info'}, :class => 'info' %></li>
-       </ul>
+  <ul>
+    <%= render_menu :admin_menu %>
+  </ul>
 </div>

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 238ee110a124e0f702fa40b3f99d954ec502a68d..b95166e767f91e7477ad8ce32a40a328b517701c 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -157,7 +157,22 @@ Redmine::MenuManager.map :application_menu do |menu|
 end
 
 Redmine::MenuManager.map :admin_menu do |menu|
-  # Empty
+  menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
+  menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
+  menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
+  menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
+  menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
+  menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
+            :html => {:class => 'issue_statuses'}
+  menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
+  menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
+            :html => {:class => 'custom_fields'}
+  menu.push :enumerations, {:controller => 'enumerations'}
+  menu.push :settings, {:controller => 'settings'}
+  menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
+            :html => {:class => 'server_authentication'}
+  menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
+  menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
 end
 
 Redmine::MenuManager.map :project_menu do |menu|