From 62b5a159a95652299a0dcdc6f70f27ba5180a6c4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Jul 2024 23:31:09 +0100
Subject: [PATCH 1/2] Added files column

Signed-off-by: snipe <snipe@snipe.net>
---
 .../views/users/confirm-bulk-delete.blade.php    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 7992c27eb3..4f7c1902ab 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -45,6 +45,7 @@
                     <th class="col-md-5">{{ trans('general.accessories') }}</th>
                     <th class="col-md-5">{{ trans('general.licenses') }}</th>
                     <th class="col-md-5">{{ trans('general.consumables') }}</th>
+                    <th class="col-md-5">{{ trans('general.files') }}</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -72,16 +73,19 @@
                       @endforeach
                     </td>
                     <td>
-                      {{ number_format($user->assets()->count())  }}
+                      {{ number_format($user->assets->count())  }}
                     </td>
                     <td>
-                      {{ number_format($user->accessories()->count())  }}
+                      {{ number_format($user->accessories->count())  }}
                     </td>
                     <td>
-                      {{ number_format($user->licenses()->count())  }}
+                      {{ number_format($user->licenses->count())  }}
                     </td>
                     <td>
-                      {{ number_format($user->consumables()->count())  }}
+                      {{ number_format($user->consumables->count())  }}
+                    </td>
+                    <td>
+                      {{ number_format($user->uploads->count())  }}
                     </td>
                   </tr>
                   @endforeach
@@ -89,13 +93,13 @@
                 <tfoot>
 
                   <tr>
-                    <td colspan="7">
+                    <td colspan="8">
                       {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
                       <label>{{ trans('admin/users/general.update_user_assets_status') }}</label>
                     </td>
                   </tr>
                   <tr>
-                    <td colspan="7" class="col-md-12 alert-danger">
+                    <td colspan="8" class="col-md-12 alert-danger">
                       <label class="form-control">
                         <input type="checkbox" name="delete_user" value="1">
                         <span><i class="fa fa-warning fa-2x"></i> {{ trans('general.bulk_soft_delete') }}</span>

From 708d7b5fc5f21c610e4c562070b77de6da78d5f3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Jul 2024 23:43:44 +0100
Subject: [PATCH 2/2] Use icons for consistency

Signed-off-by: snipe <snipe@snipe.net>
---
 .../views/users/confirm-bulk-delete.blade.php | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 4f7c1902ab..b20c904d99 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -39,13 +39,28 @@
                     <th class="col-md-1">
                       <!-- <input type="checkbox" id="checkAll"> -->
                       </th>
-                    <th class="col-md-6">{{ trans('general.name') }}</th>
-                    <th class="col-md-5">{{ trans('general.groups') }}</th>
-                    <th class="col-md-5">{{ trans('general.assets') }}</th>
-                    <th class="col-md-5">{{ trans('general.accessories') }}</th>
-                    <th class="col-md-5">{{ trans('general.licenses') }}</th>
-                    <th class="col-md-5">{{ trans('general.consumables') }}</th>
-                    <th class="col-md-5">{{ trans('general.files') }}</th>
+                    <th class="col-md-3">{{ trans('general.name') }}</th>
+                    <th class="col-md-3">{{ trans('general.groups') }}</th>
+                    <th class="text-right">
+                      <i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.assets') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="far fa-keyboard fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.accessories') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="far fa-save fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.licenses') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="fas fa-tint fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.consumables') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="fas fa-paperclip fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.files') }}</span>
+                    </th>
                   </tr>
                 </thead>
                 <tbody>
@@ -72,19 +87,19 @@
                       </a>&nbsp;
                       @endforeach
                     </td>
-                    <td>
+                    <td class="text-right">
                       {{ number_format($user->assets->count())  }}
                     </td>
-                    <td>
+                    <td class="text-right">
                       {{ number_format($user->accessories->count())  }}
                     </td>
-                    <td>
+                    <td class="text-right">
                       {{ number_format($user->licenses->count())  }}
                     </td>
-                    <td>
+                    <td class="text-right">
                       {{ number_format($user->consumables->count())  }}
                     </td>
-                    <td>
+                    <td class="text-right">
                       {{ number_format($user->uploads->count())  }}
                     </td>
                   </tr>