From 7569f58c656fd2c274e49da6f366b9ef7138e961 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 4 Jul 2013 01:34:06 -0700
Subject: users - make a nice overview page (well, nice enough) and better
 users index/search.

---
 users/app/controllers/users_controller.rb | 21 ++++++++-------------
 users/app/views/overviews/show.html.haml  | 27 +++++++++++++++------------
 users/app/views/users/_user.html.haml     | 12 +++---------
 3 files changed, 26 insertions(+), 34 deletions(-)

(limited to 'users/app')

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 09622b3..98294b9 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -3,22 +3,24 @@
 #
 
 class UsersController < UsersBaseController
-
   before_filter :authorize, :only => [:show, :edit, :update, :destroy]
   before_filter :fetch_user, :only => [:show, :edit, :update, :destroy]
-  #before_filter :authorize_self, :only => [:update]
   before_filter :authorize_admin, :only => [:index]
 
-  respond_to :json
+  respond_to :html
 
   def index
     if params[:query]
-      @users = User.by_login.startkey(params[:query]).endkey(params[:query].succ)
+      if @user = User.find_by_login(params[:query])
+        redirect_to user_overview_url(@user)
+        return
+      else
+        @users = User.by_login.startkey(params[:query]).endkey(params[:query].succ)
+      end
     else
       @users = User.by_created_at.descending
     end
-    @users = @users.limit(APP_CONFIG[:pagination_size])
-    #respond_with @users.map(&:login).sort
+    @users = @users.limit(100)
   end
 
   def new
@@ -52,11 +54,4 @@ class UsersController < UsersBaseController
     end
   end
 
-  protected
-
-  #def authorize_self
-  #  # have already checked that authorized
-  #  access_denied unless (@user == current_user)
-  #end
-
 end
diff --git a/users/app/views/overviews/show.html.haml b/users/app/views/overviews/show.html.haml
index eda9899..b8ad814 100644
--- a/users/app/views/overviews/show.html.haml
+++ b/users/app/views/overviews/show.html.haml
@@ -1,15 +1,18 @@
-%p
-  Username:
-  = @user.login
+.overview
 
-%p
-  User since:
-  = @user.created_at
+  %h2.first= t(:overview_welcome, :username => @user.login)
 
-%p
-  Last update:
-  = @user.updated_at
+  - if admin?
+    %p
+      = t(:created)
+      = @user.created_at
+      %br
+      = t(:updated)
+      = @user.updated_at
 
-%p
-  Quota:
-  N/A
\ No newline at end of file
+  %p= t(:overview_intro)
+
+  %ul.unstyled
+    %li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
+    %li= icon('envelope') + link_to(t(:overview_email), edit_user_email_settings_path(@user))
+    %li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user))
diff --git a/users/app/views/users/_user.html.haml b/users/app/views/users/_user.html.haml
index ca03d34..990d9cf 100644
--- a/users/app/views/users/_user.html.haml
+++ b/users/app/views/users/_user.html.haml
@@ -1,10 +1,4 @@
 %tr
-  %td= link_to user.login, user
-  %td= time_ago_in_words(user.created_at) + " ago"
-  %td
-    = link_to edit_user_path(user), :class => "btn btn-mini btn-primary" do
-      %i.icon-edit.icon-white
-      Edit
-    = link_to user_path(user), :method => :delete, :class => "btn btn-danger btn-mini" do
-      %i.icon-remove.icon-white
-      Remove
+  %td= link_to user.login, user_overview_path(user)
+  %td= l(user.created_at, :format => :short)
+  %td= l(user.updated_at, :format => :short)
-- 
cgit v1.2.3