From 85e717bc4e920bc5e3a7110d5d58193cb18d06e6 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 28 Jun 2023 10:38:44 -0600
Subject: [PATCH] Fix cancel button style and translate title

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

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 28f9fd82ba..e8affbf945 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -436,6 +436,7 @@ return [
     'errors_importing'          => 'Some Errors occurred while importing: ',
     'warning'                   => 'WARNING: :warning',
     'success_redirecting'       => '"Success... Redirecting.',
+    'cancel_request'            => 'Cancel this item request',
     'setup_successful_migrations' => 'Your database tables have been created',
     'setup_migration_output' => 'Migration output:',
     'setup_migration_create_user' => 'Next: Create User',
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index 25502b42c3..61e3b87c3f 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -24,7 +24,7 @@
                        'id' => 'bulkForm']) }}
                     <div class="row">
                         <div class="col-md-12">
-                    {{ Form::close() }}
+
         @if ($requestedItems->count() > 0)
         <div class="table-responsive">
             <table
@@ -108,7 +108,7 @@
                                     'method' => 'POST',
                                     'route' => ['account/request-item', $request->itemType(), $request->requestable->id, true, $request->requestingUser()->id],
                                     ]) }}
-                                    <button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>
+                                    <button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
                                 {{ Form::close() }}
                             </td>
                             <td>
@@ -143,6 +143,7 @@
                 </div>
             </div>
         </div>
+        {{ Form::close() }}
     </div> <!-- .col-md-12> -->
 </div> <!-- .row -->
 @stop