spud_core 0.9.4 → 0.9.5

data/app/assets/stylesheets/spud/admin/application.css

@@ -285,6 +285,28 @@ div.field_with_errors label {
 	background: #FAE7D9;
 }
 
+.admin-table th .current {
+  padding-right: 12px;
+  background-repeat: no-repeat;
+  background-position: right center;
+}
+.admin-table th a, .admin-table th a:visited {
+	color:#fff;
+}
+
+.admin-table th a:hover {
+	text-decoration: none;
+}
+
+.admin-table th .asc {
+  background-image: url(/assets/spud/admin/up_arrow.gif);
+}
+
+.admin-table th .desc {
+  background-image: url(/assets/spud/admin/down_arrow.gif);
+}
+
+
 .info_card {
 	width:400px;
 	padding:0 10px;

data/app/controllers/spud/admin/application_controller.rb

@@ -4,6 +4,7 @@ class Spud::Admin::ApplicationController < Spud::ApplicationController
 	add_breadcrumb "Dashboard", :spud_admin_root_path
 	layout 'spud/admin/application'
 	respond_to :html,:json,:xml,:js
+  helper_method :sort_column, :sort_direction
 	unloadable
 
   def current_admin_site
@@ -15,7 +16,16 @@ class Spud::Admin::ApplicationController < Spud::ApplicationController
 
   end
 
-	private
+private
+
+  def sort_column
+    params[:sort]
+  end
+
+  def sort_direction
+    %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
+  end
+
 	def require_admin_user
     return false if !require_user
     if !@current_user.super_admin && current_user_permissions.count == 0

data/app/controllers/spud/admin/users_controller.rb

@@ -7,7 +7,15 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController
 	before_filter :load_user,:only => [:edit,:update,:show,:destroy]
 
 	def index
-		@users = SpudUser.order(:login).paginate :page => params[:page]
+		sort_order = "login asc"
+		if sort_column
+			if sort_column == 'first_name'
+				sort_order = "first_name #{sort_direction}, last_name #{sort_direction}"
+			else
+				sort_order = "#{sort_column} #{sort_direction}"
+			end
+		end
+		@users = SpudUser.order(sort_order).paginate :page => params[:page]
 		respond_with @users
 	end
 

data/app/helpers/spud/admin/application_helper.rb

@@ -49,4 +49,6 @@ module Spud::Admin::ApplicationHelper
     return content.html_safe
 
   end
+
+
 end

data/app/helpers/spud/application_helper.rb

@@ -12,4 +12,11 @@ module Spud::ApplicationHelper
     return config[:site_id] unless config.blank?
   end
 
+  def sortable(column, title = nil)
+    title ||= column.titleize
+    css_class = column == sort_column ? "current #{sort_direction}" : nil
+    direction = column == sort_column && sort_direction == "asc" ? "desc" : "asc"
+    link_to title, {:sort => column, :direction => direction}, {:class => css_class}
+  end
+
 end

data/app/views/spud/admin/users/index.html.erb

@@ -6,12 +6,12 @@
 		<thead>
 			<tr>
 
-				<th>Login</th>
-				<th>Email</th>
-				<th>Name</th>
+				<th><%= sortable "login"%></th>
+				<th><%= sortable "email"%></th>
+				<th><%= sortable "first_name", "Name"%></th>
 
-				<th>Last Login</th>
-				<th>Date Created</th>
+				<th><%= sortable "last_login_at", "Last Login"%></th>
+				<th><%= sortable "created_at", "Date Created"%></th>
 				<th></th>
 			</tr>
 		</thead>

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.9.4"
+	  VERSION = "0.9.5"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_core
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,6 +268,7 @@ files:
 - app/assets/images/sort_both.png
 - app/assets/images/sort_desc.png
 - app/assets/images/sort_desc_disabled.png
+- app/assets/images/spud/admin/down_arrow.gif
 - app/assets/images/spud/admin/flick/ui-bg_flat_0_aaaaaa_40x100.png
 - app/assets/images/spud/admin/flick/ui-bg_flat_0_eeeeee_40x100.png
 - app/assets/images/spud/admin/flick/ui-bg_flat_55_ffffff_40x100.png
@@ -283,6 +284,7 @@ files:
 - app/assets/images/spud/admin/flick/ui-icons_ffffff_256x240.png
 - app/assets/images/spud/admin/spud_logo.png
 - app/assets/images/spud/admin/spud_logo@2x.png
+- app/assets/images/spud/admin/up_arrow.gif
 - app/assets/images/spud/admin/users_thumb.png
 - app/assets/javascripts/spud/admin/application.js
 - app/assets/javascripts/spud/admin/dashboard.js
@@ -608,7 +610,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1527295184139763898
+      hash: -2922898483743288928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -617,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1527295184139763898
+      hash: -2922898483743288928
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24