From a77dcad33654a960f117ba993ba78a78c5c76aab Mon Sep 17 00:00:00 2001 From: snipe Date: Sun, 18 Aug 2024 20:30:53 +0100 Subject: [PATCH] More links Signed-off-by: snipe --- app/Helpers/IconHelper.php | 11 ++-- resources/views/accessories/view.blade.php | 41 +++++++++++---- resources/views/blade/icon.blade.php | 11 ++-- resources/views/consumables/view.blade.php | 2 +- resources/views/hardware/view.blade.php | 51 ++++++++++++------- resources/views/layouts/default.blade.php | 9 ++++ resources/views/licenses/view.blade.php | 10 ++-- resources/views/models/view.blade.php | 2 +- .../views/settings/localization.blade.php | 2 +- resources/views/users/view.blade.php | 4 +- 10 files changed, 96 insertions(+), 47 deletions(-) diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php index 92d7cdbea7..10e6441771 100644 --- a/app/Helpers/IconHelper.php +++ b/app/Helpers/IconHelper.php @@ -56,7 +56,7 @@ class IconHelper case 'admin-settings': return 'fa fa-cogs'; case 'settings': - return 'fa fa-sign-out'; + return 'fa fa-cog'; case 'angle-left': return 'fa fa-angle-left'; case 'warning': @@ -90,7 +90,7 @@ class IconHelper case 'alerts': return 'far fa-flag'; case 'password': - return 'fa fa-key'; + return 'fa-solid fa-key'; case 'api-key': return 'fa-solid fa-user-secret'; case 'nav-toggle': @@ -129,7 +129,12 @@ class IconHelper return 'fas fa-wrench'; case 'seats': return 'far fa-list-alt'; - + case 'globe-us': + return 'fas fa-globe-americas'; + case 'locked': + return 'fas fa-lock'; + case 'unlocked': + return 'fas fa-lock'; } } diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 039ffb5db9..9d0116ef5f 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -34,7 +34,8 @@
  • + +
    • @@ -43,11 +44,12 @@ @can('accessories.files', $accessory)
  • - + +
    • @endcan @@ -55,7 +57,13 @@ @can('update', $accessory)
  • - {{ trans('button.upload') }} + +
    • @endcan @@ -186,6 +194,7 @@ @foreach ($accessory->uploads as $file) + {{ Helper::filetype_icon($file->filename) }} @@ -217,7 +226,7 @@ - + @endif @@ -322,31 +331,41 @@
    @can('checkout', \App\Models\Accessory::class)
    - numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} + + + {{ trans('general.checkout') }} +
    @endcan @can('update', \App\Models\Accessory::class)
    - {{ trans('admin/accessories/general.edit') }} + + + {{ trans('admin/accessories/general.edit') }} +
    @endcan @can('create', \App\Models\Accessory::class)
    - {{ trans('admin/accessories/general.clone') }} + + + {{ trans('admin/accessories/general.clone') }}
    @endcan @can('delete', $accessory) @if ($accessory->checkouts_count == 0)
    -
    @else
    - + + {{ trans('general.delete') }} diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php index 2f7ca30744..7aa6fdd408 100644 --- a/resources/views/blade/icon.blade.php +++ b/resources/views/blade/icon.blade.php @@ -1,7 +1,10 @@ +{{-- IMPORTANT!!! Make sure there is no newline at the end of this file, or it will break the loaders for the tables --}} + @props([ 'type' => '', - 'class' => '', - 'style' => '', - 'id' => '', + 'class' => false, + 'style' => false, + 'id' => false, + 'title' => false, ]) -merge(['class' => Icon::icon($type).' '.$class]) }} {{ $attributes->merge(['style' => $style]) }} {{ $attributes->merge(['id' => $id]) }} aria-hidden="true"> \ No newline at end of file +merge(['class' => Icon::icon($type).' '.$class]) }} {{ isset($style) ? $attributes->merge(['style' => $style]): '' }} {{ isset($title) ? $attributes->merge(['title' => $title]): '' }} aria-hidden="true"> \ No newline at end of file diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 7b1764f361..9479c1f651 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -487,7 +487,7 @@ - + @endif diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 8e6eebf64b..dabe5cc2d4 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -133,10 +133,15 @@ @can('update', \App\Models\Asset::class) -
  • +
  • - - {{ trans('button.upload') }} + +
    • @endcan @@ -271,7 +276,7 @@ @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
  • - + {{ $asset->assignedTo->phone }}
    • @endif @@ -493,10 +498,10 @@ @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!=''))
  • - + {{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }} - +
    • @endif @@ -506,25 +511,26 @@ {{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }} - + @endif @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
  • - + {{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }} - +
    • @endif @if (($asset->model) && ($asset->model->manufacturer->support_phone))
  • - + {{ $asset->model->manufacturer->support_phone }} @@ -621,6 +627,7 @@
    • @if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!='')) + @endif @@ -792,7 +799,8 @@ @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!='')) - + + {{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }} @endif
    @@ -886,12 +894,17 @@ {{ trans('general.na_no_purchase_date') }} @endif @if ($asset->eol_explicit) -