Merge branch 'develop' of github.com:snipe/snipe-it into develop

app/views/backend/layouts/default.blade.php

@@ -160,19 +160,19 @@
                     <span>Assets</span>
                 </a>
             </li>
-            <li{{ (Request::is('assets/models') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
+            <li{{ (Request::is('assets/models*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
                 <a href="{{ URL::to('assets/models') }}">
                     <i class="icon-th-list"></i>
                     <span>Models</span>
                 </a>
             </li>
-            <li{{ (Request::is('admin/users') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
+            <li{{ (Request::is('admin/users*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
             	<a href="{{ URL::to('admin/users') }}">
                     <i class="icon-group"></i>
                     <span>People</span>
                 </a>
             </li>
-            <li{{ (Request::is('admin/licenses') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
+            <li{{ (Request::is('admin/licenses*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
             	<a href="{{ URL::to('admin/licenses') }}">
             		<i class="icon-certificate icon-white"></i>
             		 <span>Licenses</span>

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

@@ -25,11 +25,11 @@ Asset Models ::
 <table class="table table-hover">
 	<thead>
 		<tr>
-			<th class="span6">@lang('admin/models/table.title')</th>
-			<th class="span4">@lang('admin/models/table.modelnumber')</th>
+			<th class="span3">@lang('admin/models/table.title')</th>
+			<th class="span3">@lang('admin/models/table.modelnumber')</th>
 			<th class="span1">@lang('admin/models/table.numassets')</th>
 			<th class="span1">@lang('admin/models/table.created_at')</th>
-			<th class="span2">@lang('table.actions')</th>
+			<th class="span3">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>

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

@@ -47,7 +47,7 @@ User Management ::
 			<td>
 			<img src="{{ $user->gravatar() }}" class="img-circle avatar hidden-phone" style="max-width: 45px;" />
 			<a href="{{ route('view/user', $user->id) }}" class="name">{{ $user->fullName() }}</a>
-			<span class="subtext">Graphic Design</span>
+			<span class="subtext">{{ $user->jobtitle }}</span>
 			</td>
 			<td>{{ $user->email }}</td>
 			<td>
@@ -86,7 +86,6 @@ User Management ::
 @else
 <div class="col-md-6">
 	<div class="alert alert-warning alert-block">
-		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<i class="icon-warning-sign"></i>
 		@lang('admin/users/table.noresults')
 

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

@@ -31,12 +31,13 @@ View User {{ $user->fullName() }} ::
 
                             <h6>Assets Checked Out to {{ $user->first_name }}</h6>
                             <br>
-                            <!-- recent orders table -->
+                            <!-- checked out assets table -->
+                            @if (count($user->assets) > 0)
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
                                     	<th class="span3">Asset Type</th>
-                                        <th class="span3">Asset Tag</th>
+                                        <th class="span3"><span class="line"></span>Asset Tag</th>
                                         <th class="span4"><span class="line"></span>Name</th>
                                         <th class="span2"><span class="line"></span>Date</th>
                                         <th class="span2"><span class="line"></span>Actions</th>
@@ -60,6 +61,17 @@ View User {{ $user->fullName() }} ::
 									@endforeach
                                 </tbody>
                             </table>
+                            @else
+
+                            <div class="col-md-6">
+								<div class="alert alert-warning alert-block">
+
+									<i class="icon-warning-sign"></i>
+									@lang('admin/users/table.noresults')
+
+								</div>
+							</div>
+                            @endif
                         </div>
                     </div>