From ab96b2e4d115b885f5a4720843c0dcc03a30f2bb Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 2 Nov 2022 12:02:43 +0000
Subject: [PATCH] Bug 32071: Consistent classes for primary buttons: Catalog

This patch makes changes the button markup in Catalog
templates -- including the Cart -- 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 the catalog to confirm
that everything looks correct. In most cases there are no visible
changes.
---
 .../prog/en/modules/basket/downloadcart.tt         |  4 ++--
 .../prog/en/modules/basket/sendbasketform.tt       |  2 +-
 .../prog/en/modules/catalogue/advsearch.tt         |  2 +-
 .../prog/en/modules/catalogue/detail.tt            |  2 +-
 .../prog/en/modules/catalogue/itemsearch.tt        | 14 ++++++--------
 .../prog/en/modules/catalogue/moredetail.tt        | 12 ++++++------
 .../prog/en/modules/catalogue/results.tt           |  2 +-
 .../prog/en/modules/catalogue/search-history.tt    |  6 +++---
 8 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt
index 3862019a00..f61355622c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt
@@ -25,8 +25,8 @@
 	</fieldset>
 	<fieldset class="action">
 	<input type="hidden" name="bib_list" value="[% bib_list | html %]" />
-	<input type="submit" name="save" value="Save" /> <a class="cancel close" href="#">Cancel</a>
-	</fieldset>
+    <input type="submit" name="save" class="btn btn-primary" value="Save" /> <a class="cancel close" href="#">Cancel</a>
+    </fieldset>
     </form>
 
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
index 2dcf67e5b0..108aa1ea92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
@@ -31,7 +31,7 @@
     </li>
     </ol>
     </fieldset>
-    <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
+    <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
     <input type="hidden" name="bib_list" value="[% bib_list | html %]" />
     <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 52b46a764a..f4c0640701 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -84,7 +84,7 @@
                         <!-- SEARCH BUTTONS -->
                         <div id="toolbar" class="btn-toolbar">
                             <div class="btn-group">
