From bf900f015d0cd7d926ed92ef7d05130d2ce9bccd Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Thu, 20 Feb 2025 16:20:21 +0000
Subject: [PATCH] Bug 39179: CSS and layout adjustments:

The layout is now vertical, fieldsets should be shown vertically, not horizontally.
Border inside the modal no longer exists.
Footer has been readjusted to match other modal footers in Koha, both buttons on aligned to the right, where first button is accept and 2nd button is cancel.
'Process identifiers' button style has been updated.

Sponsored-by: UKHSA - UK Health Security Agency
Signed-off-by: Jeremy Evans <Jeremy.Evans@ukhsa.gov.uk>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/css/src/staff-global.scss            | 25 -------------------
 .../prog/en/includes/ill-batch-modal.inc      | 14 ++++-------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 3aae3be904..5798abfd15 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -3713,18 +3713,6 @@ input.renew {
     }
 
     #ill-batch-modal {
-        .modal-footer {
-            display: flex;
-
-            & > * {
-                flex: 1;
-            }
-
-            #lhs {
-                text-align: left;
-            }
-        }
-
         #create-progress {
             margin-top: 17px;
         }
@@ -3774,10 +3762,6 @@ input.renew {
     }
 
     #batch-form {
-        legend {
-            margin-bottom: 2em;
-        }
-
         textarea {
             min-height: 100px;
             padding: 5px;
@@ -3785,11 +3769,6 @@ input.renew {
             width: 100%;
         }
 
-        #new-batch-form {
-            display: flex;
-            gap: 20px;
-        }
-
         li#process-button {
             display: flex;
             justify-content: flex-end;
@@ -3811,10 +3790,6 @@ input.renew {
         .batch-modal-actions {
             text-align: center;
         }
-
-        fieldset {
-            border: 2px solid #B9D8D9;
-        }
     }
 
     #dataPreviewLabel {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
index 1683ef7950..72fce2b12b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
@@ -49,12 +49,12 @@
                                     <textarea id="identifiers_input" placeholder="Enter identifiers, one per line"></textarea>
                                 </li>
                                 <li id="process-button">
-                                    <button id="process_button" disabled aria-disabled="true" type="button">Process identifiers</button>
+                                    <button id="process_button" class="btn btn-primary" disabled aria-disabled="true" type="button">Process identifiers</button>
                                 </li>
                             </ol>
                         </fieldset>
                     </form>
-                    <div id="create-progress" class="alert alert-info" role="alert" style="display:none">
+                    <div id="create-progress" role="alert" style="display:none">
                         <span id="progress-label"><strong></strong></span> - Items processed: <span id="processed_count">0</span> out of <span id="processed_total">0</span>. Items failed: <span id="processed_failed">0</span>.
                         <div class="progress">
                             <div id="processed_progress_bar" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em;"> 0% </div>
@@ -82,13 +82,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <div id="lhs">
-                    <button class="btn btn-default" data-bs-dismiss="modal" aria-hidden="false">Cancel</button>
-                </div>
-                <div id="rhs">
-                    <button id="button_create_batch" class="btn btn-default" aria-hidden="true" disabled>Continue</button>
-                    <button id="button_finish" disabled type="button" class="btn btn-default" aria-hidden="true">Finish and view batch</button>
-                </div>
+                <button id="button_create_batch" class="btn btn-primary" aria-hidden="true" disabled>Continue</button>
+                <button id="button_finish" disabled type="button" class="btn btn-primary" aria-hidden="true">Finish and view batch</button>
+                <button id="button_cancel_batch" class="btn btn-default" data-bs-dismiss="modal" aria-hidden="false">Cancel</button>
             </div>
         </div>
     </div>