Merge branch 'refs/heads/develop'

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

@@ -103,7 +103,7 @@ View Model {{ $model->model_tag }} ::
 
 
 							<ul>
-								<li><br><br />Blah blah blah.</li>
+								<li><br><br /></li>
 							</ul>
 
                     </div>

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

@@ -36,9 +36,7 @@ User Management ::
 			<th class="span1">Assets</th>
 			<th class="span1">Licenses</th>
 			<th class="span1">@lang('admin/users/table.activated')</th>
-			<th class="span2">@lang('admin/users/table.last_login')</th>
-			<th class="span1">@lang('admin/users/table.created_at')</th>
-			<th class="span2">@lang('table.actions')</th>
+			<th class="span3">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -54,15 +52,6 @@ User Management ::
 			<td>{{ $user->assets->count() }}</td>
 			<td>{{ $user->licenses->count() }}</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>
 			@if ($user->id > 3)
 				@if ( ! is_null($user->deleted_at))

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

@@ -93,10 +93,10 @@ View User {{ $user->fullName() }} ::
 										Software
 										@endif
 										</td>
-										<td><a href="{{ route('view/asset', $license->id) }}">{{ $license->serial }}</a></td>
-										<td><a href="{{ route('view/asset', $license->id) }}">{{ $license->name }}</a></td>
+										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
+										<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a></td>
 
-										<td> <a href="{{ route('checkin/asset', $asset->id) }}" class="btn-flat info">Checkin</a></td>
+										<td> <a href="{{ route('checkin/license', $asset->id) }}" class="btn-flat info">Checkin</a></td>
 									</tr>
 									@endforeach
                                 </tbody>