A free open source IT asset/license management system
Small cleanup on the views, added comments to detail view blades
snipe1398b4cbd6ed
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.phpindex 19beed5a7d..d792d1f58f 100755--- a/app/Models/Accessory.php+++ b/app/Models/Accessory.php@@ -270,6 +270,9 @@ class Accessory extends SnipeModelpublic function percentRemaining(){+ if (($this->qty == '' || $this->qty == 0)) {+ return 0;+ }if ($this->checkouts_count == 0) {return 100;}diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.phpindex 2ce5d1beec..dc1e86e49b 100644--- a/app/Presenters/AccessoryPresenter.php+++ b/app/Presenters/AccessoryPresenter.php@@ -35,7 +35,7 @@ class AccessoryPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/hardware/table.image'),+ 'title' => trans('general.image'),'visible' => true,'formatter' => 'imageFormatter',], [diff --git a/app/Presenters/AssetAuditPresenter.php b/app/Presenters/AssetAuditPresenter.phpindex dd7cd60b78..28b927e076 100644--- a/app/Presenters/AssetAuditPresenter.php+++ b/app/Presenters/AssetAuditPresenter.php@@ -50,7 +50,7 @@ class AssetAuditPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/hardware/table.image'),+ 'title' => trans('general.image'),'visible' => false,'formatter' => 'auditImageFormatter',], [diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.phpindex 4598840605..098d969d58 100644--- a/app/Presenters/AssetPresenter.php+++ b/app/Presenters/AssetPresenter.php@@ -61,7 +61,7 @@ class AssetPresenter extends Presenter'searchable' => false,'sortable' => true,'switchable' => true,- 'title' => trans('admin/hardware/table.image'),+ 'title' => trans('general.image'),'visible' => true,'formatter' => 'imageFormatter',], [diff --git a/resources/lang/en-US/admin/asset_maintenances/form.php b/resources/lang/en-US/admin/asset_maintenances/form.phpdeleted file mode 100644index c7a96fa1f4..0000000000--- a/resources/lang/en-US/admin/asset_maintenances/form.php+++ /dev/null@@ -1,15 +0,0 @@-<?php--return [- 'select_type' => 'Select Maintenance Type',- 'asset_maintenance_type' => 'Asset Maintenance Type',- 'title' => 'Title',- 'start_date' => 'Start Date',- 'completion_date' => 'Completion Date',- 'cost' => 'Cost',- 'is_warranty' => 'Warranty Improvement',- 'asset_maintenance_time' => 'Asset Maintenance Time (in days)',- 'notes' => 'Notes',- 'update' => 'Update Asset Maintenance',- 'create' => 'Create Asset Maintenance',-];diff --git a/resources/lang/en-US/admin/asset_maintenances/general.php b/resources/lang/en-US/admin/asset_maintenances/general.phpdeleted file mode 100644index c92ec20164..0000000000--- a/resources/lang/en-US/admin/asset_maintenances/general.php+++ /dev/null@@ -1,16 +0,0 @@-<?php--return [- 'asset_maintenances' => 'Asset Maintenances',- 'edit' => 'Edit Asset Maintenance',- 'delete' => 'Delete Asset Maintenance',- 'view' => 'View Asset Maintenance Details',- 'repair' => 'Repair',- 'maintenance' => 'Maintenance',- 'upgrade' => 'Upgrade',- 'calibration' => 'Calibration',- 'software_support' => 'Software Support',- 'hardware_support' => 'Hardware Support',- 'configuration_change' => 'Configuration Change',- 'pat_test' => 'PAT Test',-];diff --git a/resources/lang/en-US/admin/asset_maintenances/message.php b/resources/lang/en-US/admin/asset_maintenances/message.phpdeleted file mode 100644index 7a397b05b9..0000000000--- a/resources/lang/en-US/admin/asset_maintenances/message.php+++ /dev/null@@ -1,21 +0,0 @@-<?php--return [- 'not_found' => 'Asset Maintenance you were looking for was not found!',- 'delete' => [- 'confirm' => 'Are you sure you wish to delete this asset maintenance?',- 'error' => 'There was an issue deleting the asset maintenance. Please try again.',- 'success' => 'The asset maintenance was deleted successfully.',- ],- 'create' => [- 'error' => 'Asset Maintenance was not created, please try again.',- 'success' => 'Asset Maintenance created successfully.',- ],- 'edit' => [- 'error' => 'Asset Maintenance was not edited, please try again.',- 'success' => 'Asset Maintenance edited successfully.',- ],- 'asset_maintenance_incomplete' => 'Not Completed Yet',- 'warranty' => 'Warranty',- 'not_warranty' => 'Not Warranty',-];diff --git a/resources/lang/en-US/admin/asset_maintenances/table.php b/resources/lang/en-US/admin/asset_maintenances/table.phpdeleted file mode 100644index c5e6265f73..0000000000--- a/resources/lang/en-US/admin/asset_maintenances/table.php+++ /dev/null@@ -1,8 +0,0 @@-<?php--return [- 'title' => 'Asset Maintenance',- 'asset_name' => 'Asset Name',- 'is_warranty' => 'Warranty',- 'dl_csv' => 'Download CSV',-];diff --git a/resources/lang/en-US/admin/maintenances/form.php b/resources/lang/en-US/admin/maintenances/form.phpindex 030c597d85..a20b806f2f 100644--- a/resources/lang/en-US/admin/maintenances/form.php+++ b/resources/lang/en-US/admin/maintenances/form.php@@ -2,7 +2,7 @@return ['select_type' => 'Select Maintenance Type',- 'asset_maintenance_type' => 'Asset Maintenance Type',+ 'asset_maintenance_type' => 'Type','title' => 'Title','start_date' => 'Start Date','completion_date' => 'Completion Date',diff --git a/resources/views/blade/page-column.blade.php b/resources/views/blade/page-column.blade.phpindex 89121dc36f..bfa3d43bf6 100644--- a/resources/views/blade/page-column.blade.php+++ b/resources/views/blade/page-column.blade.php@@ -3,6 +3,6 @@])<!-- Start column component -->-<div class="{{ $class }}">+<div class="{{ $class }}" {{ $attributes->merge(['style' => '']) }}>{{ $slot }}</div>diff --git a/resources/views/blade/progressbar/index.blade.php b/resources/views/blade/progressbar/index.blade.phpindex fc3aa62cff..27a23fe893 100644--- a/resources/views/blade/progressbar/index.blade.php+++ b/resources/views/blade/progressbar/index.blade.php@@ -26,11 +26,11 @@ if ($percent < 25) {<div class="progress-group"><span class="progress-text">{{ $text }}</span><span class="progress-number">- {{ $slot }}- <span class="text-muted">{{ round($percent) }}%</span>- </span>+ {{ $slot }}+ <span class="text-muted">{{ round($percent) }}%</span>+ </span><div class="progress {{ $size }}">- <div class="progress-bar progress-bar-{{ $color_class }}" style="width: {{ round($percent) }}%"></div>+ <div class="progress-bar progress-bar-{{ $color_class }}" role="progressbar" style="width: {{ round($percent) }}%"></div></div></div>{!! ($use_well=='true') ? '</div>' : '' !!}diff --git a/resources/views/blade/tabs/pane.blade.php b/resources/views/blade/tabs/pane.blade.phpindex 55ef5cb34b..35fca55aa9 100644--- a/resources/views/blade/tabs/pane.blade.php+++ b/resources/views/blade/tabs/pane.blade.php@@ -5,25 +5,30 @@<!-- tab-pane --><div id="{{ $name }}" {{ $attributes->merge(['class' => 'snipetab-pane tab-pane fade']) }}>- @if (isset($table_header))- <h3 class="box-title{{ (!isset($bulkactions)) ? ' pull-left' : '' }}">- {{ $table_header }}- </h3>- @endif-- @if (isset($bulkactions))- <div id="{{ Illuminate\Support\Str::camel($name) }}ToolBar" class="pull-left" style="min-width:500px !important; padding-top: 10px;">- {{ $bulkactions }}- </div>- @endif-- @if ((isset($content)) && (!$content->isEmpty()))- {{ $content }}- @endif-- @if (($slot) && (!$slot->isEmpty()))- {{ $slot }}- @endif+ <div class="row">++ @if (isset($table_header))+ <h3 class="box-title{{ (!isset($bulkactions)) ? ' pull-left' : '' }}">+ {{ $table_header }}+ </h3>+ @endif++ @if (isset($bulkactions))+ <div id="{{ Illuminate\Support\Str::camel($name) }}ToolBar" class="pull-left" style="min-width:500px !important; padding-top: 10px;">+ {{ $bulkactions }}+ </div>+ @endif++ @if ((isset($content)) && (!$content->isEmpty()))+ {{ $content }}+ @endif++ @if (($slot) && (!$slot->isEmpty()))+ {{ $slot }}+ @endif++ </div>+</div><!-- /.tab-pane -->\ No newline at end of filediff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.phpindex 52ec211ec1..444b906c71 100755--- a/resources/views/hardware/view.blade.php+++ b/resources/views/hardware/view.blade.php@@ -69,57 +69,72 @@</x-slot:tabnav><x-slot:tabpanes>++ <!-- start details tab content --><x-tabs.pane name="details">- <x-page-data>-- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-info-element.status :infoObject="$asset"/>- </x-well>- </x-page-column>-- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="calendar" class="fa-fw"/>- <strong>{{ trans('general.last_checkout') }}</strong>- @if ($asset->last_checkout != '')- {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}- <span class="text-muted">{{ Carbon::parse($asset->last_checkout)->diffForHumans(['parts' => 2]) }}</span>- @else- {{ trans('general.na') }}- @endif- </x-well>- </x-page-column>-- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="expected_checkin" class="fa-fw"/>- <strong>{{ trans('general.expected_checkin') }}</strong>- @if ($asset->expected_checkin!='')- {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}- <span class="text-muted hidden-sm hidden-md">{{ Carbon::parse($asset->expected_checkin)->diffForHumans(['parts' => 2]) }}</span>- @else- {{ trans('general.na') }}- @endif- </x-well>- </x-page-column>- <x-page-column class="col-md-8 col-sm-12">+ <!-- this just adds a little top space -->+ <div class="clearfix visible-lg-block" style="padding: 6px;"></div>++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well>+ <x-info-element.status :infoObject="$asset"/>+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well>+ <x-icon type="calendar" class="fa-fw"/>+ <strong>{{ trans('general.last_checkout') }}</strong>+ @if ($asset->last_checkout != '')+ {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}+ <span class="text-muted">{{ Carbon::parse($asset->last_checkout)->diffForHumans(['parts' => 2]) }}</span>+ @else+ {{ trans('general.na') }}+ @endif+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well>+ <x-icon type="expected_checkin" class="fa-fw"/>+ <strong>{{ trans('general.expected_checkin') }}</strong>+ @if ($asset->expected_checkin!='')+ {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}+ <span class="text-muted hidden-sm hidden-md">{{ Carbon::parse($asset->expected_checkin)->diffForHumans(['parts' => 2]) }}</span>+ @else+ {{ trans('general.na') }}+ @endif+ </x-well>++ </x-page-column>+ <!-- ./ well column -->++ <!-- set clearfix for responsive design -->+ <div class="clearfix"></div>+++ <!-- definition list column -->+ <x-page-column class="col-md-8">++ <!-- definition list content -->+ <x-page-data>+<x-data-row :label="trans('admin/hardware/form.tag')" copy_what="asset_tag">{{ $asset->asset_tag }}</x-data-row>-<x-data-row :label="trans('admin/hardware/form.name')" copy_what="asset_name">{{ $asset->name }}</x-data-row><x-data-row :label="trans('admin/hardware/table.current_value')" copy_what="current_value">- @if (($asset->id) && ($asset->location))- {{ $asset->location->currency }}- @else- {{ $snipeSettings->default_currency }}- @endif+ {{ (($asset->id) && ($asset->location) ? $asset->location->currency : $snipeSettings->default_currency) }}{{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}}</x-data-row>@@ -144,7 +159,6 @@@endif</x-data-row>-@if (($asset->model) && ($asset->model->fieldset))@foreach($asset->model->fieldset->fields as $field)<x-data-row :label="$field->name">@@ -153,14 +167,11 @@@endforeach@endif- @if ($asset->defaultLoc)- <x-data-row :label="trans('admin/hardware/form.default_location')" copy_what="default_location">- {!! $asset->defaultLoc->present()->formattedNameLink !!}- </x-data-row>- @endif-+ <x-data-row :label="trans('admin/hardware/form.default_location')" copy_what="default_location">+ {!! $asset->defaultLoc?->present()->formattedNameLink !!}+ </x-data-row>- @if ($asset->asset_eol_date)+ @if ($asset->asset_eol_date)<x-data-row :label="trans('general.device_eol')" copy_what="eol_date">@if ($asset->asset_eol_date){{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }}@@ -189,109 +200,105 @@</x-data-row>@endif+ </x-page-data>+ <!-- ./ definition list content -->++ </x-page-column>+ <!-- ./ definition list column -->++ <!-- start side stats column -->+ <x-page-column class="col-md-4 col-sm-12">++ @php+ // Compute elapsed/total percentage clamped to 0–100+ $clampedPercent = fn (float $elapsed, float $total): float =>+ $total > 0 ? min(100, max(0, ($elapsed / $total) * 100)) : 0;++ $now = Carbon::now();+ $purchaseCarbon = $asset->purchase_date ? Carbon::parse($asset->purchase_date) : null;++ // EOL percentage: elapsed since purchase / total EOL period+ $eolPercent = 0;+ if ($purchaseCarbon && $asset->asset_eol_date) {+ $eolPercent = $clampedPercent(+ $purchaseCarbon->diffInMonths($now),+ $purchaseCarbon->diffInMonths($asset->asset_eol_date)+ );+ }++ // Depreciation percentage: elapsed since purchase / total depreciation period+ $deprPercent = 0;+ $deprDate = $asset->depreciated_date();+ if ($purchaseCarbon && $deprDate) {+ $deprPercent = $clampedPercent(+ $purchaseCarbon->diffInMonths($now),+ $purchaseCarbon->diffInMonths(Carbon::instance($deprDate))+ );+ }++ // Warranty percentage: elapsed since purchase / total warranty period+ $warrantyPercent = 0;+ if ($purchaseCarbon && $asset->warranty_expires) {+ $warrantyPercent = $clampedPercent(+ $purchaseCarbon->diffInMonths($now),+ $purchaseCarbon->diffInMonths($asset->warranty_expires)+ );+ }+ @endphp++ <x-well class="well-sm">++ <x-progressbar use_well="false" columns="12" text="{{ trans('general.device_eol') }}" :percent="$eolPercent">+ @if($asset->purchase_date && $asset->asset_eol_date)+ <strong>{{ (int) Carbon::now()->diffInMonths($asset->asset_eol_date, true) }}</strong>+ /{{ $asset->model?->eol }} {{ trans('general.months') }}+ @endif+ </x-progressbar>- <div class="clearfix"></div>-- </x-page-column>-- <x-page-column class="col-md-4 col-sm-12">-- @php- // Compute elapsed/total percentage clamped to 0–100- $clampedPercent = fn (float $elapsed, float $total): float =>- $total > 0 ? min(100, max(0, ($elapsed / $total) * 100)) : 0;-- $now = Carbon::now();- $purchaseCarbon = $asset->purchase_date ? Carbon::parse($asset->purchase_date) : null;-- // EOL percentage: elapsed since purchase / total EOL period- $eolPercent = 0;- if ($purchaseCarbon && $asset->asset_eol_date) {- $eolPercent = $clampedPercent(- $purchaseCarbon->diffInMonths($now),- $purchaseCarbon->diffInMonths($asset->asset_eol_date)- );- }-- // Depreciation percentage: elapsed since purchase / total depreciation period- $deprPercent = 0;- $deprDate = $asset->depreciated_date();- if ($purchaseCarbon && $deprDate) {- $deprPercent = $clampedPercent(- $purchaseCarbon->diffInMonths($now),- $purchaseCarbon->diffInMonths(Carbon::instance($deprDate))- );- }-- // Warranty percentage: elapsed since purchase / total warranty period- $warrantyPercent = 0;- if ($purchaseCarbon && $asset->warranty_expires) {- $warrantyPercent = $clampedPercent(- $purchaseCarbon->diffInMonths($now),- $purchaseCarbon->diffInMonths($asset->warranty_expires)- );- }- @endphp-- <x-well class="well-sm">-- <x-progressbar use_well="false" columns="12" text="{{ trans('general.device_eol') }}" :percent="$eolPercent">- @if($asset->purchase_date && $asset->asset_eol_date)- <strong>{{ (int) Carbon::now()->diffInMonths($asset->asset_eol_date, true) }}</strong>/{{ $asset->model?->eol }} {{ trans('general.months') }}- @endif- </x-progressbar>-- <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.fully_depreciated')" :percent="$deprPercent">- @if($deprDate)- {{ Helper::getFormattedDateObject($deprDate->format('Y-m-d'), 'date', false) }}- @endif- </x-progressbar>-- <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.warranty_expires')" :percent="$warrantyPercent">- @if($asset->warranty_expires)- {{ Helper::getFormattedDateObject($asset->warranty_expires, 'date', false) }}- @endif- </x-progressbar>-- </x-well>-- <x-well class="well-sm">- <div class="well-display">-- <x-data-row icon_type="maintenances" label="Active Maintenances">- {{ $asset->maintenances->whereNull('completion_date')->count() }}- </x-data-row>-- <x-data-row icon_type="checkout" :label="trans('general.checkouts_count')">- {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}- </x-data-row>-- <x-data-row icon_type="checkin" :label="trans('general.checkins_count')">- {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}- </x-data-row>-- <x-data-row icon_type="request" :label="trans('general.user_requests_count')">- {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}- </x-data-row>+ <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.fully_depreciated')" :percent="$deprPercent">+ @if($deprDate)+ {{ Helper::getFormattedDateObject($deprDate->format('Y-m-d'), 'date', false) }}+ @endif+ </x-progressbar>- </div>- </x-well>+ <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.warranty_expires')" :percent="$warrantyPercent">+ @if($asset->warranty_expires)+ {{ Helper::getFormattedDateObject($asset->warranty_expires, 'date', false) }}+ @endif+ </x-progressbar>+ </x-well>- @if (($snipeSettings->qr_code=='1') || $snipeSettings->label2_2d_type!='none')- <div class="col-md-12 text-center asset-qr-img" style="padding-top: 15px;">- <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail" style="height: 150px; width: 150px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">- </div>- @endif+ <x-well class="well-sm">+ <div class="well-display">+ <x-data-row icon_type="maintenances" label="Active Maintenances">+ {{ $asset->maintenances->whereNull('completion_date')->count() }}+ </x-data-row>+ <x-data-row icon_type="checkout" :label="trans('general.checkouts_count')">+ {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}+ </x-data-row>+ <x-data-row icon_type="checkin" :label="trans('general.checkins_count')">+ {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}+ </x-data-row>+ <x-data-row icon_type="request" :label="trans('general.user_requests_count')">+ {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}+ </x-data-row>+ </div>+ </x-well>- </x-page-column>+ @if (($snipeSettings->qr_code=='1') || $snipeSettings->label2_2d_type!='none')+ <div class="col-md-12 text-center asset-qr-img" style="padding-top: 15px;">+ <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail" style="height: 150px; width: 150px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">+ </div>+ @endif+ </x-page-column>+ <!-- end side stats column -->- </x-page-data></x-tabs.pane><x-tabs.pane name="licenses" :count="$asset->licenses->count()">diff --git a/resources/views/maintenances/view.blade.php b/resources/views/maintenances/view.blade.phpindex 6b2a631e18..78063a96d6 100644--- a/resources/views/maintenances/view.blade.php+++ b/resources/views/maintenances/view.blade.php@@ -27,34 +27,47 @@ use Carbon\Carbon;<x-slot:tabpanes>+ <!-- start details tab content --><x-tabs.pane name="details">- <x-page-data>-- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-info-element.status :infoObject="$maintenance->asset"/>- </x-well>- </x-page-column>--- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="asset" class="fa-fw"/>- {!! $maintenance->asset?->present()->nameUrl !!}- </x-well>- </x-page-column>-- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="maintenances" class="fa-fw"/>- <strong>{{ trans('admin/maintenances/form.asset_maintenance_type') }}</strong>- {{ $maintenance->asset_maintenance_type }}- </x-well>- </x-page-column>-- <x-page-column class="col-md-8 col-sm-12">-+ <!-- this just adds a little top space -->+ <div class="clearfix visible-lg-block" style="padding: 6px;"></div>++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well>+ <x-info-element.status :infoObject="$maintenance->asset"/>+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-icon type="asset" class="fa-fw"/>+ {!! $maintenance->asset?->present()->nameUrl !!}+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-icon type="maintenances" class="fa-fw"/>+ <strong>{{ trans('admin/maintenances/form.asset_maintenance_type') }}</strong>+ {{ $maintenance->asset_maintenance_type }}+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- set clearfix for responsive design -->+ <div class="clearfix"></div>++ <!-- definition list column -->+ <x-page-column class="col-md-8 col-sm-12">++ <!-- definition list content -->+ <x-page-data><x-data-row :label="trans('admin/hardware/form.tag')" copy_what="asset_tag">{{ $maintenance->asset?->asset_tag }}</x-data-row>@@ -80,7 +93,9 @@ use Carbon\Carbon;</x-data-row><x-data-row :label="trans('admin/maintenances/form.asset_maintenance_time')" copy_what="time">- {{ $maintenance->asset_maintenance_time }} {{ trans('general.days') }}+ @if ($maintenance->asset_maintenance_time)+ {{ $maintenance->asset_maintenance_time }} {{ trans('general.days') }}+ @endif</x-data-row><x-data-row :label="trans('admin/maintenances/form.cost')" copy_what="cost">@@ -97,9 +112,11 @@ use Carbon\Carbon;@endif</x-data-row>-- <div class="clearfix"></div>- </x-page-column>+ </x-page-data>+ <!-- ./ definition list content -->+ <div class="clearfix"></div>+ </x-page-column>+ <!-- ./ definition list column --><!-- begin side stats well column--><x-page-column class="col-md-4 col-sm-12">@@ -136,7 +153,7 @@ use Carbon\Carbon;</x-well></x-page-column><div class="clearfix"></div>- </x-page-data>+</x-tabs.pane>diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.phpindex 9b3fa9756a..4e4a443ae5 100644--- a/resources/views/partials/bootstrap-table.blade.php+++ b/resources/views/partials/bootstrap-table.blade.php@@ -1004,7 +1004,7 @@else if (value <= 100) {bar_color = 'success';}- return '<div class="progress progress-sm" data-tooltip="true" title="' + value + '%"><div class="progress-bar progress-bar-' + bar_color + '" role="progressbar" aria-valuenow="' + value + '" aria-valuemin="0" aria-valuemax="100" style="width: ' + value + '%; min-width: 1em;"></div></div>';+ return '<div class="progress progress-sm" data-tooltip="true" title="' + value + '%"><div class="progress-bar progress-bar-' + bar_color + '" role="progressbar" aria-valuenow="' + value + '" aria-valuemin="0" aria-valuemax="100" style="width: ' + value + '%; min-width: 0em;"></div></div>';}// Use this when we're introspecting into a column object and need to linkdiff --git a/resources/views/reports/audit.blade.php b/resources/views/reports/audit.blade.phpindex bbbf4a4784..29b168d86e 100644--- a/resources/views/reports/audit.blade.php+++ b/resources/views/reports/audit.blade.php@@ -30,7 +30,7 @@<thead><tr>- <th class="col-sm-1" data-field="file" data-visible="false" data-formatter="auditImageFormatter">{{ trans('admin/hardware/table.image') }}</th>+ <th class="col-sm-1" data-field="file" data-visible="false" data-formatter="auditImageFormatter">{{ trans('general.image') }}</th><th class="col-sm-2" data-field="created_by" data-sortable="true" data-searchable="true" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th><th class="col-sm-2" data-field="item" data-sortable="true" data-searchable="true" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th><th class="col-sm-1" data-field="location" data-sortable="true" data-searchable="true" data-formatter="locationsLinkObjFormatter">{{ trans('general.location') }}</th>diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.phpindex 59945aecc5..ec4e606d94 100755--- a/resources/views/users/view.blade.php+++ b/resources/views/users/view.blade.php@@ -40,52 +40,70 @@<x-tabs.history-tab count="{{ $user->assetlog()->count() }}" model="\App\Models\User::class"/><x-tabs.upload-tab :item="$user"/></x-slot:tabnav>++<x-slot:tabpanes>++ <!-- start details tab content --><x-tabs.pane name="details">- <x-page-data>+ <!-- this just adds a little top space -->+ <div class="clearfix visible-lg-block" style="padding: 6px;"></div>++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well>+ <x-icon type="calendar" class="fa-fw"/>+ <strong>{{ trans('general.last_login') }}</strong>+ @if ($user->last_login != '')+ {{ Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}+ <span class="text-muted">{{ Carbon::parse($user->last_login)->diffForHumans(['parts' => 2]) }}</span>+ @else+ {{ trans('general.na') }}+ @endif+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- well column -->+ <x-page-column class="col-md-4">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-icon type="calendar" class="fa-fw"/>+ <strong>{{ trans('general.start_date') }}</strong>+ @if ($user->start_date != '')+ {{ Helper::getFormattedDateObject($user->start_date, 'date', false) }}+ <span class="text-muted">{{ Carbon::parse($user->start_date)->diffForHumans(['parts' => 2]) }}</span>+ @else+ {{ trans('general.na') }}+ @endif+ </x-well>+ </x-page-column>+ <!-- ./ well column -->++ <!-- well column -->+ <x-page-column class="col-md-4" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-icon type="calendar" class="fa-fw {{ (($user->end_date!='' && $user->end_date < Carbon::now()) ? ' text-danger' : '') }}"/>+ <strong>{{ trans('general.end_date') }}</strong>+ @if ($user->end_date != '')+ {{ Helper::getFormattedDateObject($user->end_date, 'date', false) }}+ <span class="text-muted">{{ Carbon::parse($user->end_date)->diffForHumans(['parts' => 2]) }}</span>+ @else+ {{ trans('general.na') }}+ @endif+ </x-well>- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="calendar" class="fa-fw"/>- <strong>{{ trans('general.last_login') }}</strong>- @if ($user->last_login != '')- {{ Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}- <span class="text-muted">{{ Carbon::parse($user->last_login)->diffForHumans(['parts' => 2]) }}</span>- @else- {{ trans('general.na') }}- @endif- </x-well>- </x-page-column>-- <x-page-column class="col-md-4">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="calendar" class="fa-fw"/>- <strong>{{ trans('general.start_date') }}</strong>- @if ($user->start_date != '')- {{ Helper::getFormattedDateObject($user->start_date, 'date', false) }}- <span class="text-muted">{{ Carbon::parse($user->start_date)->diffForHumans(['parts' => 2]) }}</span>- @else- {{ trans('general.na') }}- @endif- </x-well>- </x-page-column>-- <x-page-column class="col-md-4" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">- <x-icon type="calendar" class="fa-fw {{ (($user->end_date!='' && $user->end_date < Carbon::now()) ? ' text-danger' : '') }}"/>- <strong>{{ trans('general.end_date') }}</strong>- @if ($user->end_date != '')- {{ Helper::getFormattedDateObject($user->end_date, 'date', false) }}- <span class="text-muted">{{ Carbon::parse($user->end_date)->diffForHumans(['parts' => 2]) }}</span>- @else- {{ trans('general.na') }}- @endif- </x-well>- <div class="clearfix"></div>- </x-page-column>+ </x-page-column>+ <!-- ./ well column -->++ <!-- set clearfix for responsive design -->+ <div class="clearfix"></div>++ <!-- definition list column -->+ <x-page-column class="col-md-8 col-sm-12">- <x-page-column class="col-md-8 col-sm-12">+ <!-- definition list content -->+ <x-page-data><x-data-row :label="trans('general.name')" copy_what="name">{{ $user->first_name }} {{ $user->last_name }}@@ -113,14 +131,13 @@{{ $user->jobtitle }}</x-data-row>-<x-data-row :label="trans('general.groups')" copy_what="groups">@if ($user->groups->count() > 0)@foreach ($user->groups as $group)@can('superadmin')<a href="{{ route('groups.show', $group->id) }}" class="label label-default">{{ $group->name }}</a>@else- {{ $group->name }}+ <span class="label label-default">{{ $group->name }}</span>@endcan@endforeach@endif@@ -129,127 +146,129 @@<span class="text-warning"><x-icon type="warning"/> {{ trans('admin/users/general.individual_override') }}</span>@endif</x-data-row>+ </x-page-data>- <div class="clearfix"></div>- </x-page-column>+ <!-- ./ definition list column -->- <!-- begin side stats well column-->- <x-page-column class="col-md-4 col-sm-12">+ </x-page-column>+ <!-- ./ definition list content -->- <x-well class="well-sm" style="padding-left: 15px;">+ <!-- begin side stats well column-->+ <x-page-column class="col-md-4 col-sm-12">- @if($user->activated == '1')- <x-icon type="checkmark" class="fa-fw text-success"/>- {{ trans('general.login_enabled') }}-- <br>- @if ($user->two_factor_active())- <x-icon type="checkmark" class="fa-fw text-success"/>- @else- <x-icon type="x" class="fa-fw text-danger"/>- @endif- {{ trans('admin/users/general.two_factor_active') }}-- <br>- @if ($user->two_factor_active_and_enrolled())- <x-icon type="checkmark" class="fa-fw text-success"/>- @else- <x-icon type="x" class="fa-fw text-danger"/>- @endif- {{ trans('admin/users/general.two_factor_enrolled') }}+ <x-well class="well-sm" style="padding-left: 15px;">++ @if($user->activated == '1')+ <x-icon type="checkmark" class="fa-fw text-success"/>+ {{ trans('general.login_enabled') }}+ <br>+ @if ($user->two_factor_active())+ <x-icon type="checkmark" class="fa-fw text-success"/>@else<x-icon type="x" class="fa-fw text-danger"/>- {{ trans('general.login_enabled') }}@endif+ {{ trans('admin/users/general.two_factor_active') }}<br>-- @if($user->vip == '1')- <x-icon type="vip" class="fa-fw text-warning"/>- {{ trans('admin/users/general.vip_label') }}- <br>+ @if ($user->two_factor_active_and_enrolled())+ <x-icon type="checkmark" class="fa-fw text-success"/>+ @else+ <x-icon type="x" class="fa-fw text-danger"/>@endif+ {{ trans('admin/users/general.two_factor_enrolled') }}- <x-icon type="api-key" class="fa-fw"/>- {{ $user->tokens()->count() }} API Tokens- <br>+ @else+ <x-icon type="x" class="fa-fw text-danger"/>+ {{ trans('general.login_enabled') }}+ @endif- @if($user->remote == '1')- <x-icon type="remote" class="fa-fw"/>- {{ trans('admin/users/general.remote') }}- <br>- @endif+ <br>- @if($user->ldap_import == '1')- <x-icon type="ldap" class="fa-fw"/>- {{ trans('admin/settings/general.ldap_enabled') }}- <br>- @endif+ @if($user->vip == '1')+ <x-icon type="vip" class="fa-fw text-warning"/>+ {{ trans('admin/users/general.vip_label') }}+ <br>+ @endif- @if ($user->autoassign_licenses == '1')- <x-icon type="checkmark" class="fa-fw text-success"/>- @else- <x-icon type="x" class="fa-fw text-danger"/>- @endif- {{ trans('general.autoassign_licenses') }}- <br>+ <x-icon type="api-key" class="fa-fw"/>+ {{ $user->tokens()->count() }} API Tokens+ <br>- </x-well>+ @if($user->remote == '1')+ <x-icon type="remote" class="fa-fw"/>+ {{ trans('admin/users/general.remote') }}+ <br>+ @endif- @if($user->getUserTotalCost()->total_user_cost > 0)- <x-well class="well-sm">+ @if($user->ldap_import == '1')+ <x-icon type="ldap" class="fa-fw"/>+ {{ trans('admin/settings/general.ldap_enabled') }}+ <br>+ @endif- <div class="well-display">+ @if ($user->autoassign_licenses == '1')+ <x-icon type="checkmark" class="fa-fw text-success"/>+ @else+ <x-icon type="x" class="fa-fw text-danger"/>+ @endif+ {{ trans('general.autoassign_licenses') }}+ <br>- <x-data-row icon_type="asset" label="{{ trans('general.assets') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->asset_cost) }}- </x-data-row>+ </x-well>- <x-data-row icon_type="licenses" label="{{ trans('general.licenses') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->license_cost)}}- </x-data-row>+ @if($user->getUserTotalCost()->total_user_cost > 0)+ <x-well class="well-sm">- <x-data-row icon_type="accessories" label="{{ trans('general.accessories') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->accessory_cost)}}- </x-data-row>+ <div class="well-display">- <x-data-row icon_type="cost" label=" {{ trans('admin/users/table.total_assets_cost') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost) }}- </x-data-row>+ <x-data-row icon_type="asset" label="{{ trans('general.assets') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->asset_cost) }}+ </x-data-row>- </div>+ <x-data-row icon_type="licenses" label="{{ trans('general.licenses') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->license_cost)}}+ </x-data-row>- </x-well>- @endif+ <x-data-row icon_type="accessories" label="{{ trans('general.accessories') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->accessory_cost)}}+ </x-data-row>+ <x-data-row icon_type="cost" label=" {{ trans('admin/users/table.total_assets_cost') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost) }}+ </x-data-row>+ </div>- @if ( ($user->activated == '1') && (auth()->user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))+ </x-well>+ @endif- <!-- 2FA reset -->- <a class="btn btn-theme btn-sm" id="two_factor_reset" style="margin-right: 10px; margin-top: 10px;">- {{ trans('admin/settings/general.two_factor_reset') }}- </a>- <span id="two_factor_reseticon">- </span>- <span id="two_factor_resetresult">- </span>- <span id="two_factor_resetstatus">- </span>- <br>- <p class="help-block" style="line-height: 1.6;">- {{ trans('admin/settings/general.two_factor_reset_help') }}- </p>- @endif+ @if ( ($user->activated == '1') && (auth()->user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))++ <!-- 2FA reset -->++ <a class="btn btn-theme btn-sm" id="two_factor_reset" style="margin-right: 10px; margin-top: 10px;">+ {{ trans('admin/settings/general.two_factor_reset') }}+ </a>+ <span id="two_factor_reseticon">+ </span>+ <span id="two_factor_resetresult">+ </span>+ <span id="two_factor_resetstatus">+ </span>+ <br>+ <p class="help-block" style="line-height: 1.6;">+ {{ trans('admin/settings/general.two_factor_reset_help') }}+ </p>++ @endif- </x-page-column>- <!-- end side stats well column-->+ </x-page-column>+ <!-- end side stats well column-->- </x-page-data></x-tabs.pane><x-tabs.pane name="licenses" :count="$user->licenses()->count()">