6 files changed, 16 insertions, 14 deletions
diff --git a/app/views/admin_user/_form.html.erb b/app/views/admin_user/_form.html.erb
index f1edc0927..01273a657 100644
--- a/app/views/admin_user/_form.html.erb
+++ b/app/views/admin_user/_form.html.erb
@@ -41,7 +41,7 @@
       user from filing new requests, making annotations or messaging other users;
       the text is shown in public on the user's page and when they try to do a
       forbidden action; write in the second person (you); see
-      <%= link_to 'banned users', admin_user_list_banned_path %> for examples</small>
+      <%= link_to 'banned users', banned_admin_users_path %> for examples</small>
     </div>
   </div>
 </div>
diff --git a/app/views/admin_user/_user_table.html.erb b/app/views/admin_user/_user_table.html.erb
index 57066bf3f..4fd90d5c6 100644
--- a/app/views/admin_user/_user_table.html.erb
+++ b/app/views/admin_user/_user_table.html.erb
@@ -7,7 +7,7 @@
       <% if user.admin_level == "super" %>
           <span class="label">superuser</span>
       <% end %>
-        <%= link_to("#{h(user.name)}", admin_user_show_path(user))%>
+        <%= link_to("#{h(user.name)}", admin_user_path(user))%>
         <%= link_to("(#{h(user.email)})", "mailto:#{h(user.email)}")%>
        </span>
        <span class="item-metadata">
diff --git a/app/views/admin_user/list_banned.html.erb b/app/views/admin_user/banned.html.erb
index e535415e6..ee17d9899 100644
--- a/app/views/admin_user/list_banned.html.erb
+++ b/app/views/admin_user/banned.html.erb
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<p><%= link_to 'List all', admin_user_list_path %></p>
+<p><%= link_to 'List all', admin_users_path %></p>
 
 <%= render :partial => 'user_table', :locals => { :users => @banned_users, :banned_column => true } %>
 
diff --git a/app/views/admin_user/edit.html.erb b/app/views/admin_user/edit.html.erb
index e641a13d6..ed1fb6e08 100644
--- a/app/views/admin_user/edit.html.erb
+++ b/app/views/admin_user/edit.html.erb
@@ -1,11 +1,11 @@
 <h1><%=@title%></h1>
 
-<%= form_tag admin_user_update_path(@admin_user), :class => "form form-horizontal" do %>
+<%= form_tag admin_user_path(@admin_user), :method => 'put', :class => "form form-horizontal" do %>
   <%= render :partial => 'form' %>
   <div class="form-actions">
     <%= submit_tag 'Save', :accesskey => 's', :class => "btn btn-primary" %>
   </div>
 <% end %>
 
-<%= link_to 'Show', admin_user_show_path(@admin_user), :class => "btn" %>
-<%= link_to 'List all', admin_user_list_path, :class => "btn" %>
+<%= link_to 'Show', admin_user_path(@admin_user), :class => "btn" %>
+<%= link_to 'List all', admin_users_path, :class => "btn" %>
diff --git a/app/views/admin_user/list.html.erb b/app/views/admin_user/index.html.erb
index b1238f87a..cfb34fd7b 100644
--- a/app/views/admin_user/list.html.erb
+++ b/app/views/admin_user/index.html.erb
@@ -5,7 +5,7 @@
 <%= form_tag({}, :method => "get", :class => "form form-search") do %>
   <%= text_field_tag 'query', params[:query], { :size => 30, :class => "input-large search-query"} %>
   <%= submit_tag "Search", :class => "btn" %> (substring search, names and emails)
-  <%= link_to 'Banned users', admin_user_list_banned_path, :class => "btn btn-info" %>
+  <%= link_to 'Banned users', banned_admin_users_path, :class => "btn btn-info" %>
 <% end %>
 
 <%= render :partial => 'user_table', :locals => { :users => @admin_users, :banned_column => false } %>
diff --git a/app/views/admin_user/show.html.erb b/app/views/admin_user/show.html.erb
index 6d12aeff5..1e7d885c5 100644
--- a/app/views/admin_user/show.html.erb
+++ b/app/views/admin_user/show.html.erb
@@ -4,7 +4,7 @@
 
 <% if @admin_user.profile_photo %>
   <div class="user_photo_on_admin">
-    <%= form_tag admin_clear_profile_photo_path(@admin_user), :multipart => true, :class => "form" do %>
+    <%= form_tag clear_profile_photo_admin_user_path(@admin_user), :multipart => true, :class => "form" do %>
       <img src="<%= get_profile_photo_url(:url_name => @admin_user.url_name) %>">
       <br>
       <%= submit_tag "Clear photo", :class => "btn btn-info" %>
@@ -32,13 +32,13 @@
             <%=link_to @admin_user.email, "mailto:#{h @admin_user.email}"%>
           <% elsif column_name == 'email_bounce_message' %>
             <% unless @admin_user.email_bounce_message.empty? %>
-              <%= link_to _("See bounce message"), admin_user_show_bounce_path(@admin_user.id) %>
+              <%= link_to _("See bounce message"), show_bounce_message_admin_user_path(@admin_user) %>
             <% end %>
           <% else %>
             <%=h admin_value(value)%>
           <% end %>
           <% if column_name == 'email_bounced_at' && !@admin_user.email_bounced_at.nil? %>
-            <%= form_tag admin_user_clear_bounce_path(@admin_user), :class => "form form-inline" do %>
+            <%= form_tag clear_bounce_admin_user_path(@admin_user), :class => "form form-inline" do %>
               <input type="submit" name="action" value="Clear bounce" class="btn btn-info">
             <% end %>
           <% end %>
@@ -48,11 +48,13 @@
   </tbody>
 </table>
 
-
-<%= link_to 'Edit', admin_user_edit_path(@admin_user), :class => "btn btn-primary" %>
+<div class="btn-toolbar">
+<%= link_to 'Edit', edit_admin_user_path(@admin_user), :class => "btn btn-primary" %>
 <%= link_to 'Public page', user_path(@admin_user), :class => "btn" %>
-<%= link_to "Log in as #{@admin_user.name} (also confirms their email)", admin_user_login_as_path(@admin_user), :class => "btn btn-info" %>
-
+</div>
+<%= form_tag login_as_admin_user_path(@admin_user), :class => "form form-horizontal" do %>
+  <%= submit_tag "Log in as #{@admin_user.name} (also confirms their email)", :class => "btn btn-info" %>
+<% end %>
 <hr>
 
 <h2>Track things</h2>