From ea4a37d8ef67537871a94454f4eb72921824dc2b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 18 Mar 2023 00:14:09 -0700
Subject: [PATCH 1/3] Fixed cancel button alignment

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

diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 663602bd3..5393b9b81 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -106,8 +106,10 @@
           </div><!--/col-md-12-->
         </div> <!--/box-body-->
         <div class="box-footer text-right">
-          <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-          <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
+          <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+
+          <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled="disabled"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
+
         </div><!-- /.box-footer -->
       </form>
     </div>

From e39a75f2cc807a46719c67cf22b45bb1ab7310ba Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 18 Mar 2023 00:14:57 -0700
Subject: [PATCH 2/3] Fixed min width on select2 bulk menus

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/asset-bulk-actions.blade.php | 2 +-
 resources/views/partials/users-bulk-actions.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index e7f836829..6a94ad487 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -12,7 +12,7 @@
             {{ trans('button.bulk_actions') }}
         </span>
     </label>
-    <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions">
+    <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="min-width: 350px;">
         @can('update', \App\Models\Asset::class)
             <option value="edit">{{ trans('button.edit') }}</option>
         @endcan
diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
index 381f18391..cf22fde03 100644
--- a/resources/views/partials/users-bulk-actions.blade.php
+++ b/resources/views/partials/users-bulk-actions.blade.php
@@ -9,7 +9,7 @@
     @can('delete', \App\Models\User::class)
         <div id="users-toolbar">
             <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
-            <select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions">
+            <select name="bulk_actions" class="form-control select2" style="min-width:300px;" aria-label="bulk_actions">
                 <option value="edit">{{ trans('general.bulk_edit') }}</option>
                 <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
                 <option value="merge">{!! trans('general.merge_users') !!}</option>

From 071a642509b2016429899b5c37b75f3e094752c7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 18 Mar 2023 00:15:28 -0700
Subject: [PATCH 3/3] Changed phrasing in translatons

Signed-off-by: snipe <snipe@snipe.net>
---
 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 159c1abad..8b6063f42 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -45,7 +45,7 @@ return [
     'bulk_edit'             => 'Bulk Edit',
     'bulk_delete'           => 'Bulk Delete',
     'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin Items from Users',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
     'byod_help'             => 'This device is owned by the user',
     'bystatus'              => 'by Status',