7 files changed, 52 insertions, 4 deletions
diff --git a/app/views/admin_user/_form.rhtml b/app/views/admin_user/_form.rhtml
new file mode 100644
index 000000000..f56a23ea3
--- /dev/null
+++ b/app/views/admin_user/_form.rhtml
@@ -0,0 +1,13 @@
+<%= error_messages_for 'admin_user' %>
+
+<!--[form:admin_user]-->
+
+<p><label for="admin_user_name">Name</label> (will change URL name and break URLs; unlike authorities, there is no history)<br/>
+<%= text_field 'admin_user', 'name', :size => 60  %></p>
+
+<p><label for="admin_user_email">Email</label> (<strong>you must</strong> first validate this)<br/>
+<%= text_field 'admin_user', 'email', :size => 60  %></p>
+
+<p><label for="admin_level">Admin level</label> (<strong>none</strong> or <strong>super</strong>; this is for admin features and links which are in the site proper)<br/>
+<%= text_field 'admin_user', 'admin_level', :size => 60  %></p>
+
diff --git a/app/views/admin_user/edit.rhtml b/app/views/admin_user/edit.rhtml
new file mode 100644
index 000000000..c9803fbde
--- /dev/null
+++ b/app/views/admin_user/edit.rhtml
@@ -0,0 +1,23 @@
+
+
+<h1><%=@title%></h1>
+
+<% form_tag '../update/' + @admin_user.id.to_s do %>
+  <%= render :partial => 'form' %>
+  <p><%= submit_tag 'Save' %></p>
+<% end %>
+
+<p>
+<%= link_to 'Show', '../show/' + @admin_user.id.to_s %> |
+<%= link_to 'List all', '../list' %>
+</p>
+
+<% if false #@admin_user.info_requests.size == 0 %>
+    <% form_tag('../destroy/' + @admin_user.id.to_s) do %>
+       <p>
+       <%= hidden_field_tag(:admin_user_id, { :value => @admin_user.id } ) %>
+       <%= submit_tag "Destroy " + @admin_user.name %> (this is permanent!)
+       </p>
+    <% end %>
+<% end %>
+
diff --git a/app/views/admin_user/list.rhtml b/app/views/admin_user/list.rhtml
index 2950041e5..3ba26a626 100644
--- a/app/views/admin_user/list.rhtml
+++ b/app/views/admin_user/list.rhtml
@@ -12,7 +12,7 @@
 <table>
   <tr>
     <th>Id</th>
-  <% for column in ['Name', 'Email', 'Created at', 'Updated at', 'Email confirmed'] %>
+  <% for column in ['Name', 'Email', 'Created at', 'Updated at', 'Email confirmed', 'Admin'] %>
     <th><%= column %></th>
   <% end %>
   </tr>
@@ -22,7 +22,7 @@
     <td><%= user.id.to_s %></td>
     <td><%= link_to h(user.name), 'show/' + user.id.to_s %></td>
     <td><a href="mailto:<%=h user.email %>"><%=h user.email%></a></td>
-  <% for column in ['created_at', 'updated_at', 'email_confirmed'] %>
+  <% for column in ['created_at', 'updated_at', 'email_confirmed', 'admin_level'] %>
     <td><%=h user.send(column) %></td>
   <% end %>
   </tr>
diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml
index 68d72feea..aea8c8e3b 100644
--- a/app/views/admin_user/show.rhtml
+++ b/app/views/admin_user/show.rhtml
@@ -15,7 +15,8 @@
 <% end %>
 </p>
 
-<p><%= link_to 'Public page', main_url(user_url(@admin_user)) %></p>
+<p><%= link_to 'Edit', '../edit/' + @admin_user.id.to_s %>
+| <%= link_to 'Public page', main_url(user_url(@admin_user)) %></p>
 
 <h2>Track things</h2>
 
diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml
index ec09dfb70..07cf3ce8e 100644
--- a/app/views/body/show.rhtml
+++ b/app/views/body/show.rhtml
@@ -10,6 +10,9 @@
 <p class="subtitle">
 <%=@public_body.type_of_authority(true)%> in the UK<% if not @public_body.short_name.empty? %>, also called <%= h(@public_body.short_name) %><% end %>
 (<%= link_to "home page", @public_body.calculated_home_page %>)
+<% if !@user.nil? && @user.owns_every_request? %>
+(<%= link_to "admin", public_body_admin_url(@public_body) %>)
+<% end %>
 </p>
 
 <% if @public_body.notes != "" %>
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 0182574d8..0d6d72f22 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -45,6 +45,9 @@
     <%= public_body_link(@info_request.public_body) %>
     by 
     <%= user_link(@info_request.user) %>
+    <% if !@user.nil? && @user.owns_every_request? %>
+    (<%= link_to "admin", request_admin_url(@info_request) %>)
+    <% end %>
     </p>
 
     <p id="request_status">
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 8eef38adc..01f20ed71 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -14,7 +14,12 @@
 
 <div class="single_user">
     <h1><%=@title%></h1>
-    <p class="subtitle">Joined WhatDoTheyKnow on <%= simple_date(@display_user.created_at) %></p>
+    <p class="subtitle">
+        Joined WhatDoTheyKnow on <%= simple_date(@display_user.created_at) %>
+        <% if !@user.nil? && @user.owns_every_request? %>
+        (<%= link_to "admin", user_admin_url(@display_user) %>)
+        <% end %>
+    </p>
 
     <p>
         <%= link_to "Send message to " + h(@display_user.name), contact_user_url(:id => @display_user.id) %>