From f5122b01b11e04292259fcb56194e7f3b6603914 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 4 Apr 2023 15:51:04 -0400
Subject: [PATCH 01/16] Mock Up of the Buttons

---
 resources/views/hardware/view.blade.php | 70 +++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index e5fc43b613a6..584d70311b86 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -864,15 +864,74 @@
                             <div class="col-md-4">
 
                                 @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">
                                             <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
                                         </a>
                                     </div>
+                                @else
+                                    <!-- generic image goes here -->
                                 @endif
 
+                                    <!-- Start button column -->
+
+                                    @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
+                                        @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
+                                            @can('checkin', \App\Models\Asset::class)
+                                                <div class="col-md-12">
+                                                    <a href="{{ route('hardware.checkin.create', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                        {{ trans('admin/hardware/general.checkin') }}
+                                                    </a>
+                                                </div>
+                                            @endcan
+                                        @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
+                                            @can('checkout', \App\Models\Asset::class)
+                                                <div class="col-md-12" style="padding-top: 5px;">
+                                                    <a href="{{ route('hardware.checkout.create', $asset->id)  }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                        {{ trans('admin/hardware/general.checkout') }}
+                                                    </a>
+                                                </div>
+                                            @endcan
+                                        @endif
+                                    @endif
+
+
+                                    @can('update', $asset)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('hardware.edit', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('admin/hardware/general.edit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('create', $asset)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('clone/hardware', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('admin/hardware/general.clone') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('audit', \App\Models\Asset::class)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('asset.audit.create', $asset->id)  }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('general.audit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('delete', $asset)
+                                        @if ($asset->deleted_at=='')
+                                            <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
+                                                <form action="{{ route('delete/assetfile', [$asset->id,12]) }}" method="POST">
+                                                    {{csrf_field()}}
+                                                    {{ method_field("DELETE")}}
+                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
+                                                </form>
+                                            </div>
+                                        @endif
+                                    @endcan
+
                                 @if ($asset->deleted_at!='')
                                     <div class="text-center col-md-12" style="padding-bottom: 15px;">
                                         <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
@@ -887,11 +946,13 @@
                                 @endif
 
                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
+                                    <div style="text-align: center">
+                                        <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
                                         <p>
                                         @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->
-                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" alt="{{ $asset->assignedTo->present()->fullName() }}">
                                             @endif
+                                        </p>
                                             {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
                                         </p>
 
@@ -926,6 +987,7 @@
                                                 </li>
                                             @endif
                                         </ul>
+                                    </div>
 
                                 @endif
                             </div> <!-- div.col-md-4 -->

From cc88a361ca462104e9ea947d13d0b5cdb4311d6e Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 6 Apr 2023 15:01:01 -0400
Subject: [PATCH 02/16] commiting

---
 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 584d70311b86..866e8464b608 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -946,7 +946,7 @@
                                 @endif
 
                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <div style="text-align: center">
+                                    <div style="text-align: left">
                                         <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
                                         <p>
                                         @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->

From a65b8025b61a568b347ce82490a986c18276069e Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 11 Apr 2023 13:52:14 -0400
Subject: [PATCH 03/16] push for testing

---
 app/Http/Controllers/Assets/AssetsController.php | 2 +-
 resources/views/hardware/view.blade.php          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 3b2ff4623f0a..d6c4732d2973 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -767,7 +767,7 @@ public function sortByName(array $recordA, array $recordB): int
     }
 
     /**
-     * Retore a deleted asset.
+     * Restore a deleted asset.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 866e8464b608..60fd2cab9797 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -873,7 +873,7 @@
                                     <!-- generic image goes here -->
                                 @endif
 
-                                    <!-- Start button column -->
+                                    <!-- Start side button column -->
 
                                     @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
                                         @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
@@ -923,10 +923,10 @@
                                     @can('delete', $asset)
                                         @if ($asset->deleted_at=='')
                                             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                                <form action="{{ route('delete/assetfile', [$asset->id,12]) }}" method="POST">
+                                                <form action="{{ route('delete/assetfile', [$asset->id,$fileId->id]) }}" method="POST">
                                                     {{csrf_field()}}
                                                     {{ method_field("DELETE")}}
-                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
+                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print" >{{ trans('button.delete')}}</button>
                                                 </form>
                                             </div>
                                         @endif

From af549a0be9430ae141270c72f62bad4310c18183 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 4 Apr 2023 15:51:04 -0400
Subject: [PATCH 04/16] Mock Up of the Buttons

---
 resources/views/hardware/view.blade.php | 70 +++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index ccd3f865363f..89bd1ad7c318 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -864,15 +864,74 @@
                             <div class="col-md-4">
 
                                 @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">
                                             <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
                                         </a>
                                     </div>
+                                @else
+                                    <!-- generic image goes here -->
                                 @endif
 
+                                    <!-- Start button column -->
+
+                                    @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
+                                        @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
+                                            @can('checkin', \App\Models\Asset::class)
+                                                <div class="col-md-12">
+                                                    <a href="{{ route('hardware.checkin.create', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                        {{ trans('admin/hardware/general.checkin') }}
+                                                    </a>
+                                                </div>
+                                            @endcan
+                                        @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
+                                            @can('checkout', \App\Models\Asset::class)
+                                                <div class="col-md-12" style="padding-top: 5px;">
+                                                    <a href="{{ route('hardware.checkout.create', $asset->id)  }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                        {{ trans('admin/hardware/general.checkout') }}
+                                                    </a>
+                                                </div>
+                                            @endcan
+                                        @endif
+                                    @endif
+
+
+                                    @can('update', $asset)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('hardware.edit', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('admin/hardware/general.edit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('create', $asset)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('clone/hardware', $asset->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('admin/hardware/general.clone') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('audit', \App\Models\Asset::class)
+                                        <div class="col-md-12" style="padding-top: 5px;">
+                                            <a href="{{ route('asset.audit.create', $asset->id)  }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                                                {{ trans('general.audit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+                                    @can('delete', $asset)
+                                        @if ($asset->deleted_at=='')
+                                            <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
+                                                <form action="{{ route('delete/assetfile', [$asset->id,12]) }}" method="POST">
+                                                    {{csrf_field()}}
+                                                    {{ method_field("DELETE")}}
+                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
+                                                </form>
+                                            </div>
+                                        @endif
+                                    @endcan
+
                                 @if ($asset->deleted_at!='')
                                     <div class="text-center col-md-12" style="padding-bottom: 15px;">
                                         <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
@@ -887,11 +946,13 @@
                                 @endif
 
                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
+                                    <div style="text-align: center">
+                                        <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
                                         <p>
                                         @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->
-                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" alt="{{ $asset->assignedTo->present()->fullName() }}">
                                             @endif
+                                        </p>
                                             {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
                                         </p>
 
@@ -926,6 +987,7 @@
                                                 </li>
                                             @endif
                                         </ul>
+                                    </div>
 
                                 @endif
                             </div> <!-- div.col-md-4 -->

From aabcf22b40756c2cd0e2bc81d5e7c28326432722 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 6 Apr 2023 15:01:01 -0400
Subject: [PATCH 05/16] commiting

---
 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 89bd1ad7c318..34045945af99 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -946,7 +946,7 @@
                                 @endif
 
                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <div style="text-align: center">
+                                    <div style="text-align: left">
                                         <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
                                         <p>
                                         @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->

From d94bed3f57136f82f140d33ac9b096e64a139214 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 11 Apr 2023 13:52:14 -0400
Subject: [PATCH 06/16] push for testing

---
 app/Http/Controllers/Assets/AssetsController.php | 2 +-
 resources/views/hardware/view.blade.php          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 2a938455072d..fe540f56cbe0 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -767,7 +767,7 @@ public function sortByName(array $recordA, array $recordB): int
     }
 
     /**
-     * Retore a deleted asset.
+     * Restore a deleted asset.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 34045945af99..86783fc4c479 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -873,7 +873,7 @@
                                     <!-- generic image goes here -->
                                 @endif
 
-                                    <!-- Start button column -->
+                                    <!-- Start side button column -->
 
                                     @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
                                         @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
@@ -923,10 +923,10 @@
                                     @can('delete', $asset)
                                         @if ($asset->deleted_at=='')
                                             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                                <form action="{{ route('delete/assetfile', [$asset->id,12]) }}" method="POST">
+                                                <form action="{{ route('delete/assetfile', [$asset->id,$fileId->id]) }}" method="POST">
                                                     {{csrf_field()}}
                                                     {{ method_field("DELETE")}}
-                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
+                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print" >{{ trans('button.delete')}}</button>
                                                 </form>
                                             </div>
                                         @endif

From b1e68be54528dc74320bfb1e454d3985aaa2428e Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 12 Apr 2023 18:33:44 -0400
Subject: [PATCH 07/16] delete button progress

---
 resources/lang/en/admin/hardware/general.php |  1 +
 resources/views/hardware/view.blade.php      | 65 +-------------------
 routes/web/hardware.php                      |  6 +-
 3 files changed, 6 insertions(+), 66 deletions(-)

diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php
index b0a48f2ce458..bf1ec4283c50 100644
--- a/resources/lang/en/admin/hardware/general.php
+++ b/resources/lang/en/admin/hardware/general.php
@@ -12,6 +12,7 @@
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
     'deleted'  					=> 'This asset has been deleted.',
+    'delete_confirm'            => 'Are you sure you want to delete this asset?',
     'edit'  					=> 'Edit Asset',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'model_invalid'             => 'The Model of this Asset is invalid.',
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 86783fc4c479..a7d05998f7da 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -6,67 +6,6 @@
     @parent
 @stop
 
-{{-- Right header --}}
-@section('header_right')
-
-
-    @can('manage', \App\Models\Asset::class)
-        @if ($asset->deleted_at=='')
-        <div class="dropdown pull-right">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
-                <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu pull-right" role="menu">
-                
-                @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
-                    @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
-                        @can('checkin', \App\Models\Asset::class)
-                            <li role="menuitem">
-                                <a href="{{ route('hardware.checkin.create', $asset->id) }}">
-                                    {{ trans('admin/hardware/general.checkin') }}
-                                </a>
-                            </li>
-                        @endcan
-                    @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
-                        @can('checkout', \App\Models\Asset::class)
-                            <li role="menuitem">
-                                <a href="{{ route('hardware.checkout.create', $asset->id)  }}">
-                                    {{ trans('admin/hardware/general.checkout') }}
-                                </a>
-                            </li>
-                        @endcan
-                    @endif
-                @endif
-
-                @can('update', \App\Models\Asset::class)
-                    <li role="menuitem">
-                        <a href="{{ route('hardware.edit', $asset->id) }}">
-                            {{ trans('admin/hardware/general.edit') }}
-                        </a>
-                    </li>
-                @endcan
-
-                @can('create', \App\Models\Asset::class)
-                    <li role="menuitem">
-                        <a href="{{ route('clone/hardware', $asset->id) }}">
-                            {{ trans('admin/hardware/general.clone') }}
-                        </a>
-                    </li>
-                @endcan
-
-                @can('audit', \App\Models\Asset::class)
-                    <li role="menuitem">
-                        <a href="{{ route('asset.audit.create', $asset->id)  }}">
-                            {{ trans('general.audit') }}
-                        </a>
-                    </li>
-                @endcan
-            </ul>
-        </div>
-        @endif
-    @endcan
-@stop
-
 {{-- Page content --}}
 @section('content')
 
@@ -923,10 +862,10 @@
                                     @can('delete', $asset)
                                         @if ($asset->deleted_at=='')
                                             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                                <form action="{{ route('delete/assetfile', [$asset->id,$fileId->id]) }}" method="POST">
+                                                <form action="{{ route('hardware/delete', ['assetId' => $asset->id]) }}" method="POST" onsubmit="return confirm( {{trans('general/message.delete_confirm')}} )">
                                                     {{csrf_field()}}
                                                     {{ method_field("DELETE")}}
-                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print" >{{ trans('button.delete')}}</button>
+                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
                                                 </form>
                                             </div>
                                         @endif
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 690d8e0d1cb5..765cf9afc7fa 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -146,9 +146,9 @@ function () {
             [AssetFilesController::class, 'show']
         )->name('show/assetfile');
 
-        Route::delete('{assetId}/showfile/{fileId}/delete',
-            [AssetFilesController::class, 'destroy']
-        )->name('delete/assetfile');
+        Route::delete('{assetId}/delete',
+            [AssetsController::class, 'destroy']
+        )->name('hardware/delete');
 
         Route::post(
             'bulkedit',

From 84134b45e6c445601abbf0bd18ef156c3f02b64d Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 26 Apr 2023 17:03:07 -0400
Subject: [PATCH 08/16] form work

---
 resources/views/hardware/view.blade.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index a7d05998f7da..90b5fc80876b 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -862,17 +862,18 @@
                                     @can('delete', $asset)
                                         @if ($asset->deleted_at=='')
                                             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                                <form action="{{ route('hardware/delete', ['assetId' => $asset->id]) }}" method="POST" onsubmit="return confirm( {{trans('general/message.delete_confirm')}} )">
-                                                    {{csrf_field()}}
-                                                    {{ method_field("DELETE")}}
+                                                <form href="{{ route('hardware/delete', ['assetId' => $asset->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $asset->id]) }}" method="POST" data-title="{{ trans('general.delete') }}">
+                                                    {{ csrf_field() }}
+                                                    {{ method_field("DELETE") }}
                                                     <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
+                                                    <span class="sr-only">{{ trans('general.delete') }}</span>
                                                 </form>
                                             </div>
                                         @endif
                                     @endcan
 
                                 @if ($asset->deleted_at!='')
-                                    <div class="text-center col-md-12" style="padding-bottom: 15px;">
+                                    <div class="text-center col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
                                         <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
                                         @csrf 
                                         <button class="btn btn-danger col-md-12">{{ trans('general.restore') }}</button>

From d3675831bb1ed8e0287de4264423c55cbacc0ed8 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 27 Apr 2023 18:58:55 -0400
Subject: [PATCH 09/16] snippet rewrite

---
 resources/views/hardware/view.blade.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 90b5fc80876b..9277a0d79777 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -862,12 +862,8 @@
                                     @can('delete', $asset)
                                         @if ($asset->deleted_at=='')
                                             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                                <form href="{{ route('hardware/delete', ['assetId' => $asset->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $asset->id]) }}" method="POST" data-title="{{ trans('general.delete') }}">
-                                                    {{ csrf_field() }}
-                                                    {{ method_field("DELETE") }}
-                                                    <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
-                                                    <span class="sr-only">{{ trans('general.delete') }}</span>
-                                                </form>
+                                                <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }} </button>
+                                                <span class="sr-only">{{ trans('general.delete') }}</span>
                                             </div>
                                         @endif
                                     @endcan

From cd389368f72ae674a7458bd2ff99c8a89ffd2da8 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 27 Apr 2023 19:00:17 -0400
Subject: [PATCH 10/16] adding in script

---
 resources/views/hardware/view.blade.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 9277a0d79777..2dd8ecb95795 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1376,6 +1376,16 @@ class="table table-striped snipe-table"
 @stop
 
 @section('moar_scripts')
+    <script>
+
+        $('#dataConfirmModal').on('show.bs.modal', function (event) {
+            var content = $(event.relatedTarget).data('content');
+            var title = $(event.relatedTarget).data('title');
+            $(this).find(".modal-body").text(content);
+            $(this).find(".modal-header").text(title);
+        });
+
+    </script>
     @include ('partials.bootstrap-table')
 
 @stop

From ad7a1d6c3bd4e103d88769e1c44558e395a0a4ee Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 1 May 2023 15:50:48 -0400
Subject: [PATCH 11/16] edits from Github comments

---
 resources/lang/en/general.php           | 3 +--
 resources/views/hardware/view.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 328eb3209019..0abc3b0dc089 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -91,7 +91,6 @@
     'debug_warning'         => 'Warning!',
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
-    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -263,7 +262,7 @@
     'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
-    'sure_to_delete'    => 'Are you sure you wish to delete',
+    'sure_to_delete'    => 'Are you sure you wish to delete :item?',
     'submit'				=> 'Submit',
     'target'                => 'Target',
     'time_and_date_display' => 'Time and Date Display',
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 2dd8ecb95795..9a58b163b0da 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -862,7 +862,7 @@
                                     @can('delete', $asset)
                                         @if ($asset->deleted_at=='')
                                             <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                                <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }} </button>
+                                                <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }} </button>
                                                 <span class="sr-only">{{ trans('general.delete') }}</span>
                                             </div>
                                         @endif
@@ -886,7 +886,7 @@
                                         <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
                                         <p>
                                         @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->
-                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
                                             @endif
                                         </p>
                                             {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}

From 2cb1545b8358df1ecb7219a570a579f7fd224285 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 1 May 2023 19:51:52 -0400
Subject: [PATCH 12/16] removing route

---
 routes/web/hardware.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 765cf9afc7fa..7bd9c19c67e6 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -146,10 +146,6 @@ function () {
             [AssetFilesController::class, 'show']
         )->name('show/assetfile');
 
-        Route::delete('{assetId}/delete',
-            [AssetsController::class, 'destroy']
-        )->name('hardware/delete');
-
         Route::post(
             'bulkedit',
             [BulkAssetsController::class, 'edit']

From 889be83762528169599da2e3a48cf600267a8059 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 3 May 2023 14:14:18 -0400
Subject: [PATCH 13/16] replacing route. sorry!

---
 routes/web/hardware.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 7bd9c19c67e6..690d8e0d1cb5 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -146,6 +146,10 @@ function () {
             [AssetFilesController::class, 'show']
         )->name('show/assetfile');
 
+        Route::delete('{assetId}/showfile/{fileId}/delete',
+            [AssetFilesController::class, 'destroy']
+        )->name('delete/assetfile');
+
         Route::post(
             'bulkedit',
             [BulkAssetsController::class, 'edit']

From 1916594d274cff13a858d0f0c97c30d0a3f9f2fc Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 10 May 2023 19:16:11 -0400
Subject: [PATCH 14/16] fixing translation

---
 resources/lang/en/general.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 0abc3b0dc089..4874158bc956 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -262,7 +262,7 @@
     'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
-    'sure_to_delete'    => 'Are you sure you wish to delete :item?',
+    'sure_to_delete'        => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
     'time_and_date_display' => 'Time and Date Display',

From b082d27c420653c1218819eafb980babd79f2d5a Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 24 Jul 2023 17:12:12 -0400
Subject: [PATCH 15/16] removing :item

---
 resources/lang/en/general.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 674dec6e470f..765fc98d44ee 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -264,7 +264,7 @@
     'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
-    'sure_to_delete'        => 'Are you sure you wish to delete',
+    'sure_to_delete'        => 'Are you sure you wish to delete?',
     'submit'				=> 'Submit',
     'target'                => 'Target',
     'time_and_date_display' => 'Time and Date Display',

From e289e95721fff0a012c141f370fcca49662b8d0f Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 24 Jul 2023 17:22:10 -0400
Subject: [PATCH 16/16] no ? needed

---
 resources/lang/en/general.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 765fc98d44ee..674dec6e470f 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -264,7 +264,7 @@
     'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
-    'sure_to_delete'        => 'Are you sure you wish to delete?',
+    'sure_to_delete'        => 'Are you sure you wish to delete',
     'submit'				=> 'Submit',
     'target'                => 'Target',
     'time_and_date_display' => 'Time and Date Display',