From 560bb5e2d02db44e71cfc49342a9c615798dda08 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 4 Nov 2024 16:22:37 +0000 Subject: [PATCH] Bug 38350: Fix style of sidebar form clear buttons This patch fixes markup and CSS for sidebar form which contain a submit button and a clear button. The submit button is supposed to be wider than the clear button for visual emphasis. To test, apply the patch and rebuild the staff interface CSS. - Go to Patrons and confirm that the sidebar filter form looks correct. If necessary, resize your browser window to confirm that the "Search" button expands as the page gets wider. Confirm that the clear button works as expected. - Perform the same tests on these pages: - Acquisitions -> Vendor -> Receive shipments - ILL requests - Guided reports -> Saved reports Sponsored-by: Athens County Public Libraries --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 6 ++++++ .../intranet-tmpl/prog/en/includes/patron-search.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 5 ++++- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 8 ++++---- .../prog/en/modules/reports/guided_reports_start.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js | 2 +- 6 files changed, 20 insertions(+), 11 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 40deeaf44d..f0d1ce8914 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -398,6 +398,7 @@ aside { & + .action { background-color: #FFF; display: flex; + gap: .5rem; margin-left: 0; padding: 1rem; @@ -406,6 +407,11 @@ aside { a { display: block; flex-grow: 1; + + &.clear_search { + flex-grow: 0; + flex-shrink: 1; + } } } } 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 d2eef529c7..5a29166f1e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -105,10 +105,10 @@ [% END %] [% END %] -
- - -
+ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 6404c1ba93..e335d97931 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -234,7 +234,10 @@ -
Clear
+ +
+ + Clear
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 23c6e7424f..12c4098597 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 @@ -108,10 +108,10 @@ -
- - -
+ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index ed1e0cf7de..2aed2d4db6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -1491,7 +1491,7 @@
- Clear + Clear
diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js index 7330e709ac..d38b06628b 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js +++ b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js @@ -608,7 +608,7 @@ $(document).ready(function() { populateBackendFilter(); // Clear all filters - $('#clear_search').click(function() { + $('.clear_search').click(function() { clearSearch(); }); -- 2.39.5