From b2d13db5ab15cff4ccfe17c06eec0abf03dbce77 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 2 Nov 2022 12:37:16 +0000
Subject: [PATCH] Bug 32073: Consistent classes for primary buttons:
 Circulation

This patch makes changes the button markup in Circulation templates --
including offline circulation -- so that all submit buttons and any
buttons that should should be styled as primary buttons have the
Bootstrap class "btn btn-primary."

To test, apply the patch and view pages in Circulation to confirm
that everything looks correct. In most cases there are no visible
changes.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/circ/branchoverdues.tt             |  2 +-
 .../prog/en/modules/circ/branchtransfers.tt            | 10 +++++-----
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt  |  4 ++--
 .../en/modules/circ/circulation_batch_checkouts.tt     |  4 ++--
 .../prog/en/modules/circ/curbside_pickups.tt           |  2 +-
 .../intranet-tmpl/prog/en/modules/circ/offline.tt      |  4 ++--
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt      |  2 +-
 .../prog/en/modules/circ/pendingreserves.tt            |  6 +++---
 .../intranet-tmpl/prog/en/modules/circ/set-library.tt  |  2 +-
 .../prog/en/modules/circ/view_holdsqueue.tt            |  2 +-
 .../prog/en/modules/circ/waitingreserves.tt            |  6 +++---
 .../prog/en/modules/offline_circ/process_koc.tt        |  2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
index ce203b31ea..98280e2000 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
@@ -45,7 +45,7 @@
             [% IF ( locationsloo.selected ) %]<option value="[% locationsloo.authorised_value | html %]" selected="selected">[% locationsloo.lib | html %]</option>[% ELSE %]<option value="[% locationsloo.authorised_value | html %]">[% locationsloo.lib | html %]</option>[% END %]
         [% END %]
     </select>
