admin menu modification

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

3 files changed, 27 insertions, 19 deletions

diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml
new file mode 100644
index 000000000..0b52ce6dc
--- /dev/null
+++ b/app/views/admin/_menu.rhtml
@@ -0,0 +1,25 @@
+<div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">
+    <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuProjects');"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
+    <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuUsers');"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
+    <%= link_to l(:label_role_and_permissions), {:controller => 'roles' }, :class => "menuItem" %>
+    <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuTrackers');"><span class="menuItemText"><%=l(:label_issue_tracking)%></span><span class="menuItemArrow">&#9654;</span></a>
+    <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields' }, :class => "menuItem" %>
+    <%= link_to l(:label_enumerations), {:controller => 'enumerations' }, :class => "menuItem" %>
+    <%= link_to l(:field_mail_notification), {:controller => 'admin', :action => 'mail_options' }, :class => "menuItem" %>
+    <%= link_to l(:label_authentication), {:controller => 'auth_sources' }, :class => "menuItem" %>
+    <%= link_to l(:label_settings), {:controller => 'settings' }, :class => "menuItem" %>
+    <%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info' }, :class => "menuItem" %>
+</div>
+<div id="menuTrackers" class="menu">
+    <%= link_to l(:label_tracker_plural), {:controller => 'trackers' }, :class => "menuItem" %>
+    <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses' }, :class => "menuItem" %>
+    <%= link_to l(:label_workflow), {:controller => 'roles', :action => 'workflow' }, :class => "menuItem" %>
+</div>
+<div id="menuProjects" class="menu">
+    <%= link_to l(:button_list), {:controller => 'admin', :action => 'projects' }, :class => "menuItem" %>
+    <%= link_to l(:label_new), {:controller => 'projects', :action => 'add' }, :class => "menuItem" %>
+</div>
+<div id="menuUsers" class="menu">
+    <%= link_to l(:button_list), {:controller => 'users' }, :class => "menuItem" %>
+    <%= link_to l(:label_new), {:controller => 'users', :action => 'add' }, :class => "menuItem" %>
+</div>
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 030116c60..91208c77a 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -60,24 +60,7 @@
 	</div>
 
     <% if admin_loggedin? %>
-    <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">
-        <a class="menuItem" href="<%= url_for :controller => 'admin', :action => 'projects' %>" onmouseover="menuItemMouseover(event,'menuProjects');"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-        <a class="menuItem" href="<%= url_for :controller => 'users' %>" onmouseover="menuItemMouseover(event,'menuUsers');"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-        <%= link_to l(:label_role_and_permissions), {:controller => 'roles' }, :class => "menuItem" %>
-        <a class="menuItem" href="<%= url_for :controller => 'trackers' %>" onmouseover="menuItemMouseover(event,'menuTrackers');"><span class="menuItemText"><%=l(:label_tracker_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-        <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields' }, :class => "menuItem" %>
-        <%= link_to l(:label_enumerations), {:controller => 'enumerations' }, :class => "menuItem" %>
-        <%= link_to l(:field_mail_notification), {:controller => 'admin', :action => 'mail_options' }, :class => "menuItem" %>
-        <%= link_to l(:label_authentication), {:controller => 'auth_sources' }, :class => "menuItem" %>
-        <%= link_to l(:label_settings), {:controller => 'settings' }, :class => "menuItem" %>
-        <%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info' }, :class => "menuItem" %>
-    </div>
-    <div id="menuTrackers" class="menu">
-        <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses' }, :class => "menuItem" %>
-        <%= link_to l(:label_workflow), {:controller => 'roles', :action => 'workflow' }, :class => "menuItem" %>
-    </div>
-    <div id="menuProjects" class="menu"><%= link_to l(:label_new), {:controller => 'projects', :action => 'add' }, :class => "menuItem" %></div>
-    <div id="menuUsers" class="menu"><%= link_to l(:label_new), {:controller => 'users', :action => 'add' }, :class => "menuItem" %></a></div>
+		<%= render :partial => 'admin/menu' %>        
     <% end %>
     
     <% unless @project.nil? || @project.id.nil? %>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 9ecbbb663..8b0501585 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -20,7 +20,7 @@
     <div class="contextual">
     <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
     </div>
-    <h3 class="icon22 icon22-tracker"><%=l(:label_tracker_plural)%></h3>
+    <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
     <ul>
     <% for tracker in @trackers %>    
       <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,