6 files changed, 13 insertions, 13 deletions
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml
index a7dfba90f..3b4a86a58 100644
--- a/app/views/admin_general/index.rhtml
+++ b/app/views/admin_general/index.rhtml
@@ -97,7 +97,7 @@
     <% end %>
     </ul>
     
-    <p>(<%= link_to "Full list", admin_url("unclassified") %>, or play public
+    <p>(<%= link_to "Full list", admin_request_list_old_unclassified_url %>, or play public
     <%= link_to "Categorisation game", categorise_play_url(:only_path => true) %>)
     </p>
 <% end %>
diff --git a/app/views/admin_public_body/_one_list.rhtml b/app/views/admin_public_body/_one_list.rhtml
index e0d2399d0..7bf07e879 100644
--- a/app/views/admin_public_body/_one_list.rhtml
+++ b/app/views/admin_public_body/_one_list.rhtml
@@ -17,7 +17,7 @@
 <% end %>
 </table>
 
-<% form_tag(admin_url("body/mass_tag_add"), :method => "post", :class => "forms_on_one_line" ) do %>
+<% form_tag(admin_body_mass_tag_add_url, :method => "post", :class => "forms_on_one_line" ) do %>
     <p>
        <%= text_field_tag 'new_tag', params[:new_tag], { :size => 15, :id => "mass_add_tag_new_tag_" + table_name } %>
        <%= hidden_field_tag(:query, params[:query], { :id => "mass_add_tag_query_" + table_name } ) %>
diff --git a/app/views/admin_public_body/_tags.rhtml b/app/views/admin_public_body/_tags.rhtml
index 6172e0864..e6eeed287 100644
--- a/app/views/admin_public_body/_tags.rhtml
+++ b/app/views/admin_public_body/_tags.rhtml
@@ -4,7 +4,7 @@
     <% else %>
         <%= link_to(h(t.name), list_public_bodies_url(:tag => t.name)) %>
     <% end %>
-    (<a href="<%= admin_url('body/list') %>?query=<%= h(t.name)%>">admin</a>)
+    (<a href="<%= admin_body_list_url %>?query=<%= h(t.name)%>">admin</a>)
 <% end %>
 
 
diff --git a/app/views/comment/_single_comment.rhtml b/app/views/comment/_single_comment.rhtml
index d428aef14..1529c76de 100644
--- a/app/views/comment/_single_comment.rhtml
+++ b/app/views/comment/_single_comment.rhtml
@@ -19,7 +19,7 @@
         <% if !comment.id.nil? %>
             <%= link_to "Link to this", comment_path(comment), :class => "link_to_this" %>
             <% if !@user.nil? && @user.admin_page_links? %>
-                | <%= link_to "Admin", admin_url("request/edit_comment/" + comment.id.to_s) %>
+                | <%= link_to "Admin", admin_request_edit_comment_url(comment) %>
             <% end %>
             <!-- | <%= link_to _('Report abuse'), comment_path(comment) %> -->
         <% end %>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index a9bc0556b..d6a7eec73 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -13,15 +13,15 @@
 
     <p>
     <strong><%= link_to 'Alaveteli', frontpage_url %> admin:</strong> 
-    <%= link_to 'Summary', admin_url("") %>
-    | <%= link_to 'Timeline', admin_url("timeline") %>
-    | <%= link_to 'Stats', admin_url("stats") %>
-    | <%= link_to 'Debug', admin_url("debug") %>
+    <%= link_to 'Summary', admin_general_index_url %>
+    | <%= link_to 'Timeline', admin_timeline_url %>
+    | <%= link_to 'Stats', admin_stats_url %>
+    | <%= link_to 'Debug', admin_debug_url %>
     <strong>View:</strong>
-    <%= link_to 'Authorities', admin_url("body/list") %>
-    | <%= link_to 'Requests', admin_url("request/list") %>
-    | <%= link_to 'Users', admin_url("user/list") %>
-    | <%= link_to 'Tracks', admin_url("track/list") %>
+    <%= link_to 'Authorities', admin_body_list_url %>
+    | <%= link_to 'Requests', admin_request_list_url %>
+    | <%= link_to 'Users', admin_user_list_url %>
+    | <%= link_to 'Tracks', admin_track_list_url %>
     </p>
     <%= render :partial => 'general/locale_switcher' %>
 
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index e15ac4d27..445f7c825 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -21,7 +21,7 @@ if not incoming_message.nil?
 
         <p class="event_actions">
             <% if !@user.nil? && @user.admin_page_links? %>
-                <%= link_to "Admin", admin_url("request/show_raw_email/" + incoming_message.raw_email_id.to_s) %> |
+                <%= link_to "Admin", admin_request_show_raw_email_url(incoming_message.raw_email_id) %> |
             <% end %>
             <%= link_to _("Link to this"), incoming_message_path(incoming_message), :class => "link_to_this" %>
         </p>