From 858fa4f728d29981fdf50df6c0a2ebed199e513d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 16 Nov 2023 13:51:44 +0000
Subject: [PATCH] Bug 35350: Update label creator pop-up windows with
 consistent footer markup

This patch updates two label creator templates in order to style
submission and close buttons in a fixed footer at the bottom of the
window, with markup consistent with other pop-up windows.

To test, apply the patch and go to Cataloging -> Label creator.

- Click New -> Label batch.
- Click the "Add items" button under the form.
- A "Search for items" window should pop up.
  - The window's fixed footer should have the "Search" and "Close
    window" buttons. Test that each work correctly.
- Submit a search which will return results.
  - The search results window should also have a fixed footer. I moved
    the "Add checked" and "Done" buttons out of a floating toolbar and
    put the controls there for consistency's sake.
  - Confirm that both controls work correctly.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/labels/result.tt          | 20 +++++++++----------
 .../prog/en/modules/labels/search.tt          | 12 +++++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
index e6b44617dae..114785833fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
@@ -44,10 +44,7 @@
             [% PROCESS pagination %]
 
             <form name="resultform" action="" style="display:block">
-            <div id="toolbar" class="btn-toolbar">
-                <div class="btn-group"><button type="button" class="btn btn-default" id="add_items"><i class="fa fa-plus"></i> Add checked</button></div>
-                <div class="btn-group"><a href="#" class="btn btn-default close"><i class="fa fa-times-circle"></i> Done</a></div>
-            </div>
+
             <div id="selection_ops">
                 <a id="CheckAll" class="btn btn-link" href="#"><i class="fa fa-check"></i> Select all</a>
                 <a id="CheckNone" class="btn btn-link" href="#"><i class="fa fa-times"></i> Clear all</a>
@@ -107,19 +104,20 @@
             </form>
         </div>
         [% PROCESS pagination %]
-        <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <button type="button" class="btn btn-primary" id="add_items"><i class="fa fa-plus"></i> Add checked</button>
+                    <a href="#" class="btn btn-default close_window">Done</a>
+                </fieldset>
+            </div>
+        </nav>
     </div>
 
 [% MACRO jsinclude BLOCK %]
-    [% Asset.js("lib/hc-sticky.js") | $raw %]
     <script>
         var Sticky;
         $(document).ready(function(){
-            Sticky = $("#toolbar");
-            Sticky.hcSticky({
-                stickTo: "form",
-                stickyClass: "floating"
-            });
             $("#CheckAll").click(function(e){
                 e.preventDefault();
                 $("input[type='checkbox']").prop("checked",true);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
index 8f19d157345..16f603f4f48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
@@ -143,10 +143,14 @@
                 </ol>
             </fieldset>
 
-            <fieldset class="action">
-                <input type="submit" class="btn btn-primary" value="Search" />
-                <a class="cancel close" href="#">Cancel</a>
-            </fieldset>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Search" />
+                        <button type="button" class="btn btn-default close_window">Close window</button>
+                    </fieldset>
+                </div>
+            </nav>
         </form>
     </div>
 
-- 
2.43.0