From ab96b2e4d115b885f5a4720843c0dcc03a30f2bb Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 @@
- Cancel -
+ Cancel + [% 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 @@ -
Cancel
+
Cancel
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 @@
- +
[% 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. - + 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 @@
-
-
- -
- -
+
+ +
+
[% 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 @@

Item has been claimed as returned.

[% ELSE %] - + [% END %] [% ELSE %] @@ -219,7 +219,7 @@ [% END %] - + [% ELSE %] [% FOREACH itemdamagedloo IN itemdamagedloop %] [% IF ( itemdamagedloo.selected ) %] @@ -252,7 +252,7 @@ [% END %] - + [% ELSE %] [% FOREACH itemwithdrawn IN itemwithdrawnloop %] [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] @@ -288,7 +288,7 @@ [% END %] - +
@@ -351,7 +351,7 @@
- +
[% ELSE %] [% ITEM_DAT.itemnotes | html %] @@ -365,7 +365,7 @@
- +
[% 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 %] - +
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 @@ | Select searches to: - Delete + Delete

@@ -95,7 +95,7 @@ | Select searches to: - Delete + Delete

@@ -138,7 +138,7 @@ | Select searches to: - Delete + Delete

-- 2.20.1