From 8fdef1f82098258e2d5dda840ce5f4a921726f51 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 Mar 2007 10:17:21 +0000
Subject: [PATCH] admin menu modification

git-svn-id: http://redmine.rubyforge.org/svn/trunk@342 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/_menu.rhtml   | 25 +++++++++++++++++++++++++
 app/views/layouts/base.rhtml  | 19 +------------------
 app/views/projects/show.rhtml |  2 +-
 lang/de.yml                   |  1 +
 lang/en.yml                   |  1 +
 lang/es.yml                   |  1 +
 lang/fr.yml                   |  1 +
 lang/it.yml                   |  1 +
 lang/ja.yml                   |  1 +
 9 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 app/views/admin/_menu.rhtml

diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml
new file mode 100644
index 00000000..0b52ce6d
--- /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 030116c6..91208c77 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 9ecbbb66..8b050158 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, 
diff --git a/lang/de.yml b/lang/de.yml
index 9d4015d3..05ea437b 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -330,6 +330,7 @@ label_current_version: Gegenwärtige Version
 label_preview: Vorbetrachtung
 label_feed_plural: Feeds
 label_changes_details: Details of all changes
+label_issue_tracking: Issue tracking
 
 button_login: Einloggen
 button_submit: Einreichen
diff --git a/lang/en.yml b/lang/en.yml
index 637c36f5..683c0ee7 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -330,6 +330,7 @@ label_current_version: Current version
 label_preview: Preview
 label_feed_plural: Feeds
 label_changes_details: Details of all changes
+label_issue_tracking: Issue tracking
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 604a9e1c..d455bcf7 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -330,6 +330,7 @@ label_current_version: Versión actual
 label_preview: Previo
 label_feed_plural: Feeds
 label_changes_details: Detalles de todos los cambios
+label_issue_tracking: Issue tracking
 
 button_login: Conexión
 button_submit: Someter
diff --git a/lang/fr.yml b/lang/fr.yml
index a41f61f3..83800e0a 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -330,6 +330,7 @@ label_current_version: Version actuelle
 label_preview: Prévisualisation
 label_feed_plural: Flux RSS
 label_changes_details: Détails de tous les changements
+label_issue_tracking: Suivi des demandes
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/it.yml b/lang/it.yml
index 4380651f..5bc88fb0 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -330,6 +330,7 @@ label_current_version: Versione corrente
 label_preview: Previsione
 label_feed_plural: Feeds
 label_changes_details: Particolari di tutti i cambiamenti
+label_issue_tracking: Issue tracking
 
 button_login: Login
 button_submit: Invia
diff --git a/lang/ja.yml b/lang/ja.yml
index 0c7c00ad..36272bcc 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -331,6 +331,7 @@ label_current_version: 最近版
 label_preview: 下検分
 label_feed_plural: Feeds
 label_changes_details: Details of all changes
+label_issue_tracking: Issue tracking
 
 button_login: ログイン
 button_submit: 変更