From eb6c51fabdf755b488493bff2b1c4d52a3ba8b3f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 22 Oct 2024 22:04:57 +0100
Subject: [PATCH 1/2] Fixes #15701 - load avif files properly in lightbox

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/view.blade.php | 3 ++-
 resources/views/components/view.blade.php  | 2 +-
 resources/views/consumables/view.blade.php | 2 +-
 resources/views/hardware/view.blade.php    | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index fb2904e2cf..1e3568f0ef 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -179,7 +179,8 @@
       @if ($accessory->image!='')
           <div class="row">
               <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-                  <a href="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" data-toggle="lightbox"><img src="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" class="img-responsive img-thumbnail" alt="{{ $accessory->name }}"></a>
+                  <a href="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" data-toggle="lightbox" data-type="image">
+                      <img src="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" class="img-responsive img-thumbnail" alt="{{ $accessory->name }}"></a>
               </div>
           </div>
       @endif
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 5bd185bedf..ba3a6d6e24 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -161,7 +161,7 @@
   <div class="col-md-3">
     @if ($component->image!='')
       <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-        <a href="{{ Storage::disk('public')->url('components/'.e($component->image)) }}" data-toggle="lightbox">
+        <a href="{{ Storage::disk('public')->url('components/'.e($component->image)) }}" data-toggle="lightbox" data-type="image">
           <img src="{{ Storage::disk('public')->url('components/'.e($component->image)) }}" class="img-responsive img-thumbnail" alt="{{ $component->name }}"></a>
       </div>
 
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 87650ac9eb..ac95e6391b 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -89,7 +89,7 @@
 
                 @if ($consumable->image!='')
                   <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-                    <a href="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" data-toggle="lightbox">
+                    <a href="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" data-toggle="lightbox" data-type="image">
                       <img src="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" class="img-responsive img-thumbnail" alt="{{ $consumable->name }}"></a>
                   </div>
                 @endif
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index f93c26cf8e..7157c6872e 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -168,7 +168,7 @@
                                 <div class="col-md-12 text-center">
                                     @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
                                         <div class="text-center col-md-12" style="padding-bottom: 15px;">
-                                            <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox">
+                                            <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox" data-type="image">
                                                 <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
                                             </a>
                                         </div>
@@ -180,7 +180,7 @@
 
                                 @if ($asset->deleted_at=='')
                                     @can('update', $asset)
-                                        <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                        <div class="col-md-12 hidden-print" style="padding-top: 5px;">s
                                             <a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
                                                 <x-icon type="edit" />
                                                 {{ trans('admin/hardware/general.edit') }}

From 37f14fff3b98ab23654706b2087eae2261e2931a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 22 Oct 2024 22:07:28 +0100
Subject: [PATCH 2/2] Fixed typo

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 7157c6872e..6a260cf254 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -180,7 +180,7 @@
 
                                 @if ($asset->deleted_at=='')
                                     @can('update', $asset)
-                                        <div class="col-md-12 hidden-print" style="padding-top: 5px;">s
+                                        <div class="col-md-12 hidden-print" style="padding-top: 5px;">
                                             <a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
                                                 <x-icon type="edit" />
                                                 {{ trans('admin/hardware/general.edit') }}