-    <input type="submit" name="location" class="submit" value="OK" />
+    <input type="submit" name="location" class="btn btn-primary" value="OK" />
 </form>
 
     [% IF ( overduesloop ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index ca153d719b..ea5ffe7887 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -76,11 +76,11 @@
                         <input type="hidden" name="barcode" value="[% barcode | html %]" />
                         [% IF ( waiting or transferred or processing ) %]
                             <input type="hidden" name="request" value="KillWaiting" />
-                            <input type="submit" value="Cancel" />
+                            <input type="submit" class="btn btn-primary" value="Cancel" />
                         [% END %]
                         [% IF ( reserved ) %]
                             <input type="hidden" name="request" value="SetTransit" />
-                            <input type="submit" value="Transfer" />
+                            <input type="submit" class="btn btn-primary" value="Transfer" />
                         [% END %]
                     </form>
                 </td>
@@ -100,7 +100,7 @@
                                 <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
                                 <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
                                 <input type="hidden" name="request" value="KillReserved" />
-                                <input type="submit" value="Cancel" />
+                                <input type="submit" class="btn btn-primary" value="Cancel" />
                             </form>
                         </td>
                     </tr>
@@ -116,7 +116,7 @@
                                         <input type="hidden" name="fb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.frombrcd | html %]" />
                                         <input type="hidden" name="tb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.tobrcd | html %]" />
                                     [% END %]
-                                    <input type="submit" value="Ignore" />
+                                    <input type="submit" class="btn btn-primary" value="Ignore" />
                                 </form>
                             </td>
                     </tr>
@@ -185,7 +185,7 @@
             </li>
             <li>
                 <label for="barcode">Enter barcode: </label>
-                <input name="barcode" id="barcode" size="15" class="focus" type="text" /> <input type="submit" value="Submit" />
+                <input name="barcode" id="barcode" size="15" class="focus" type="text" /> <input type="submit" class="btn btn-primary" value="Submit" />
             </li>
 			</ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 00cd8d5c20..50614e7b23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -941,7 +941,7 @@
                                         <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
                                             <input type="hidden" name="from" value="circ" />
                                             <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
-                                            <input type="submit" value="Suspend all holds" />
+                                            <input type="submit" class="btn btn-primary" value="Suspend all holds" />
 
                                             [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
                                             <label for="suspend_until">until</label>
@@ -956,7 +956,7 @@
                                             <input type="hidden" name="from" value="circ" />
                                             <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
                                             <input type="hidden" name="suspend" value="0" />
-                                            <input type="submit" value="Resume all suspended holds" />
+                                            <input type="submit" class="btn btn-primary" value="Resume all suspended holds" />
                                         </form>
                                     </fieldset>
                                 [% END # /IF SuspendHoldsIntranet %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 58c88a19e3..b34bbac1ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -124,7 +124,7 @@
         <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
         <input type="hidden" name="branch" value="[% branch | html %]" />
         <input type="hidden" name="batch" value="1" />
-        <input type="submit" value="Check out" class="button" />
+        <input type="submit" class="btn btn-primary" value="Check out" />
       </fieldset>
     </fieldset>
   </form>
@@ -321,7 +321,7 @@
       <input type="hidden" name="branch" value="[% branch | html %]" />
       <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
       <input type="hidden" name="batch" value="1" />
-      <input type="submit" id="checkoutrenew" class="approve" value="Checkout or renew" />
+      <input type="submit" id="checkoutrenew" class="btn btn-primary" value="Checkout or renew" />
         </fieldset>
     </form>
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
index fc63ef0669..c1d50a2cbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -489,7 +489,7 @@
                                     </fieldset>
 
                                     <fieldset class="action">
-                                        <input id="schedule-pickup-button" type="submit" value="Submit" />
+                                        <input type="submit" id="schedule-pickup-button" class="btn btn-primary" value="Submit" />
                                     </fieldset>
                                 </form>
                             [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
index b469e04200..04dacd41d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
@@ -110,7 +110,7 @@
                                 <legend>Check in</legend>
                                 <label for="checkin-barcode">Enter item barcode: </label>
                                 <input name="barcode" id="checkin-barcode" size="14" class="focus" type="text" />
-                                <input type="submit" class="submit" value="Submit" />
+                                <input type="submit" class="btn btn-primary" value="Submit" />
                             </fieldset>
                         </div>
                     </form>
@@ -139,7 +139,7 @@
                         <label for="checkout-barcode">Checking out to <span class="patron-title"></span></label>
                         <div class="hint">Enter item barcode:</div>
                         <input type="text" name="barcode" id="checkout-barcode" class="barcode focus" size="14" />
-                        <input type="submit" value="Check out" />
+                        <input type="submit" class="btn btn-primary" value="Check out" />
 
                         <div class="date-select">
                             <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index a6ea7739d1..206af1e488 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -273,7 +273,7 @@
 
 </ol>
    <fieldset class="action">
-      <input type="submit" value="Apply filter" class="submit" />
+      <input type="submit" class="btn btn-primary" value="Apply filter" />
       <input type="hidden" name="op" value="apply filter" />
    </fieldset>
    </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 62b4d56a8f..89072074a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -229,10 +229,10 @@
                     <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
                     [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %]
                         <input type="hidden" name="op" value="mark_as_lost" />
-                        <input type="submit" value="Mark item as lost" />
+                        <input type="submit" class="btn btn-primary" value="Mark item as lost" />
                     [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %]
                         <input type="hidden" name="op" value="mark_as_lost_and_notify" />
-                        <input type="submit" value="Mark lost and notify patron" />
+                        <input type="submit" class="btn btn-primary" value="Mark lost and notify patron" />
                     [% END %]
                 </form>
             [% ELSE %]
@@ -301,7 +301,7 @@
     <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
 [% END %]
 
-<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
+<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="btn btn-primary" /></fieldset>
 </fieldset>
 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
index f4079542d2..07b6dd5046 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
@@ -128,7 +128,7 @@ Updated:<ul>
 [% END %]
 
 <fieldset class="action">
-    <input type="submit" value="Submit" />
+    <input type="submit" class="btn btn-primary" value="Submit" />
     <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
 </fieldset>
 <div class="noshow">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 3d5dc85104..3c43049704 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -286,7 +286,7 @@
                 </li>
             </ol>
             <fieldset class="action">
-                <input type="submit" value="Submit" />
+                <input type="submit" class="btn btn-primary" value="Submit" />
                 <input type="hidden" name="run_report" value="1" />
             </fieldset>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index d217bff2f6..3cea526400 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -110,7 +110,7 @@
             <div role="tabpanel" class="tab-pane active" id="holdswaiting">
         [% IF ( reserveloop ) %]
             <div id="toolbar" class="btn-toolbar">
-                <button class="cancel_selected_holds" data-bulk="true"></button>
+                <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button>
             </div>
             [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
         [% ELSE %]
@@ -127,9 +127,9 @@
                        <input type="hidden" name="allbranches" value="[% allbranches | html %]" />
                        <input type="hidden" name="tab" value="holdsover">
                        [% IF TransferWhenCancelAllWaitingHolds %]
-                           <input type="submit" value="Cancel and Transfer all" />
+                           <input type="submit" class="btn btn-primary" value="Cancel and Transfer all" />
                        [% ELSE %]
-                           <input type="submit" value="Cancel all" />
+                           <input type="submit" class="btn btn-primary" value="Cancel all" />
                        [% END %]
                    </form>
                    [% UNLESS TransferWhenCancelAllWaitingHolds %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index 55a99fd44a..cb7154543c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -70,7 +70,7 @@
             <input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" />
             <span class="required">Required</span>
        </li></ol>
-       <fieldset class="action"><input type="button" class="submit" value="Upload file" id="upload_file" /></fieldset>
+       <fieldset class="action"><input type="button" class="btn btn-primary" value="Upload file" id="upload_file" /></fieldset>
 	   </fieldset>
      </form>
      <div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>
-- 
2.39.5