add most recent and most active users.

2 files changed, 24 insertions, 5 deletions

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 28b28bd9..f5ca4130 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,7 +1,9 @@
 module Admin
   class UsersController < AdminController
     def index
-      @users = User.includes(:avatar)
+      @users = User.includes(:avatar).order(:created_at => :desc)
+      @recent_users = @users.limit(10)
+      @active_users = @users.order(:updated_at).limit(10)
     end
   end
 end
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index e54001e8..fd7db5c0 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,12 +1,29 @@
 <div class="row-fluid">
   <div class="span12">
+    <p>Total Users: <%= @users.count %></p>
+    <div class="span3">
+      <h2>New Users</h2>
+      <ul>
+        <% @recent_users.each do |user| %>
+          <li><%= user.name %> signed up on <%= user.created_at.to_s :foomat %></li>
+        <% end %>
+      </ul>
+    </div>
+    <div class="span3"> 
+      <h2>Active Users</h2>
+      <ul>
+        <% @active_users.each do |user| %>
+          <li><%= user.name %> last updated on <%= user.updated_at.to_s :foomat %></li>
+        <% end %>
+      </ul>
+    </div>
     <table class="table table-striped table-condensed">
       <thead>
         <tr>
           <td></td>
           <td>name</td>
           <td>location</td>
-          <td>created_at</td>
+          <td>account info</td>
         </tr>
       </thead>
       <tbody>
@@ -15,12 +32,12 @@
             <td><%= avatar_for(user) %></td>
             <td>
               <p>(<%= user.creations_count %>) <%= user.name %></p>
-              <p><%= user.email %></p>
+              <p><%= mail_to user.email %></p>
               <p><%= user.full_address %></p>
               <p><%= user.city %></p>
-              <p>website: <%= user.website %></p>
+              <p>website: <%= link_to user.website %></p>
               <p>twitter: <%= user.twitter %></p>
-              <p>facebook: <%= user.facebook %></p>
+              <p>facebook: <%= link_to user.facebook %></p>
             </td>
             <td>
               <p>latitude: <%= user.latitude %></p>