Got confused by CVS, by copying folder and not removing CVS dir in it.

2 files changed, 47 insertions, 14 deletions

diff --git a/app/views/admin_track/list.rhtml b/app/views/admin_track/list.rhtml
new file mode 100644
index 000000000..310cc5528
--- /dev/null
+++ b/app/views/admin_track/list.rhtml
@@ -0,0 +1,35 @@
+<% @title = 'Listing tracks' %>
+
+<h1><%=@title%></h1>
+
+<% form_tag("", :method => "get") do %>
+   <p>
+       <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+       <%= submit_tag "Search" %> (substring search the query - so use url_names_for_a_particular_request_or_authority_or_person)
+   </p>
+<% end %>
+
+<table>
+  <tr>
+  <th>Id</th>
+  <th>Tracked by</th>
+  <% for column in TrackThing.content_columns %>
+    <th><%= column.human_name %></th>
+  <% end %>
+  <th>Items sent by email</th>
+  </tr>
+  
+<% for track_thing in @admin_tracks %>
+  <tr class="<%= cycle('odd', 'even') %>">
+  <td><%=h track_thing.id %></td>
+  <td><%= user_admin_link(track_thing.tracking_user) %></td>
+  <% for column in TrackThing.content_columns.map { |c| c.name } %>
+    <td><%=h track_thing.send(column) %></td>
+  <% end %>
+  <td><%= track_thing.track_things_sent_emails.size %></td>
+  </tr>
+<% end %>
+</table>
+
+<%= will_paginate(@admin_tracks) %>
+
diff --git a/app/views/admin_user/list.rhtml b/app/views/admin_user/list.rhtml
index 310cc5528..2950041e5 100644
--- a/app/views/admin_user/list.rhtml
+++ b/app/views/admin_user/list.rhtml
@@ -1,35 +1,33 @@
-<% @title = 'Listing tracks' %>
+<% @title = 'Listing users' %>
 
 <h1><%=@title%></h1>
 
 <% form_tag("", :method => "get") do %>
    <p>
        <%= text_field_tag 'query', params[:query], { :size => 30 } %>
-       <%= submit_tag "Search" %> (substring search the query - so use url_names_for_a_particular_request_or_authority_or_person)
+       <%= submit_tag "Search" %> (substring search, names and emails)
    </p>
 <% end %>
 
 <table>
   <tr>
-  <th>Id</th>
-  <th>Tracked by</th>
-  <% for column in TrackThing.content_columns %>
-    <th><%= column.human_name %></th>
+    <th>Id</th>
+  <% for column in ['Name', 'Email', 'Created at', 'Updated at', 'Email confirmed'] %>
+    <th><%= column %></th>
   <% end %>
-  <th>Items sent by email</th>
   </tr>
   
-<% for track_thing in @admin_tracks %>
+<% for user in @admin_users %>
   <tr class="<%= cycle('odd', 'even') %>">
-  <td><%=h track_thing.id %></td>
-  <td><%= user_admin_link(track_thing.tracking_user) %></td>
-  <% for column in TrackThing.content_columns.map { |c| c.name } %>
-    <td><%=h track_thing.send(column) %></td>
+    <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'] %>
+    <td><%=h user.send(column) %></td>
   <% end %>
-  <td><%= track_thing.track_things_sent_emails.size %></td>
   </tr>
 <% end %>
 </table>
 
-<%= will_paginate(@admin_tracks) %>
+<%= will_paginate(@admin_users) %>