From a5f794b2475d5adebe1b3007ff95e854ea1da0af Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 3 Nov 2022 15:32:45 +0000
Subject: [PATCH] Bug 32099: Consistent classes for primary buttons: Assorted
 templates

This patch makes changes the button markup in various assorted
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 the following pages to confirm that
everything looks correct. In most cases there are no visible changes.

- Staff interface login
- Authorities -> Add/edit
- Authorities -> Merge
- ILL -> ILL requests
- Tools -> Patron lists
- Administration -> Manage plugins -> Upload plugin
- Point of sale
- Point of sale -> Transaction history
- Holds
- Suggestions
- Tags
- Calendar

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/modules/auth.tt        |  4 ++--
 .../prog/en/modules/authorities/authorities.tt         |  2 +-
 .../intranet-tmpl/prog/en/modules/authorities/merge.tt |  4 ++--
 .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt  |  8 ++++----
 .../prog/en/modules/patron_lists/add-modify.tt         |  2 +-
 .../intranet-tmpl/prog/en/modules/patron_lists/list.tt |  4 ++--
 .../prog/en/modules/plugins/plugins-upload.tt          |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt     |  2 +-
 .../intranet-tmpl/prog/en/modules/pos/register.tt      |  2 +-
 .../intranet-tmpl/prog/en/modules/reserve/request.tt   |  4 ++--
 .../prog/en/modules/suggestion/suggestion.tt           | 10 +++++-----
 koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt |  2 +-
 .../intranet-tmpl/prog/en/modules/tools/holidays.tt    |  6 +++---
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 2c9ee57bcb..a8d8f793d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -151,7 +151,7 @@
 
     <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
-    <p class="submit"><input id="submit-button" type="submit" value="Log in" tabindex="4" /></p>
+    <p class="submit"><input id="submit-button" type="submit" class="btn btn-primary" value="Log in" tabindex="4" /></p>
     </form>
 
     [% IF ( casAuthentication ) %]
@@ -191,7 +191,7 @@
             <input type="text" name="otp_token" id="otp_token" class="input focus" value="" size="20" tabindex="1" />
         </p>
         <p>
-            <input id="submit-button" type="submit" value="Verify code" />
+            <input type="submit" id="submit-button" class="btn btn-primary" value="Verify code" />
             <a class="send_otp" id="send_otp" href="#">Send the code by email</a>
             <a class="cancel" id="logout" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Cancel</a>
         </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index 832a651e5d..ebca79dbdf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -316,7 +316,7 @@
                     <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
 
                     <div id="toolbar" class="btn-toolbar">
-                        <div class="btn-group"><a href="#" id="addauth" class="btn btn-default" accesskey="w"><i class="fa fa-save"></i> Save</a></div>
+                        <div class="btn-group"><a href="#" id="addauth" class="btn btn-primary" accesskey="w"><i class="fa fa-save"></i> Save</a></div>
                         <div class="btn-group">
                             [% IF ( authid ) %]
                                 <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
index ef1878931d..965dcdbd04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -94,7 +94,7 @@ div#result { margin-top: 1em; }
 
     <input type="hidden" name="authid" value="[% recordid1 | html %]" />
     <input type="hidden" name="authid" value="[% recordid2 | html %]" />
-    <fieldset class="action"><input type="submit" value="Next" /></fieldset>
+    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Next" /></fieldset>
     </fieldset>
 </form>
 
@@ -116,7 +116,7 @@ div#result { margin-top: 1em; }
 <input type="hidden" name="mergereference" value="[% mergereference | html %]" />
 <input type="hidden" name="frameworkcode" value="[% framework | html %]" />
 
-<fieldset class="action"><input type="submit" name="merge" value="Merge" /></fieldset>
+<fieldset class="action"><input type="submit" name="merge" class="btn btn-primary" value="Merge" /></fieldset>
 </form>
 
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index fe62593dfe..69a34add77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -102,7 +102,7 @@
                                 </li>
                             </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>
@@ -264,7 +264,7 @@
                                         <input name="item_type" type="hidden" value="[% items.0.itype | html %]">
                                     [% END %]
                                     <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
-                                    <input type="submit" value="Submit">
+                                    <input type="submit" class="btn btn-primary" value="Submit" />
                                     <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]">Cancel</a>
                                 </fieldset>
                             </form>
@@ -467,7 +467,7 @@
                             <input type="hidden" value="edit_action" name="method">
                             <input type="hidden" value="form" name="stage">
                             <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
-                            <input type="submit" value="Submit">
+                            <input type="submit" class="btn btn-primary" value="Submit" />
                             <a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]">Cancel</a>
                         </fieldset>
                     </form>
@@ -773,7 +773,7 @@
                                                 </ol>
                                             </fieldset>
                                             <fieldset class="action">
-                                                <input type="submit" value="Submit">
+                                                <input type="submit" class="btn btn-primary" value="Submit" />
                                             </fieldset>
                                         </form>
                                     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
index 581ad624d5..265c817fa3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
@@ -89,7 +89,7 @@
 
             <fieldset class="action">
                 <input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" />
-                <input type="submit" value="Save" />
+                <input type="submit" class="btn btn-primary" value="Save" />
                 <a href="lists.pl" class="cancel">Cancel</a>
             </fieldset>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
index c812adf7c9..49ce23cc11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
@@ -138,7 +138,7 @@
                 </ol>
             </fieldset>
             <fieldset id="patron_ids_submit" class="action">
