A free open source IT asset/license management system
Small layout tweaks
snipe67e41e7da64d
diff --git a/resources/views/blade/input/category-select.blade.php b/resources/views/blade/input/category-select.blade.phpindex 6c53a64739..eb92fb81a5 100644--- a/resources/views/blade/input/category-select.blade.php+++ b/resources/views/blade/input/category-select.blade.php@@ -14,6 +14,7 @@'hideNewButton' => false,'categoryType' => 'asset','id' => null,+ 'help_text' => null,])@php@@ -59,5 +60,10 @@</div>@endunless- <div class="col-md-8 col-md-offset-3"><x-form.error :name="$name" /></div>+ <div class="col-md-7 col-md-offset-3">+ <x-form.error :name="$name" />+ @if ($help_text)+ <x-form.help :name="$selectId">{!! $help_text !!}</x-form.help>+ @endif+ </div></div>diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.phpindex 9a65f84a2d..41423bcace 100755--- a/resources/views/hardware/view.blade.php+++ b/resources/views/hardware/view.blade.php@@ -195,6 +195,41 @@@endforeach@endif+ {{-- Sync-adapter-populated network / OS+ inventory. Only renders per-field+ when a value exists so assets that+ never got synced (or that skipped+ these mappings) don't show empty+ rows. --}}+ @if ($asset->externalSource)+ @if ($asset->externalSource->primary_mac)+ <x-data-row :label="trans('admin/settings/general.sync_adapter_field_mac')" copy_what="external_mac">+ {{ $asset->externalSource->primary_mac }}+ </x-data-row>+ @endif+ @if ($asset->externalSource->primary_ip)+ <x-data-row :label="trans('admin/settings/general.sync_adapter_field_ip')" copy_what="external_ip">+ {{ $asset->externalSource->primary_ip }}+ </x-data-row>+ @endif+ @if ($asset->externalSource->os)+ <x-data-row :label="trans('admin/settings/general.sync_adapter_field_os')" copy_what="external_os">+ {{ $asset->externalSource->os }}+ </x-data-row>+ @endif+ @if ($asset->externalSource->os_version)+ <x-data-row :label="trans('admin/settings/general.sync_adapter_field_os_version')" copy_what="external_os_version">+ {{ $asset->externalSource->os_version }}+ </x-data-row>+ @endif+ @if ($asset->externalSource->last_seen)+ <x-data-row :label="trans('admin/settings/general.sync_adapter_field_last_seen')" copy_what="external_last_seen">+ {{ $asset->externalSource->last_seen->diffForHumans() }}+ <span class="text-muted">({{ Helper::getFormattedDateObject($asset->externalSource->last_seen, 'datetime', false) }})</span>+ </x-data-row>+ @endif+ @endif+{{-- journal() chains off assetlog() which orders created_at DESC,