From d4aceae4afcc95657f1e71de3903d7fb974e2040 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 3 Nov 2022 12:01:22 +0000
Subject: [PATCH] Bug 32086: Consistent classes for primary buttons: Patrons

This patch makes changes the button markup in patron
module templates 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 patron module pages 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>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc  | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/members/discharge.tt      | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/members/housebound.tt     | 2 +-
 .../intranet-tmpl/prog/en/modules/members/mancredit.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/members/maninvoice.tt     | 4 ++--
 .../intranet-tmpl/prog/en/modules/members/member-flags.tt   | 2 +-
 .../prog/en/modules/members/member-password.tt              | 2 +-
 .../intranet-tmpl/prog/en/modules/members/members-update.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/members/merge-patrons.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/members/moremember.tt     | 4 ++--
 .../intranet-tmpl/prog/en/modules/members/paycollect.tt     | 6 +++---
 .../intranet-tmpl/prog/en/modules/members/routing-lists.tt  | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 901fda04c8..de4ba90c0d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -10,7 +10,7 @@
     <form id="patron_search_form">
         <div class="hint">Enter patron card number or partial name:</div>
         <input type="text" size="40" id="search_patron_filter" class="focus" autocomplete="off" />
-        <input type="submit" value="Search" />
+        <input type="submit" class="btn btn-primary" value="Search" />
     </form>
 [% END %]
 
@@ -91,7 +91,7 @@
                 [% END %]
             </ol>
             <fieldset class="action">
-                <input type="submit" value="Search" />
+                <input type="submit" class="btn btn-primary" value="Search" />
                 <input type="button" value="Clear" id="clear_search" />
             </fieldset>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
index 4af027a880..44d5de7ded 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
@@ -69,7 +69,7 @@
                             <li>
                                 <label for="description">Description: </label>
                                 <input type="text" name="description" />
-                                <input type="submit" value="Save" />
+                                <input type="submit" class="btn btn-primary" value="Save" />
                                 <a href="#" class="cancel toggle_element" data-element="#add-api-key">Cancel</a>
                             </li>
                         </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
index 8ad0740fbb..283c4590d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
@@ -63,7 +63,7 @@
         <p>Patron has holds. They will be cancelled if the discharge is generated.</p>
     [% END %]
     <form method="post">
-        <input type="submit" value="Generate discharge" name="discharge" />
+        <input type="submit" name="discharge" class="btn btn-primary" value="Generate discharge" />
         <input type="hidden" value="[% patron.borrowernumber | html %]" name="borrowernumber" />
     </form>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
index e77fc365b1..358d8299d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
@@ -92,7 +92,7 @@
                         <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li>
 
                         </ol>
-                        <fieldset class="action"><input name="upload" type="submit" id="upload" value="Upload file" /></fieldset>
+                        <fieldset class="action"><input name="upload" type="submit" id="upload" class="btn btn-primary" value="Upload file" /></fieldset>
                     </fieldset>
                 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
index 116f4ce412..54f0013daa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
@@ -362,7 +362,7 @@
                   </ol>
                 </fieldset>
                 <fieldset class="action">
-                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
+                  <button type="submit" class="btn btn-primary btn-sm"><i class="fa fa-save"></i> Save</button>
                   <a class="cancel"
                      href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">
                     Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index 87f606871a..f4c7557c65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -108,7 +108,7 @@
                         [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
                     [% END %]
 
-                    <fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
+                    <fieldset class="action"><input type="submit" name="add" class="btn btn-primary" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
                 </form>
 
                 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
index 194d7d4ef0..3cfba2c895 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -96,8 +96,8 @@
                     [% END %]
 
                     <fieldset class="action">
-                        <button type="submit" name="add" value="save">Save</button>
-                        <button type="submit" name="add" value="save and pay">Save and pay</button>
+                        <button type="submit" name="add" class="btn btn-primary" value="save">Save</button>
+                        <button type="submit" name="add" class="btn btn-primary" value="save and pay">Save and pay</button>
                         <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a>
                     </fieldset>
                 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
index 1a3171dbf3..f6a1ac1a66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
@@ -48,7 +48,7 @@
 
     <div id="permissionstree">
         <div id="permissions_toolbar" class="btn-toolbar">
-            <button type="submit" class="btn btn-default"><i class="fa fa-save"></i> Save</button>
+            <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Save</button>
             <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a>
             <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>
             <a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
index 4fe449160c..999d58c680 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
@@ -106,7 +106,7 @@
 </fieldset>
     <fieldset class="action">
         <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
-        <input type="submit" value="Save" />
+        <input type="submit" class="btn btn-primary" value="Save" />
         <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a>
     </fieldset>
 </form>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index a6a0da0efd..a3ef2d38a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -205,7 +205,7 @@
                             </div> <!-- /panel.panel-default -->
                         [% END # /FOREACH pm %]
                     </div> <!-- /#pending-updates -->
-                    <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
+                    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset>
                 </form>
             [% ELSE %]
                 <div class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index a735f9df0d..16bb9ac1e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -157,7 +157,7 @@
                                 <input type="hidden" name="id" value="[% p.id | html %]" />
                             [% END %]
                             <input type="hidden" name="action" value="merge" />
-                            <input id="merge-patrons" type="submit" value="Merge patrons" />
+                            <input type="submit" id="merge-patrons" class="btn btn-primary" value="Merge patrons" />
                         </fieldset>
 
                     [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 43071d2bf2..ef0a906c90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -794,7 +794,7 @@
                                                 <fieldset class="action">
                                                     <input type="hidden" name="from" value="borrower" />
                                                     <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>
@@ -809,7 +809,7 @@
                                                     <input type="hidden" name="from" value="borrower" />
                                                     <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" />
                                                 </fieldset>
                                             </form>
                                         [% END # IF SuspendHoldsIntranet %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
index 797660b0ee..726255af15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -219,7 +219,7 @@
 [% END %]
 
         <div class="action">
-            <input type="submit" name="submitbutton" value="Confirm" />
+            <input type="submit" name="submitbutton" class="btn btn-primary" value="Confirm" />
             <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a>
         </div>
     </form>
@@ -276,7 +276,7 @@
         [% END %]
 
         <div class="action">
-            <input type="submit" value="Write off this charge" />
+            <input type="submit" class="btn btn-primary" value="Write off this charge" />
             <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a>
         </div>
     </form>
@@ -364,7 +364,7 @@
     [% END %]
 
     <div class="action">
-        <input type="submit" name="submitbutton" value="Confirm" />
+        <input type="submit" name="submitbutton" class="btn btn-primary" value="Confirm" />
         <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a>
     </div>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
index 7838f9a540..aa5c0c4894 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
@@ -42,7 +42,7 @@
                 <h1>Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</h1>
 <!-- Search Bar -->
 <p class="tip">Search subscriptions:</p>
-<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="submit" />
+<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" class="btn btn-primary" value="Search" />
 </form>
 <!-- Search Bar End -->
 
-- 
2.39.5