-                <input type="submit" value="Submit" />
+                <input type="submit" class="btn btn-primary" value="Submit" />
             </fieldset>
 
             <div class="clearfix"></div>
@@ -149,7 +149,7 @@
 
                 <fieldset class="action">
                     <input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" />
-                    <input type="submit" value="Add patrons" />
+                    <input type="submit" class="btn btn-primary" value="Add patrons" />
                     <a href="lists.pl" class="cancel">Cancel</a>
                 </fieldset>
             </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
index cbc2dd78d4..bb493d04a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
@@ -55,7 +55,7 @@
                     </fieldset>
                     <fieldset class="action">
                         <input type="hidden" name="op" value="Upload" />
-                        <input type="submit" value="Upload" class="submit" />
+                        <input type="submit" class="btn btn-primary" value="Upload" />
                     </fieldset>
                 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index c09e9bc615..64fdb88fac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -155,7 +155,7 @@
                     </fieldset>
 
                     <div class="action">
-                        <input type="submit" id="submitbutton" name="submitbutton" value="Confirm" />
+                        <input type="submit" id="submitbutton" name="submitbutton" class="btn btn-primary" value="Confirm" />
                         <a class="cancel" href="/cgi-bin/koha/pos/pay.pl">Cancel</a>
                     </div>
                 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index 0bf2889d76..fdbcf825a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -188,7 +188,7 @@
 
                 <div class="action">
                     <input type="hidden" name="registerid" value="[% register.id | html %]">
-                    <input type="submit" value="Display" />
+                    <input type="submit" class="btn btn-primary" value="Display" />
                 </div>
             </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 621a0a3fb0..e2d33c5415 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -245,7 +245,7 @@
                                     <form id="holds_clubsearch" action="request.pl" method="post">
                                         <div class="hint">Enter club ID or partial name:</div>
                                         <input type="text" size="40" id="club" class="focus" name="findclub" autocomplete="off" />
-                                        <input type="submit" value="Search" />
+                                        <input type="submit" class="btn btn-primary" value="Search" />
                                         [% FOREACH biblionumber IN biblionumbers %]
                                         <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/>
                                         [% END %]
@@ -339,7 +339,7 @@
                             [% END %]
                         [% UNLESS ( multi_hold ) %]
                             <fieldset class="action">
-                                <input type="submit" value="Place hold" />
+                                <input type="submit" class="btn btn-primary" value="Place hold" />
                             </fieldset>
                         [% ELSE %]
                             <table id="requesttitles">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 5765356efc..bfaef57f43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -651,17 +651,17 @@
                     [% IF ( suggestionid ) %]
                         [% IF ( need_confirm ) %]
                             <input type="hidden" name="save_confirmed" value="1" />
-                            <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />
+                            <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" class="btn btn-primary" value="Confirm your suggestion" />
                         [% ELSE %]
-                            <input type="submit" value="Save" />
+                            <input type="submit" class="btn btn-primary" value="Save" />
                         [% END %]
                         <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby | uri %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>
                     [% ELSE %]
                         [% IF ( need_confirm ) %]
                             <input type="hidden" name="save_confirmed" value="1" />
-                            <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />
+                            <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" class="btn btn-primary" value="Confirm your suggestion" />
                         [% ELSE %]
-                            <input type="submit" value="Submit your suggestion" />
+                            <input type="submit" class="btn btn-primary" value="Submit your suggestion" />
                         [% END %]
                         <a class="cancel" href="suggestion.pl">Cancel</a>
                     [% END %]
@@ -1045,7 +1045,7 @@
                                     </li>
                                 </ol>
                                 <fieldset class="action">
-                                    <input type="submit" value="Go" />
+                                    <input type="submit" class="btn btn-primary" value="Go" />
                                 </fieldset>
                             </fieldset> <!-- /.brief -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index 5de814da48..e0bde15076 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -242,7 +242,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 	    </li>
   </ol>
- <fieldset class="action"><button type="submit" class="btn btn-default btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset>
+    <fieldset class="action"><button type="submit" class="btn btn-primary btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset>
 </fieldset>
 </form>
 </aside>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index aca3af467b..7cf6e11e92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -134,7 +134,7 @@
                                             </li>
                                         </ol>
                                         <fieldset class="action">
-                                            <input type="submit" name="submit" value="Save" />
+                                            <input type="submit" name="submit" class="btn btn-primary" value="Save" />
                                             <a href="#" class="cancel hidePanel showHoliday">Cancel</a>
                                         </fieldset>
                                     </fieldset> <!-- /.brief -->
@@ -221,7 +221,7 @@
                                             </li>
                                         </ol>
                                         <fieldset class="action">
-                                            <input type="submit" name="submit" value="Save" />
+                                            <input type="submit" name="submit" class="btn btn-primary" value="Save" />
                                             <a href="#" class="cancel hidePanel newHoliday">Cancel</a>
                                         </fieldset>
                                     </fieldset> <!-- /.brief -->
@@ -242,7 +242,7 @@
                                             <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
                                         [% END %]
                                     </select>
-                                    <input type="submit" value="Copy" />
+                                    <input type="submit" class="btn btn-primary" value="Copy" />
                                 </form>
                             </div>
                         </div> <!-- /.page-section -->
-- 
2.39.5