Adds an admin layout that displays the admin menu in the sidebar.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3176 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 30 insertions, 76 deletions

diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml
index ef2abbc56..87fa5c780 100644
--- a/app/views/admin/_menu.rhtml
+++ b/app/views/admin/_menu.rhtml
@@ -1,25 +1,19 @@
-<div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">
-    <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuProjects');" onclick="this.blur(); return false;"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-    <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuUsers');" onclick="this.blur(); return false;"><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');" onclick="this.blur(); return false;"><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 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>
+		<% 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>
 </div>
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 3c96a9a0a..f7e72313e 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -1,56 +1,8 @@
 <h2><%=l(:label_administration)%></h2>
 
-<%= render :partial => 'no_data' if @no_configuration_data %>
-
-<p class="icon22 icon22-projects">
-<%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
-<%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
-</p>
-
-<p class="icon22 icon22-users">
-<%= link_to l(:label_user_plural), :controller => 'users' %> |
-<%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
-</p>
-
-<p class="icon22 icon22-groups">
-<%= link_to l(:label_group_plural), :controller => 'groups' %> |
-<%= link_to l(:label_new), :controller => 'groups', :action => 'new' %>
-</p>
-
-<p class="icon22 icon22-role">
-<%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
-</p>
-
-<p class="icon22 icon22-tracker">
-<%= link_to l(:label_tracker_plural), :controller => 'trackers' %> |
-<%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |
-<%= link_to l(:label_workflow), :controller => 'workflows', :action => 'edit' %>
-</p>
-
-<p class="icon22 icon22-workflow">
-<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
-</p>
-
-<p class="icon22 icon22-options">
-<%= link_to l(:label_enumerations), :controller => 'enumerations' %>
-</p>
-
-<p class="icon22 icon22-settings">
-<%= link_to l(:label_settings), :controller => 'settings' %>
-</p>
-
-<% menu_items_for(:admin_menu) do |item| -%>
-  <%= content_tag 'p',
-    link_to(h(item.caption), item.url, item.html_options),
-    :class => ["icon22", "icon22-#{item.name}"].join(' ') %>
-<% end -%>
-
-<p class="icon22 icon22-plugin">
-<%= link_to l(:label_plugins), :controller => 'admin', :action => 'plugins' %>
-</p>
-
-<p class="icon22 icon22-info">
-<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
-</p>
+<div id="admin-index">
+	<%= render :partial => 'no_data' if @no_configuration_data %>
+	<%= render :partial => 'menu' %>
+</div>
 
 <% html_title(l(:label_administration)) -%>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
new file mode 100644
index 000000000..197c32a84
--- /dev/null
+++ b/app/views/layouts/admin.rhtml
@@ -0,0 +1,8 @@
+<% unless controller_name == 'admin' && action_name == 'index' %>
+	<% content_for :sidebar do %>
+		<h3><%=l(:label_administration)%></h3>
+	  <%= render :partial => 'admin/menu' %>
+	<% end %>
+<% end %>
+
+<%= render :file => "layouts/base" %>