Merge remote-tracking branch 'origin/develop'

Author: snipe

app/views/backend/hardware/view.blade.php

@@ -214,9 +214,15 @@
                     <td>{{ $log->action_type }}</td>
                     <td>
                         @if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!=''))
+
+                        @if ($log->userlog->deleted_at=='')
                         <a href="{{ route('view/user', $log->checkedout_to) }}">
                         {{{ $log->userlog->fullName() }}}
-                        </a>
+                         </a>
+                        @else
+ 						<del>{{{ $log->userlog->fullName() }}}</del>
+                        @endif
+
                         @endif
                     </td>
                     <td>

app/views/backend/users/index.blade.php

@@ -13,9 +13,9 @@
     <div class="col-md-12">
         <a href="{{ route('create/user') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i>  @lang('general.create')</a>
         @if (Input::get('onlyTrashed'))
-            <a class="btn btn-default pull-right" href="{{ URL::to('admin/users') }}">Show Current Users</a>
+            <a class="btn btn-default pull-right" href="{{ URL::to('admin/users') }}" style="margin-right: 5px;">Show Current Users</a>
         @else
-            <a class="btn btn-default pull-right" href="{{ URL::to('admin/users?onlyTrashed=true') }}">Show Deleted Users</a>
+            <a class="btn btn-default pull-right" href="{{ URL::to('admin/users?onlyTrashed=true') }}" style="margin-right: 5px;">Show Deleted Users</a>
         @endif
 
         <h3>