-                                <button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
+                                <button class="btn btn-primary" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
                             </div>
                             <div class="btn-group">
                             [% IF ( expanded_options ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 5a14e60aaa..bd4b30136c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1071,7 +1071,7 @@ Note that permanent location is a code, and location may be an authval.
         <option value="marcxml">MARCXML</option>
         <option value="marc8">MARC (non-Unicode/MARC-8)</option>
         <option value="utf8">MARC (Unicode/UTF-8)</option>    </select>
-        <input type="submit" name="save" value="Download record" /></td>
+        <input type="submit" name="save" class="btn btn-primary" value="Download record" /></td>
   </tr>
   <tr><td>
     <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="[% biblionumber | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 2028663e67..08249b1756 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -179,14 +179,12 @@
 
       <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
           <div id="toolbar" class="btn-toolbar">
-              <fieldset class="action">
-                  <div class="btn-group">
-                      <button class="btn btn-default"><i class="fa fa-search"></i> Search</button>
-                  </div>
-                  <div class="btn-group">
-                      <a href="/cgi-bin/koha/catalogue/search.pl" class="btn btn-default"><i class="fa fa-search"></i> Go to advanced search</a>
-                  </div>
-              </fieldset>
+                <div class="btn-group">
+                    <button class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
+                </div>
+                <div class="btn-group">
+                    <a href="/cgi-bin/koha/catalogue/search.pl" class="btn btn-default"><i class="fa fa-search"></i> Go to advanced search</a>
+                </div>
           </div>
           <fieldset>
             [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 553dfd8b02..da9cf5fd80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -185,7 +185,7 @@
                                 <p class="help-block">Item has been claimed as returned.</p>
                             [% ELSE %]
                                 <input type="hidden" name="op" value="set_lost" />
-                                <input type="submit" name="submit" class="submit" value="Set status" />
+                                <input type="submit" name="submit" class="btn btn-primary" value="Set status" />
                             [% END %]
                         </form>
                     [% ELSE %]
@@ -219,7 +219,7 @@
             [% END %]
                     </select>
                     <input type="hidden" name="op" value="set_damaged" />
-                    <input type="submit" name="submit" class="submit" value="Set status" /></form>
+                    <input type="submit" name="submit" class="btn btn-primary" value="Set status" /></form>
                 [% ELSE %]
                     [% FOREACH itemdamagedloo IN itemdamagedloop %]
                         [% IF ( itemdamagedloo.selected ) %]
@@ -252,7 +252,7 @@
                                 [% END %]
                             </select>
                             <input type="hidden" name="op" value="set_withdrawn" />
-                            <input type="submit" name="submit" class="submit" value="Set status" /></form>
+                            <input type="submit" name="submit" class="btn btn-primary" value="Set status" /></form>
                     [% ELSE %]
                         [% FOREACH itemwithdrawn IN itemwithdrawnloop %]
                             [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]
@@ -288,7 +288,7 @@
                             [% END %]
                             </select>
                             <input type="hidden" name="op" value="set_exclude_priority" />
-                            <input type="submit" name="submit" class="submit" value="Update" /></form>
+                            <input type="submit" name="submit" class="btn btn-primary" value="Update" /></form>
                         </li>
                     </ol>
                 </div>
@@ -351,7 +351,7 @@
                     <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" />
                         <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" />
                         <input type="hidden" name="op" value="set_public_note" />
-                        <textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes | html %]</textarea><input type="submit" name="submit" class="submit" value="Update" />
+                        <textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes | html %]</textarea><input type="submit" name="submit" class="btn btn-primary" value="Update" />
                     </form>
                     [% ELSE %]
                         [% ITEM_DAT.itemnotes | html %]
@@ -365,7 +365,7 @@
                     <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" />
                         <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" />
                         <input type="hidden" name="op" value="set_non_public_note" />
-                        <textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic | html %]</textarea><input type="submit" name="submit" class="submit" value="Update" />
+                        <textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic | html %]</textarea><input type="submit" name="submit" class="btn btn-primary" value="Update" />
                     </form>
                     [% ELSE %]
                         [% ITEM_DAT.itemnotes_nonpublic | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 0aac455694..fd66c648d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -83,7 +83,7 @@
                                 [% INCLUDE 'search_indexes.inc' ms_kw = 1 refiner = 1 %]
                             [% END %]
                             <input name="limit" id="refiner" type="text"  title="Search results">
-                            <input type="submit" id="refine" value="Search">
+                            <input type="submit" id="refine" class="btn btn-primary" value="Search" />
                         </form>
                     </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
index 7a33cd861d..698a75c2ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
@@ -54,7 +54,7 @@
                                 <span class="sep">|</span>
                                 <span class="links">
                                 <span class="selections">Select searches to: </span>
-                                <a href="#" class="action_delete disabled">Delete</a>
+                                <a href="#" class="action_delete btn btn-xs btn-primary disabled">Delete</a>
                                 </span>
                             </p>
                             <input type="hidden" name="action" value="delete" />
@@ -95,7 +95,7 @@
                                 <span class="sep">|</span>
                                 <span class="links">
                                 <span class="selections">Select searches to: </span>
-                                <a href="#" class="action_delete disabled">Delete</a>
+                                <a href="#" class="action_delete btn btn-xs btn-primary disabled">Delete</a>
                                 </span>
                             </p>
                             <input type="hidden" name="action" value="delete" />
@@ -138,7 +138,7 @@
                                 <span class="sep">|</span>
                                 <span class="links">
                                 <span class="selections">Select searches to: </span>
-                                <a href="#" class="action_delete disabled">Delete</a>
+                                <a href="#" class="action_delete btn btn-xs btn-primary disabled">Delete</a>
                                 </span>
                             </p>
                             <input type="hidden" name="action" value="delete" />
-- 
2.20.1