From 1f2badfc3915937eaf97cd5b95e54acbfe9f544b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 15 Nov 2013 06:20:06 -0500
Subject: [PATCH] minor UI tweaks

Added icons to action buttons, removed ability to edit a deleted user
---
 app/lang/en/admin/users/table.php       |  5 ++--
 app/views/backend/users/index.blade.php | 31 ++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/lang/en/admin/users/table.php b/app/lang/en/admin/users/table.php
index 7b2c2da604..f6c09f2614 100755
--- a/app/lang/en/admin/users/table.php
+++ b/app/lang/en/admin/users/table.php
@@ -6,7 +6,8 @@ return array(
 	'first_name' => 'First Name',
 	'last_name'  => 'Last Name',
 	'email'      => 'Email',
-	'activated'  => 'Activated',
-	'created_at' => 'Created at',
+	'last_login'  => 'Last Login',
+	'activated'  => 'Active',
+	'created_at' => 'Created',
 
 );
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index e415401601..a4f36aeeb2 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -20,8 +20,11 @@ User Management ::
 
 <a class="btn btn-medium" href="{{ URL::to('admin/users?withTrashed=true') }}">Include Deleted Users</a>
 <a class="btn btn-medium" href="{{ URL::to('admin/users?onlyTrashed=true') }}">Include Only Deleted Users</a>
+<br><br>
 
+@if (count($users) > 10)
 {{ $users->links() }}
+@endif
 
 <table class="table table-bordered table-striped table-hover">
 	<thead>
@@ -30,7 +33,8 @@ User Management ::
 			<th class="span2">@lang('admin/users/table.first_name')</th>
 			<th class="span2">@lang('admin/users/table.last_name')</th>
 			<th class="span3">@lang('admin/users/table.email')</th>
-			<th class="span2">@lang('admin/users/table.activated')</th>
+			<th class="span1">@lang('admin/users/table.activated')</th>
+			<th class="span2">@lang('admin/users/table.last_login')</th>
 			<th class="span2">@lang('admin/users/table.created_at')</th>
 			<th class="span2">@lang('table.actions')</th>
 		</tr>
@@ -42,18 +46,30 @@ User Management ::
 			<td>{{ $user->first_name }}</td>
 			<td>{{ $user->last_name }}</td>
 			<td>{{ $user->email }}</td>
-			<td>@lang('general.' . ($user->isActivated() ? 'yes' : 'no'))</td>
+			<td>{{ $user->isActivated() ? '<i class="icon-ok"></i>' : ''}}</td>
+			<td>
+			@if (is_object($user->last_login))
+				{{ $user->last_login->diffForHumans() }}
+			@else
+				Never
+			@endif
+			</td>
 			<td>{{ $user->created_at->diffForHumans() }}</td>
 			<td>
-				<a href="{{ route('update/user', $user->id) }}" class="btn btn-mini">@lang('button.edit')</a>
+
+
+
+
+
 
 				@if ( ! is_null($user->deleted_at))
-				<a href="{{ route('restore/user', $user->id) }}" class="btn btn-mini btn-warning">@lang('button.restore')</a>
+				<a href="{{ route('restore/user', $user->id) }}" class="btn btn-mini btn-warning"><i class="icon-share-alt icon-white"></i> @lang('button.restore')</a>
 				@else
+				<a href="{{ route('update/user', $user->id) }}" class="btn btn-mini"><i class="icon-pencil"></i> @lang('button.edit')</a>
 				@if (Sentry::getId() !== $user->id)
-				<a href="{{ route('delete/user', $user->id) }}" class="btn btn-mini btn-danger">@lang('button.delete')</a>
+				<a href="{{ route('delete/user', $user->id) }}" class="btn btn-mini btn-danger"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
 				@else
-				<span class="btn btn-mini btn-danger disabled">@lang('button.delete')</span>
+				<span class="btn btn-mini btn-danger disabled"><i class="icon-remove icon-white"></i> @lang('button.delete')</span>
 				@endif
 				@endif
 			</td>
@@ -62,5 +78,8 @@ User Management ::
 	</tbody>
 </table>
 
+@if (count($users) > 10)
 {{ $users->links() }}
+@endif
+
 @stop