This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 2fb16362eccea81a1b4a3c4d3caeba866be161b7 (commit) from ab714375669e900d20fe15b02387a3b4ce679e79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2fb16362eccea81a1b4a3c4d3caeba866be161b7 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Fri May 30 16:58:02 2025 +0000 LP1785697 Fix OPAC advanced filters applied count Adds 'sort','skip_check', and 'check_limit' to the list of filters that are ignored when calculating the count of filters applied in the OPAC advanced search results. Refactors the filter show/hide area to eliminate hard-coded square brackets containing a link with a click action that confused accessibility testers. Replaces this with a simple heading if only one filter is applied, or a details/summary area for more than one. Release-note: Corrects OPAC advanced filters applied count; refactors filter show/hide link as details/summary Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Susan Morrison <smorrison@georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 2f6716f99b..1a253c5c72 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -603,7 +603,7 @@ a { } #search-wrapper h1, -#search-wrapper h2 { +#search-wrapper h2:not(h2.h3) { text-align: center; } @@ -980,6 +980,10 @@ for now until a better color is picked - if needed. margin-top: 0; } +.adv_filters_applied { + display: inline-flex; +} + .checkbox_col { width: 1%; [% IF rtl == 't' -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index d28701eaf5..d1bf9479bb 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -3,7 +3,7 @@ # We need to ignore some filters in our count -fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth']; +fignore = ['lasso','location_groups','site','core_limit','limit','badge_orgs','badges','estimation_strategy','depth','sort','skip_check','check_limit']; fcount = 0; FOR f IN ctx.query_struct.filters; IF fignore.grep('^' _ f.name _ '$').size; @@ -165,23 +165,23 @@ END; </form> [% END %] [% IF fcount > 0 %] - <div class="refine_search result_block_visible"> - <span id="filter_hits">[ <a href="#" onclick="getAdvLimits();return false;">[% l('[quant,_1,filter,filters] applied', fcount) %]</a> ]</span> - </div> - [% END %] - [% IF ctx.query_struct.filters.size > 0 %] - [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] - [% IF stuff %] - <h3 class="sr-only">[% l('Search Results filters') %]</h3> - <div class="d-flex justify-content-center"> - <div id="adv_filter_results_block" class="adv_filter_results_hide"> - <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="refine_search"> + [% IF fcount == 1 %] + <h2 class="h3">[% l('[_1] filter applied', fcount) %]</h2> <div class="d-inline-flex p-2"> - [% stuff %] + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] </div> - </div> - </div> + [% ELSE %] + <details id="filter_hits"> + <summary><h3>[% l('[_1] filters applied', fcount) %]</h3></summary> + <div class="adv_filter_results_block_label">[% l('Filtered by:') %]</div> + <div class="adv_filters_applied"> + [% INCLUDE 'opac/parts/result/adv_filter.tt2' %] + </div> + </div> + </details> [% END %] + </div> [% END %] [% IF ctx.search_summary.suggestions.one_class_multi_term %] <div class="result_block_visible refine_search" id="did_you_mean"> @@ -193,22 +193,6 @@ END; [% END %]</ul> </div> [% END %] - - <script> - function getAdvLimits() { - var AdvLimitsClass = document.getElementById('adv_filter_results_block').classList; - if (AdvLimitsClass.contains("adv_filter_results_hide")) { - AdvLimitsClass.remove("adv_filter_results_hide"); - } else { - AdvLimitsClass.add("adv_filter_results_hide"); - } - if (AdvLimitsClass.contains("adv_filter_results_show")) { - AdvLimitsClass.remove("adv_filter_results_show"); - } else { - AdvLimitsClass.add("adv_filter_results_show"); - } - } - </script> <!-- Canonicalized query: [% ctx.canonicalized_query | html %] @@ -220,4 +204,4 @@ END; </div> --> </div> -</div> \ No newline at end of file +</div> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/css/style.css.tt2 | 6 ++- .../templates-bootstrap/opac/parts/searchbar.tt2 | 48 ++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS