From a15ed6eaee1283628c2b699dfa28a056b2322d00 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 31 May 2024 19:29:29 +0100 Subject: [PATCH] Wrap disabled links in a span for tooltips Signed-off-by: snipe --- .../Assets/AssetCheckoutController.php | 2 +- resources/views/hardware/checkout.blade.php | 7 ++++--- resources/views/hardware/view.blade.php | 16 +++++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php index 912f6d57a..36f00f0fc 100644 --- a/app/Http/Controllers/Assets/AssetCheckoutController.php +++ b/app/Http/Controllers/Assets/AssetCheckoutController.php @@ -71,7 +71,7 @@ class AssetCheckoutController extends Controller if (!$asset->model) { return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix')); } - + $admin = Auth::user(); $target = $this->determineCheckoutTarget(); diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 0ca83fe21..30e6e670a 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -46,9 +46,10 @@ {{ $asset->model->name }} @else - - {{ trans('admin/hardware/general.model_invalid')}} - + + {{ trans('admin/hardware/general.model_invalid')}} + + {{ trans('admin/hardware/general.model_invalid_fix')}} {{ trans('admin/hardware/general.edit') }} diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 9a5e8ba1c..a9159c4fa 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -867,7 +867,7 @@ 'id' => 'bulkForm']) }} - + {{ Form::close() }} @@ -895,17 +895,21 @@ @if (($asset->assigned_to != '') && ($asset->deleted_at=='')) @can('checkin', \App\Models\Asset::class)
- model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}> + model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> + {{ trans('admin/hardware/general.checkin') }} +
@endcan @elseif (($asset->assigned_to == '') && ($asset->deleted_at=='')) @can('checkout', \App\Models\Asset::class)
- model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}> + model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> + {{ trans('admin/hardware/general.checkout') }} +
@endcan @endif @@ -932,9 +936,11 @@ @can('audit', \App\Models\Asset::class)
- model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}"> - {{ trans('general.audit') }} + model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> + + {{ trans('general.audit') }} +
@endcan