From: Jean-Philippe Lang Date: Sun, 25 Jul 2010 12:49:15 +0000 (+0000) Subject: Merged r3889 from trunk. X-Git-Tag: 1.0.1~72 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=29e7ae969824c4f2b65e5158c48b1079678a7f93;p=redmine.git Merged r3889 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3890 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml index 4fc08d888..a8de88850 100644 --- a/app/views/admin/_menu.rhtml +++ b/app/views/admin/_menu.rhtml @@ -3,7 +3,6 @@
  • <%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %>
  • <%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %>
  • <%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %>
  • -
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %>
  • <%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %>
  • <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %>
  • @@ -11,6 +10,7 @@
  • <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields'}, :class => 'custom_fields' %>
  • <%= link_to l(:label_enumerations), {:controller => 'enumerations'}, :class => 'enumerations' %>
  • <%= link_to l(:label_settings), {:controller => 'settings'}, :class => 'settings' %>
  • +
  • <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %>
  • <% menu_items_for(:admin_menu) do |item| -%>
  • <%= link_to h(item.caption), item.url, item.html_options %>
  • <% end -%>