From b0ab900a0ffca68dca3e54ceee095fa4b5860284 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:10:09 +0000
Subject: [PATCH 1/9] Fixed new dark mode for bulk model edit

---
 resources/views/layouts/default.blade.php  |  3 +-
 resources/views/models/bulk-edit.blade.php | 37 +++++++++-------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 3c362e5785..4326160b6f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -84,6 +84,7 @@
             --link-hover:  hsl(from var(--link-color) h s calc(l - 10));
             --main-theme-hover: hsl(from var(--main-theme-color) h s calc(l - 10));
             --tab-bottom-border: 1px solid var(--box-header-top-border-color);
+            --table-border-row: 1px solid #ecf0f5;
             --table-border-row-top: 1px solid #ecf0f5;
             --table-stripe-bg-alt: rgba(211, 211, 211, 0.25);
             --table-stripe-bg: #ffffff;
@@ -437,7 +438,7 @@
         .table > tbody > tr > td,
         .table > tfoot > tr > td
         {
-            border-top: var(--table-border-row);
+            border-top: var(--table-border-row) !important;
         }
 
 
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 806d587490..a64ddbcb02 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -30,21 +30,20 @@
 
 
                         <table class="table">
-                            <tbody>
-                        @foreach ($models as $model)
+                            @foreach ($models as $model)
 
-                            <tr{!!  (($model->assets_count > 0 ) ? ' class="warning"' : ' class="success"') !!}>
-                                    <td>
-                                        <i class="fa {!!  (($model->assets_count > 0 ) ? 'fa-warning info' : 'fa-check success') !!}"></i>
-                                        {{ $model->display_name }}
+                                <tr>
+                                        <td>
+                                            <i class="fa {!!  (($model->assets_count > 0 ) ? 'fa-warning text-warning' : 'fa-check success') !!}"></i>
+                                            {{ $model->display_name }}
 
-                                            @if ($model->model_number)
-                                                ({{ $model->model_number }})
-                                            @endif
+                                                @if ($model->model_number)
+                                                    ({{ $model->model_number }})
+                                                @endif
+                                            </td>
+                                            <td>{{ $model->assets_count }} assets
                                         </td>
-                                        <td>{{ $model->assets_count }} assets
-                                    </td>
-                            </tr>
+                                </tr>
 
                         @endforeach
                         </table>
@@ -100,15 +99,9 @@
                                 <div class="col-md-9">
                                     <div class="form-inline" style="display: flex; align-items: center; gap: 8px;">
                                         <input type="checkbox" name="require_serial" value="1" id="require_serial" aria-label="require_serial" />
-                                        <a
-                                                href="#"
-                                                data-tooltip="true"
-                                                title="{{ trans('admin/hardware/general.require_serial_help') }}"
-                                                style="display: inline-flex; align-items: center;"
-                                        >
-                                            <x-icon type="info-circle" />
-                                            <span class="sr-only">{{ trans('admin/hardware/general.require_serial_help') }}</span>
-                                        </a>
+                                        <x-form-tooltip>
+                                            {{ trans('admin/hardware/general.require_serial_help') }}
+                                        </x-form-tooltip>
                                     </div>
                                 </div>
                             </div>
@@ -142,7 +135,7 @@
 
                     <div class="box-footer text-right">
                         <a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.update') }}</button>
+                        <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div><!-- /.box-footer -->
                 </div> <!--/.box.box-default-->
             </form>

From 7d5f862f347e19f5a85c60476401a391cbb3b9c7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:13:17 +0000
Subject: [PATCH 2/9] Use striped mode

