5 files changed, 19 insertions, 31 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ead989d..eb1cd4c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,7 +9,9 @@ class UsersController < ApplicationController
   layout 'admin'
 
   def index
-    @users = User.all(:order => "login ASC")
+    @users = User.all(:order => "login ASC").group_by do |user|
+      user.admin? ? :admin : :user
+    end
   end
 
   def new
@@ -20,6 +22,7 @@ class UsersController < ApplicationController
     @user = User.new params[:user]
 
     if @user.save
+      flash[:notice] = "User created #{@user.login}"
       redirect_to user_path(@user)
     else
       render :new
@@ -31,6 +34,7 @@ class UsersController < ApplicationController
 
   def update
     if @user.update_attributes(params[:user])
+      flash[:notice] = "Updated user #{@user.login}"
       redirect_to user_path(@user)
     else
       render :edit
diff --git a/app/views/users/_admin_user_item.html.erb b/app/views/users/_admin_user_item.html.erb
deleted file mode 100644
index d882dc4..0000000
--- a/app/views/users/_admin_user_item.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<tr>
-  <td><%= admin_user_item.login %></td>
-  <td>
-    <%= link_to "Show", user_path(admin_user_item) %>
-    <%= link_to(
-          "Destroy", 
-          user_path(admin_user_item), 
-          :method => "delete",
-          :confirm => "Are you sure to delete user: #{admin_user_item.login}?"
-        ) %>
-  </td>
-</tr>
\ No newline at end of file
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
new file mode 100644
index 0000000..90e8b88
--- /dev/null
+++ b/app/views/users/_user.html.erb
@@ -0,0 +1,9 @@
+<tr>
+  <td><%= user.login %></td>
+  <td><%= link_to "show", user_path(user) %></td>
+  <td>
+    <% if current_user.admin? || current_user == user %>
+      <%= link_to "edit", edit_user_path(user) %>
+    <% end %>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/app/views/users/_user_item.html.erb b/app/views/users/_user_item.html.erb
deleted file mode 100644
index c3389ba..0000000
--- a/app/views/users/_user_item.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-  <td><%= user_item.login %></td>
-  <td></td>
-</tr>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 03085c1..8d931be 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,23 +1,14 @@
-<h1>Users</h1>
-
-<table id="user_list">
+<table class="user_list">
   <tr>
-    <th>login</th>
+    <td><h1>Admins</h1></td>
   </tr>
-  <% @users.each do |user| %>
+  <%= render :partial => "user", :collection => @users[:admin], :as => :user %>
   <tr>
-    <td><%= user.login %></td>
-    <td><%= link_to "show", user_path(user) %></td>
-    <td>
-    <% if current_user == user || current_user.admin? %>
-      <%= link_to "Edit", edit_user_path(user) %>
-    <% end %>
-    </td>
+    <td><h1>Users</h1></td>
   </tr>
-  <% end %>
+  <%= render :partial => "user", :collection => @users[:user], :as => :user %>
 </table>
 
-
 <% content_for :subnavigation do %>
   <%= link_to "create", new_user_path %>
 <% end %>
\ No newline at end of file