Skip to content

A free open source IT asset/license management system

Small layout tweaks

snipe9a0dd604c937
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index dfce30e796..401a91dec8 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -190,6 +190,28 @@
@endif
+ @if ($component->company)
+ <div class="col-md-12" style="padding-bottom: 5px;">
+ <strong>{{ trans('general.company') }}: </strong>
+ {!! $component->company->present()->formattedNameLink !!}
+ </div>
+ @endif
+
+ @if ($component->category)
+ <div class="col-md-12" style="padding-bottom: 5px;">
+ <strong>{{ trans('general.category') }}: </strong>
+ {!! $component->category->present()->formattedNameLink !!}
+ </div>
+ @endif
+
+ @if ($component->location)
+ <div class="col-md-12" style="padding-bottom: 5px;">
+ <strong>{{ trans('general.location') }}: </strong>
+ {!! $component->location->present()->formattedNameLink !!}
+ </div>
+ @endif
+
+
@if ($component->serial!='')
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.serial') }}: </strong>
{{ $component->serial }} </div>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index dcfef33c50..387bc8fdd8 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -571,16 +571,6 @@
</div>
@endif
- <!-- last login -->
- <div class="row">
- <div class="col-md-3">
- {{ trans('general.last_login') }}
- </div>
- <div class="col-md-9">
- {{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}
- </div>
- </div>
-
@if ($user->department)
<!-- empty -->
@@ -608,6 +598,17 @@
@endif
@endif
+
+ <!-- last login -->
+ <div class="row">
+ <div class="col-md-3">
+ {{ trans('general.last_login') }}
+ </div>
+ <div class="col-md-9">
+ {{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}
+ </div>
+ </div>
+
@if ($user->created_at)
<!-- created at -->
<div class="row">