---
 resources/views/layouts/default.blade.php  | 34 +++++++++++-----------
 resources/views/models/bulk-edit.blade.php |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 4326160b6f..aedb44c45e 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -43,25 +43,25 @@
 
         :root {
             color-scheme: light dark;
-            --main-theme-color: {{ $snipeSettings->header_color ?? '#5fa4cc' }};
-            --btn-theme-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l + 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
             --btn-theme-hover-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
             --btn-theme-hover: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
+            --btn-theme-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l + 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
+            --color-fg: light-dark(#373636, #ffffff);
+            --main-footer-bg-color: light-dark(#ffffff,#3d4144);
+            --main-footer-text-color: light-dark(#605e5e, #d2d6de);
+            --main-footer-top-border-color: light-dark(#d2d6de,#605e5e);
+            --main-theme-color: {{ $snipeSettings->header_color ?? '#5fa4cc' }};
+            --nav-hover-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
+            --nav-primary-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
+            --search-highlight: #e9d15b;
+            --sidenav-hover-color-bg: #4c4b4b;
             --sidenav-text-hover-color: #fff;
             --sidenav-text-nohover-color: #b8c7ce;
-            --sidenav-hover-color-bg: #4c4b4b;
-            --search-highlight: #e9d15b;
-            --color-fg: light-dark(#373636, #ffffff);
             --text-danger: light-dark(#a94442,#dd4b39);
+            --text-help: light-dark(#605e5e,#a6a4a4);
+            --text-info: light-dark(#31708f,#2baae6);
             --text-success: light-dark(#039516,#4ced61);
             --text-warning: light-dark(#da9113,#f3a51f);
-            --text-info: light-dark(#31708f,#2baae6);
-            --text-help: light-dark(#605e5e,#a6a4a4);
-            --nav-primary-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
-            --nav-hover-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};
-            --main-footer-bg-color: light-dark(#ffffff,#3d4144);
-            --main-footer-top-border-color: light-dark(#d2d6de,#605e5e);
-            --main-footer-text-color: light-dark(#605e5e, #d2d6de);
 
         }
 
@@ -80,18 +80,18 @@
             --callout-left-border: var(--box-header-top-border-color);
             --color-bg: #ecf0f5;
             --header-color: #000000;
+            --input-group-bg: hsl(from var(--box-bg) h s calc(l - 5));
+            --input-group-fg: hsl(from var(--input-group-bg) h s calc(l - 50));
             --link-color: {{ $link_light_color ?? '#296282' }};
             --link-hover:  hsl(from var(--link-color) h s calc(l - 10));
             --main-theme-hover: hsl(from var(--main-theme-color) h s calc(l - 10));
             --tab-bottom-border: 1px solid var(--box-header-top-border-color);
-            --table-border-row: 1px solid #ecf0f5;
             --table-border-row-top: 1px solid #ecf0f5;
+            --table-border-row: 1px solid #ecf0f5;
             --table-stripe-bg-alt: rgba(211, 211, 211, 0.25);
             --table-stripe-bg: #ffffff;
             --text-legend-help: var(--text-help);
             --text-warning: #da9113;
-            --input-group-bg: hsl(from var(--box-bg) h s calc(l - 5));
-            --input-group-fg: hsl(from var(--input-group-bg) h s calc(l - 50));
 
         }
 
@@ -110,6 +110,8 @@
             --callout-left-border: #323131;
             --color-bg: #222222;
             --header-color: #ffffff;
+            --input-group-bg: hsl(from var(--box-bg) h s calc(l + 10));
+            --input-group-fg: hsl(from var(--input-group-bg) h s calc(l + 50));
             --link-color: {{ $link_dark_color ?? '#5fa4cc' }};
             --link-hover:  hsl(from var(--link-color) h s calc(l + 15));
             --main-theme-hover: hsl(from var(--main-theme-color) h s calc(l - 10));
@@ -118,8 +120,6 @@
             --table-stripe-bg-alt: #323131;
             --table-stripe-bg: #494747;
             --text-legend-help: #d6d6d6;
-            --input-group-bg: hsl(from var(--box-bg) h s calc(l + 10));
-            --input-group-fg: hsl(from var(--input-group-bg) h s calc(l + 50));
 
         }
 
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index a64ddbcb02..1ddff52116 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -29,7 +29,7 @@
                         </div>
 
 
-                        <table class="table">
+                        <table class="table table-striped">
                             @foreach ($models as $model)
 
                                 <tr>

From 793d299c1d45e275c8a60a540de4a123288d8780 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:31:01 +0000
Subject: [PATCH 3/9] Fixed breadcrumbs

---
 routes/web/hardware.php | 7 +++++--
 routes/web/models.php   | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 71f38b4946..fcfcd75386 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -143,12 +143,15 @@ Route::group(
         Route::post(
             'bulkedit',
             [BulkAssetsController::class, 'edit']
-        )->name('hardware/bulkedit');
+        )->name('hardware.bulkedit.show')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('hardware.index')
+            ->push(trans('general.bulk_edit'), route('hardware.index')));
 
         Route::post(
             'bulkdelete',
             [BulkAssetsController::class, 'destroy']
-        )->name('hardware/bulkdelete');
+        )->name('hardware.bulkdelete.store');
 
         Route::post(
             'bulkrestore',
diff --git a/routes/web/models.php b/routes/web/models.php
index f8a962fb5e..1b70713bff 100644
--- a/routes/web/models.php
+++ b/routes/web/models.php
@@ -59,7 +59,10 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
             BulkAssetModelsController::class, 
             'edit'
         ]
-    )->name('models.bulkedit.index');
+    )->name('models.bulkedit.index')
+    ->breadcrumbs(fn (Trail $trail) =>
+    $trail->parent('models.index')
+        ->push(trans('general.bulk_edit'), route('models.index')));
 
     Route::post(
         'bulksave',

From 05ff9183fbca27d22d4a8fc4becf6a104dbaf1b4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:31:47 +0000
Subject: [PATCH 4/9] Fixed weird top border

---
 resources/views/layouts/default.blade.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index aedb44c45e..91944d9513 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -801,6 +801,10 @@
             color: var(--color-fg) !important;
         }
 
+        .table > tbody + tbody {
+            border-top: 0px !important;
+        }
+
     </style>
 
     {{-- Custom CSS --}}

From a29a11584627f7e047c178b9303bbb068c6a4494 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:36:59 +0000
Subject: [PATCH 5/9] Nicer layout on asset bulk delete form

---
 .../views/hardware/bulk-delete.blade.php      | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index 85185bdc09..aab3deab8e 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -6,10 +6,6 @@
 @parent
 @stop
 
-@section('header_right')
-<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
-  {{ trans('general.back') }}</a>
-@stop
 
 {{-- Page content --}}
 @section('content')
@@ -17,16 +13,19 @@
   <!-- left column -->
   <div class="col-md-12">
     <p>{{ trans('admin/hardware/form.bulk_delete_help') }}</p>
-    <form class="form-horizontal" method="post" action="{{ route('hardware/bulkdelete') }}" autocomplete="off" role="form">
+    <form class="form-horizontal" method="post" action="{{ route('hardware.bulkdelete.store') }}" autocomplete="off" role="form">
       {{csrf_field()}}
       <div class="box box-default">
-        <div class="box-header with-border">
-          <h2 class="box-title" style="color: red">{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}</h2>
-        </div>
 
         <div class="box-body">
-          <table class="table table-striped table-condensed">
-            <thead>
+
+            <div class="callout callout-warning">
+                <i class="fas fa-exclamation-triangle"></i>
+                {{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}
+            </div>
+
+          <table class="table table-striped">
+
               <tr>
                 <th></th>
                 <th>{{ trans('admin/hardware/table.id') }}</th>
@@ -34,7 +33,7 @@
                 <th>{{ trans('admin/hardware/table.location')}}</th>
                 <th>{{ trans('admin/hardware/table.assigned_to') }}</th>
               </tr>
-            </thead>
+
             <tbody>
               @foreach ($assets as $asset)
               <tr>
@@ -60,7 +59,7 @@
         </div><!-- /.box-body -->
 
         <div class="box-footer text-right">
-          <a class="btn btn-link" href="{{ URL::previous() }}">
+          <a class="btn btn-link pull-left" href="{{ URL::previous() }}">
             {{ trans('button.cancel') }}
           </a>
           <button type="submit" class="btn btn-success" id="submit-button">

From a283fdb75a52f5ba9f40087599fb98842e489276 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:37:10 +0000
Subject: [PATCH 6/9] Removed back button

---
 resources/views/models/bulk-edit.blade.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 1ddff52116..b6cb40d6d6 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -2,16 +2,11 @@
 
 {{-- Page title --}}
 @section('title')
-    Bulk Edit
+    {{ trans('general.bluk_edit') }}
     @parent
 @stop
 
 
-@section('header_right')
-    <a href="{{ URL::previous() }}" class="btn btn-sm btn-theme pull-right">
-        {{ trans('general.back') }}</a>
-@stop
-
 {{-- Page content --}}
 @section('content')
     <div class="row">

From 20eab1f403c4d400953e07c22376e5746aff995d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:37:22 +0000
Subject: [PATCH 7/9] Fixed updated route names

---
 resources/views/hardware/view.blade.php               |  2 +-
 resources/views/partials/asset-bulk-actions.blade.php |  2 +-
 tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 702bfb2420..f4ea7a6bef 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -290,7 +290,7 @@
                                 <div class="col-md-12 hidden-print" style="padding-top: 5px;">
                                     <form
                                         method="POST"
-                                        action="{{ route('hardware/bulkedit') }}"
+                                        action="{{ route('hardware.bulkdelete.store') }}"
                                         accept-charset="UTF-8"
                                         class="form-inline"
                                         target="_blank"
diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index e0ae15258e..57cc37d29c 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -1,7 +1,7 @@
 <div id="{{ (isset($id_divname)) ? $id_divname : 'assetsBulkEditToolbar' }}" style="min-width:400px">
     <form
     method="POST"
-    action="{{ route('hardware/bulkedit') }}"
+    action="{{ route('hardware.bulkedit.show') }}"
     accept-charset="UTF-8"
     class="form-inline"
     id="{{ (isset($id_formname)) ? $id_formname : 'assetsBulkForm' }}"
diff --git a/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php b/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php
index 738f170dbd..59906cf4aa 100644
--- a/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php
+++ b/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php
@@ -76,7 +76,7 @@ class BulkDeleteAssetsTest extends TestCase
         $id_array = $assets->pluck('id')->toArray();
 
         $response = $this->actingAs($user)
-            ->from(route('hardware/bulkedit'))
+            ->from(route('hardware.bulkdelete.store'))
             ->post('/hardware/bulkdelete', [
             'ids'          => $id_array,
             'bulk_actions' => 'delete',
@@ -109,7 +109,7 @@ class BulkDeleteAssetsTest extends TestCase
         $this->assertTrue($test_ran, "Test never actually ran!");
 
         $response = $this->actingAs($user)
-            ->from(route('hardware/bulkedit'))
+            ->from(route('hardware.bulkdelete.store'))
             ->post(route('hardware/bulkrestore'), [
                 'ids'          => [$asset->id],
             ])->assertStatus(302);
@@ -132,7 +132,7 @@ class BulkDeleteAssetsTest extends TestCase
         $asset = Asset::factory()->create();
 
         $this->actingAs($user)
-            ->from(route('hardware/bulkedit'))
+            ->from(route('hardware.bulkdelete.store'))
             ->post('/hardware/bulkdelete', [
                 'ids'          => [$asset->id],
                 'bulk_actions' => 'delete',
@@ -159,7 +159,7 @@ class BulkDeleteAssetsTest extends TestCase
         $asset = Asset::factory()->deleted()->create();
 
         $this->actingAs($user)
-            ->from(route('hardware/bulkedit'))
+            ->from(route('hardware.bulkdelete.store'))
             ->post(route('hardware/bulkrestore'), [
                 'ids'          => [$asset->id],
                 'bulk_actions' => 'restore',
@@ -186,7 +186,7 @@ class BulkDeleteAssetsTest extends TestCase
         ]);
 
         $response = $this->actingAs($user)
-                ->from(route('hardware/bulkedit'))
+                ->from(route('hardware.bulkdelete.store'))
                 ->post('/hardware/bulkdelete', [
                     'ids'          => [$asset->id],
                     'bulk_actions' => 'delete',

From b33f222fc0329fc89d25bf4d4bc238762b327ed7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:39:00 +0000
Subject: [PATCH 8/9] Smaller bulk delete form

---
 resources/views/hardware/bulk-delete.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index aab3deab8e..9f9c7a159c 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -11,7 +11,7 @@
 @section('content')
 <div class="row">
   <!-- left column -->
-  <div class="col-md-12">
+  <div class="col-md-8 col-md-offset-2">
     <p>{{ trans('admin/hardware/form.bulk_delete_help') }}</p>
     <form class="form-horizontal" method="post" action="{{ route('hardware.bulkdelete.store') }}" autocomplete="off" role="form">
       {{csrf_field()}}

From 47e192b5300aa6922c235d40b35b72fe88405994 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 7 Dec 2025 14:43:47 +0000
Subject: [PATCH 9/9] Fixed breadcrumb title

---
 resources/views/hardware/bulk-delete.blade.php | 2 +-
 routes/web/hardware.php                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index 9f9c7a159c..c657877744 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-{{ trans('admin/hardware/form.bulk_delete') }}
+{{ trans('general.bulk_delete') }}
 @parent
 @stop
 
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index fcfcd75386..e10ed58268 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -146,7 +146,7 @@ Route::group(
         )->name('hardware.bulkedit.show')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('hardware.index')
-            ->push(trans('general.bulk_edit'), route('hardware.index')));
+            ->push(trans('general.bulk_delete'), route('hardware.index')));
 
         Route::post(
             'bulkdelete',