3 files changed, 18 insertions, 8 deletions

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 90e8b88..8117bcd 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,9 +1,19 @@
+<% users.each do |user| %>
 <tr>
-  <td><%= user.login %></td>
+  <td class="user_login"><%= user.login %></td>
   <td><%= link_to "show", user_path(user) %></td>
+  <% if current_user.admin? || current_user == user %>
   <td>
-    <% if current_user.admin? || current_user == user %>
-      <%= link_to "edit", edit_user_path(user) %>
-    <% end %>
+    <%= link_to "edit", edit_user_path(user) %>
   </td>
-</tr>
\ No newline at end of file
+  <td>
+    <%= link_to(
+          "destroy",
+          user_path(user),
+          :method => :delete,
+          :confirm => "Do you really want to delete user #{user.login}?"
+        ) %>
+  </td>
+  <% end %>
+</tr>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 8d931be..59806db 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,11 +2,11 @@
   <tr>
     <td><h1>Admins</h1></td>
   </tr>
-  <%= render :partial => "user", :collection => @users[:admin], :as => :user %>
+  <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
   <tr>
     <td><h1>Users</h1></td>
   </tr>
-  <%= render :partial => "user", :collection => @users[:user], :as => :user %>
+  <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
 </table>
 
 <% content_for :subnavigation do %>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 4492aa5..2641b98 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -443,7 +443,7 @@ input#move_to_search_term, input#node_staged_slug {
   width: 680px;
 }
 
-table.user_list td {
+table.user_list td.user_login {
   padding-right: 30px;
 }