Cosmetic changes
This commit is contained in:
@@ -20,9 +20,6 @@ View User {{ $user->fullName() }} ::
|
||||
<a href="{{ route('update/user', $user->id) }}" class="btn-flat white large pull-right edit"><i class="icon-pencil"></i> @lang('button.edit') This User</a>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row-fluid profile">
|
||||
<!-- bio, new note & orders column -->
|
||||
<div class="span9 bio">
|
||||
@@ -52,10 +49,10 @@ View User {{ $user->fullName() }} ::
|
||||
Software
|
||||
@endif
|
||||
</td>
|
||||
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->asset_tag }}</a></td>
|
||||
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->name }}</a></td>
|
||||
<td><a href="{{ route('view/asset', $asset->id) }}">{{ $asset->asset_tag }}</a></td>
|
||||
<td><a href="{{ route('view/asset', $asset->id) }}">{{ $asset->name }}</a></td>
|
||||
|
||||
<td> <a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></td>
|
||||
<td> <a href="{{ route('checkin/asset', $asset->id) }}" class="btn-flat info">Checkin</a></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
@@ -133,12 +130,11 @@ View User {{ $user->fullName() }} ::
|
||||
<td>{{ $log->action_type }}</td>
|
||||
<td>
|
||||
@if ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at==''))
|
||||
<a href="{{ route('view/hardware', $log->asset_id) }}">{{ $log->assetlog->name }}</a>
|
||||
<a href="{{ route('view/asset', $log->asset_id) }}">{{ $log->assetlog->name }}</a>
|
||||
@elseif ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at!=''))
|
||||
<del>{{ $log->assetlog->name }}</del> (deleted)
|
||||
@else
|
||||
missing asset
|
||||
({{ $log->assetlog->name }}) ({{ $log->assetlog->deleted_at }})
|
||||
missing asset ({{ $log->assetlog->name }}) ({{ $log->assetlog->deleted_at }})
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $log->adminlog->fullName() }}</td>
|
||||
@@ -165,7 +161,7 @@ View User {{ $user->fullName() }} ::
|
||||
|
||||
<h6>Contact {{ $user->first_name }}</h6>
|
||||
|
||||
@if (isset($user->location_id))
|
||||
@if ($user->location_id)
|
||||
<iframe width="300" height="133" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?&q={{ $user->userloc->address }},{{ $user->userloc->city }},{{ $user->userloc->state }},{{ $user->userloc->country }}&output=embed"></iframe>
|
||||
@endif
|
||||
<ul>
|
||||
|
||||
Reference in New Issue
Block a user