fixed #9005: administration-menu doesn't work with prefix-url

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

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 53c346dc8fe301c809b009ba558eddd3712402d0..42275b11fc5a250eacc88b34cc2fb33eba2db861 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -61,23 +61,23 @@
 \r
     <% if admin_loggedin? %>\r
     <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">\r
-        <a class="menuItem" href="/admin/projects" onmouseover="menuItemMouseover(event,'menuProjects');"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>\r
-        <a class="menuItem" href="/users" onmouseover="menuItemMouseover(event,'menuUsers');"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">&#9654;</span></a>\r
-        <a class="menuItem" href="/roles"><%=l(:label_role_and_permissions)%></a>\r
-        <a class="menuItem" href="/trackers" onmouseover="menuItemMouseover(event,'menuTrackers');"><span class="menuItemText"><%=l(:label_tracker_plural)%></span><span class="menuItemArrow">&#9654;</span></a>\r
-        <a class="menuItem" href="/custom_fields"><%=l(:label_custom_field_plural)%></a>\r
-        <a class="menuItem" href="/enumerations"><%=l(:label_enumerations)%></a>\r
-        <a class="menuItem" href="/admin/mail_options"><%=l(:field_mail_notification)%></a>\r
-        <a class="menuItem" href="/auth_sources"><%=l(:label_authentication)%></a>\r
-        <a class="menuItem" href="/settings"><%=l(:label_settings)%></a>\r
-        <a class="menuItem" href="/admin/info"><%=l(:label_information_plural)%></a>\r
+        <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>\r
+        <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>\r
+        <%= link_to l(:label_role_and_permissions), {:controller => 'roles' }, :class => "menuItem" %>\r
+        <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>\r
+        <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields' }, :class => "menuItem" %>\r
+        <%= link_to l(:label_enumerations), {:controller => 'enumerations' }, :class => "menuItem" %>\r
+        <%= link_to l(:field_mail_notification), {:controller => 'admin', :action => 'mail_options' }, :class => "menuItem" %>\r
+        <%= link_to l(:label_authentication), {:controller => 'auth_sources' }, :class => "menuItem" %>\r
+        <%= link_to l(:label_settings), {:controller => 'settings' }, :class => "menuItem" %>\r
+        <%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info' }, :class => "menuItem" %>\r
     </div>\r
     <div id="menuTrackers" class="menu">\r
-        <a class="menuItem" href="/issue_statuses"><%=l(:label_issue_status_plural)%></a>\r
-        <a class="menuItem" href="/roles/workflow"><%=l(:label_workflow)%></a>\r
+        <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses' }, :class => "menuItem" %>\r
+        <%= link_to l(:label_workflow), {:controller => 'roles', :action => 'workflow' }, :class => "menuItem" %>\r
     </div>\r
-    <div id="menuProjects" class="menu"><a class="menuItem" href="/projects/add"><%=l(:label_new)%></a></div>\r
-    <div id="menuUsers" class="menu"><a class="menuItem" href="/users/add"><%=l(:label_new)%></a></div>\r
+    <div id="menuProjects" class="menu"><%= link_to l(:label_new), {:controller => 'projects', :action => 'add' }, :class => "menuItem" %></div>\r
+    <div id="menuUsers" class="menu"><%= link_to l(:label_new), {:controller => 'users', :action => 'add' }, :class => "menuItem" %></a></div>\r
     <% end %>\r
     \r
     <% unless @project.nil? || @project.id.nil? %>\r