From f98adbfa3d611b50432dd5cc4715be8ac716c111 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." Edit: This revised patch changes the button styles on the search history page to make them more consistent with buttons in similar interfaces (see catalog search results). The patch also adds Bootstrap size classes to the item detail page and removes some global CSS which targeted buttons on that page. To test, apply the patch and view pages the catalog to confirm that everything looks correct. In most cases there are no visible changes. - Advanced search: The main search button at the top - Search results: The "Search within results" submit button - Bibliographic detail page: This change is to a hidden button. This section can be removed in a separate bug. - Bibliographic detail page -> Items: Various "Update" and "Set status" buttons. Note that the alignment of buttons has not changed in the redesign. - Item search: The main search button at the top - Search history (from the logged-in user's menu in the top right): "Delete" buttons in each section - Catalog -- Current and previous sessions - Authority -- Current and previous sessions - In the Cart popup window, click "Send." In the resulting popup, the "Send button. - The template basket/downloadcart.tt has been modified but I think the template might be unused. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../intranet-tmpl/prog/css/src/staff-global.scss | 5 ----- .../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 | 8 ++++---- 9 files changed, 22 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index f0b7640073..52c600a81a 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1054,11 +1054,6 @@ div { font-size: 80%; } } - - input { - font-size: 90%; - padding: .2em .6em; - } } &.sysprefs { 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 efabb12bdf..8dcc8d2e4b 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 be4b5dcfa5..5db107ef27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1076,7 +1076,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..01dfde5d84 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..e9fe20d585 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..e1295ff5e2 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

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

-- 2.39.5