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, rel_3_15 has been updated via 5fce7551c00b50cd03dcb6a90d27c06793289ed8 (commit) via 33204dc6e9ce4a4a25ad0498f6495812e1f99991 (commit) via 94a70bc9b575a3e2852a944a67062aee25f34b54 (commit) from 793faca5381f2d65914a7f96856e0079f9ba0617 (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 5fce7551c00b50cd03dcb6a90d27c06793289ed8 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Thu Apr 17 21:57:11 2025 +0000 LP2096790 Browse Courses form layout Fixes the layout of the Browse Courses form, which should display in a single horizontal row on desktop screens. Release-note: Fixes the Browse Courses form layout Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Michele Morgan <mmorgan@noblenet.org> Signed-off-by: Jane Sandberg <js7389@princeton.edu> Signed-off-by: Ruth Frasur Davis <redavis4974@gmail.com> Signed-off-by: Steven Mayo <smayo@georgialibraries.org> Signed-off-by: Dan Guarracino <dguarracino@owwl.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/templates/opac/course_browse.tt2 b/Open-ILS/src/templates/opac/course_browse.tt2 index 632452968d..3521ceb1da 100644 --- a/Open-ILS/src/templates/opac/course_browse.tt2 +++ b/Open-ILS/src/templates/opac/course_browse.tt2 @@ -37,7 +37,7 @@ <div id="main-content"> <div id="browse-for-courses"> <div id="browse-controls" class='searchbar'> - <form method="get" onsubmit="$('browse-submit-spinner').className = ''; return true"> + <form method="get" class="form-inline g-1" onsubmit="$('browse-submit-spinner').className = ''; return true"> <input type="hidden" name="blimit" value="[% blimit | html %]" /> [% control_qtype = INCLUDE "opac/parts/course_search/qtype_selector.tt2" commit 33204dc6e9ce4a4a25ad0498f6495812e1f99991 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Thu Apr 17 14:59:25 2025 +0000 LP2096790 Course, Advanced Search layout tweaks Removes subgrid styling from course and advanced search to avoid layout issues in older Chrome browsers. Release-note: Aligns OPAC course search layout with advanced search form Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 b/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 index 8f20432fd5..17f54f108f 100644 --- a/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 @@ -53,16 +53,16 @@ <button type="button" class="btn btn-opac btn-sm" id="myopac_new_global_row" onclick='addSearchRow()'> <i class="fas fa-plus-circle" aria-hidden="true"></i> [% l('Add Search Terms') %] </button> - <div id="adv_search_status" role="status" style="margin-left:1rem"> - [% # ARIA live announcements toggled by ariaStatus() in simple.js %] - <div class="m-0 alert alert-warning d-none" id="aria-search-row-removed"> - [% l('Search term logic group removed.'); %] - </div> - <div class="m-0 alert alert-success d-none" id="aria-search-row-added"> - [% l('Search term logic group added.'); %] - </div> - </div> - </div> + </div> + <div id="adv_search_status" role="status" style="margin: 0 auto;"> + [% # ARIA live announcements toggled by ariaStatus() in simple.js %] + <div class="m-0 alert alert-warning d-none" id="aria-search-row-removed"> + [% l('Search term logic group removed.'); %] + </div> + <div class="m-0 alert alert-success d-none" id="aria-search-row-added"> + [% l('Search term logic group added.'); %] + </div> + </div> </div> </div> </div> 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 ef88e9b5a7..5f09bb165a 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -364,6 +364,28 @@ Novelist Styling margin-bottom: 1rem; } +.advanced_div { + padding-top: 15px; +} + +#adv_global_search { + width: 100%; +} + +#adv_global_input_table { + padding-inline-start: 15px; + width: 100%; +} + +#adv_global_input_table select, +.adv_fieldset_row .col-bool-operator { + width: 7rem; +} + +.adv_fieldset_row .col-term { + min-width: 30%; +} + .adv_search_grid { align-items: center; display: grid; @@ -373,11 +395,10 @@ Novelist Styling } .adv_fieldset_row { - display: grid; - grid-column: 1 / -1; - grid-gap: 0.25rem; - grid-template-columns: subgrid; + display: flex; + gap: 0.35rem; align-items: center; + padding: 0.5rem 0 0; } #adv_global_addrow { @@ -2431,14 +2452,6 @@ div#facet_sidebar { font-weight: bold; } -.advanced_div { padding-top: 15px; } -#adv_global_search { width: 100%; } -#adv_global_addrow td { padding-top: 7px; } -[% IF rtl == 't' -%] -#adv_global_addrow.td-search-left{text-align:right;} -[% END -%] -#adv_global_input_table { width: 100%; } -#adv_global_input_table select { width: 7em; } .adv_adv_link { font-size: [% css_fonts.size_smaller %]; color: [% css_colors.text_alert %]; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 index 7e997d7b5e..30b79cc5f8 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 @@ -18,15 +18,14 @@ <button type="button" class="btn btn-opac btn-sm" id="myopac_new_global_row" onclick='addSearchRow()'> <i class="fas fa-plus-circle" aria-hidden="true"></i> [% l('Add Search Terms') %] </button> - - <div id="adv_search_status" role="status" style="margin-left:1rem"> - [% # ARIA live announcements toggled by ariaStatus() in simple.js %] - <div class="m-0 alert alert-warning d-none" id="aria-search-row-removed"> - [% l('Search term logic group removed.'); %] - </div> - <div class="m-0 alert alert-success d-none" id="aria-search-row-added"> - [% l('Search term logic group added.'); %] - </div> + </div> + <div id="adv_search_status" role="status" style="margin: 0 auto;"> + [% # ARIA live announcements toggled by ariaStatus() in simple.js %] + <div class="m-0 alert alert-warning d-none" id="aria-search-row-removed"> + [% l('Search term logic group removed.'); %] + </div> + <div class="m-0 alert alert-success d-none" id="aria-search-row-added"> + [% l('Search term logic group added.'); %] </div> </div> </div> commit 94a70bc9b575a3e2852a944a67062aee25f34b54 Author: Brian Kennedy <brian.kennedy@bc.libraries.coop> Date: Wed Feb 12 14:15:23 2025 -0800 LP2096790 Make Course Search match Advanced Search Course Search and Advanced Search now share common layouts, buttons, and accessibility. Signed-off-by: Brian Kennedy <brian.kennedy@bc.libraries.coop> Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 b/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 index 6fcaf4e947..8f20432fd5 100644 --- a/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/course_search.tt2 @@ -38,28 +38,32 @@ </div> </div> </div> - + + <div class="advanced_div"> <div id='adv_global_search' class='data_grid data_grid_center w-auto'> <div id='adv_search_rows' class="w-auto"> <div class='adv_global_input_container w-auto'> <div id="adv_global_input_table"> <div id='adv_global_tbody'> - [% INCLUDE "opac/parts/course_search/global_row.tt2" %] - <!-- add a new row --> - <div id="adv_global_addrow"> - <div class="d-flex align-items-start justify-content-between"> - <button type="button" id="myopac_new_global_row" - onclick='addSearchRow();'> - [% l('Add Search Row') %] - </button> - <div id="adv_search_status" class="mx-3"> - [% # placeholder for ARIA live announcements; see ariaStatus() in simple.js %] - </div> - </div> - </div> - <div> - </div> + [% INCLUDE "opac/parts/course_search/global_row.tt2" %] + <!-- add a new row --> + <div class="adv_fieldset_row" id="adv_global_addrow"> + <div class="d-flex align-items-start justify-content-between" style="height:3.5rem"> + <button type="button" class="btn btn-opac btn-sm" id="myopac_new_global_row" onclick='addSearchRow()'> + <i class="fas fa-plus-circle" aria-hidden="true"></i> [% l('Add Search Terms') %] + </button> + <div id="adv_search_status" role="status" style="margin-left:1rem"> + [% # ARIA live announcements toggled by ariaStatus() in simple.js %] + <div class="m-0 alert alert-warning d-none" id="aria-search-row-removed"> + [% l('Search term logic group removed.'); %] + </div> + <div class="m-0 alert alert-success d-none" id="aria-search-row-added"> + [% l('Search term logic group added.'); %] + </div> + </div> + </div> + </div> </div> </div> </div> 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 010b381980..ef88e9b5a7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -367,7 +367,7 @@ Novelist Styling .adv_search_grid { align-items: center; display: grid; - gap: 0.5rem 0.75rem; + gap: 0.1rem 0.75rem; /* Columns: legend (hidden), boolean operator, query type, match, term, row remover button */ grid-template-columns: max-content max-content max-content minmax(auto, 20rem) max-content; } @@ -375,7 +375,9 @@ Novelist Styling .adv_fieldset_row { display: grid; grid-column: 1 / -1; + grid-gap: 0.25rem; grid-template-columns: subgrid; + align-items: center; } #adv_global_addrow { diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 index 054402a20c..d942f92662 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 @@ -10,7 +10,7 @@ queries = CGI.param('query'); bools = CGI.param('bool'); qtypes = CGI.param('qtype'); - rowcount = 2; + rowcount = 3; # scalar.merge treats the scalar as a 1-item array WHILE queries.size < rowcount; queries = queries.merge(['']); END; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 index f7c1158617..7e997d7b5e 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 @@ -13,13 +13,13 @@ <div id="adv_global_tbody" class="adv_search_grid"> [% INCLUDE "opac/parts/advanced/global_row.tt2" %] <!-- add a new row --> - <div class="adv_fieldset_row" id='adv_global_addrow'> - <div class="d-flex align-items-start justify-content-between"> + <div class="adv_fieldset_row" id="adv_global_addrow"> + <div class="d-flex align-items-start justify-content-between" style="height:3.5rem"> <button type="button" class="btn btn-opac btn-sm" id="myopac_new_global_row" onclick='addSearchRow()'> <i class="fas fa-plus-circle" aria-hidden="true"></i> [% l('Add Search Terms') %] </button> - <div id="adv_search_status" role="status"> + <div id="adv_search_status" role="status" style="margin-left:1rem"> [% # ARIA live announcements toggled by ariaStatus() in simple.js %] <div class="m-0 alert alert-warning d-none" id="aria-search-row-removed"> [% l('Search term logic group removed.'); %] @@ -35,7 +35,8 @@ </div> </div> <div class="row align-items-end"> - <div class="col-12 text-end"> + + <div class="mb-3 justify-content-between" style="margin-left: 1rem"> <input type="hidden" name="_adv" value="1" /> <input type="hidden" name="detail_record_view" value="[% show_detail_view %]"/> @@ -43,7 +44,9 @@ onclick='setTimeout(function(){$("search-submit-spinner-1").className=""; $("search-submit-go-1").className="hidden"; $("#adv_search_form").submit()}, 2000)'><i class="fas fa-search"></i> [% l("Submit") %]</button> <img id='search-submit-spinner-1' src='/opac/images/progressbar_green.gif[% ctx.cache_key %]' class='hidden' alt="[% l('Search in progress icon') %]"/> - </div> +<a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]" + class="btn btn-deny float-end"><i class="fas fa-ban"></i> [% l('Clear Form') %]</a> + </div> </div> <div class="addtl-search-filters"> <h3>[% l("Search Filters") %]</h3> @@ -179,14 +182,14 @@ <input type="hidden" name="detail_record_view" value="[% show_detail_view %]"/> - <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]" - class="btn btn-deny float-end"><i class="fas fa-ban"></i> [% l('Clear Form') %]</a> - <span> <button id='search-submit-go-2' type="submit" class="btn btn-confirm" onclick='setTimeout(function(){$("search-submit-spinner-2").className=""; $("search-submit-go-2").className="hidden"}, 2000)'><i class="fas fa-search"></i> [% l("Submit") %]</button> <img id='search-submit-spinner-2' src='/opac/images/progressbar_green.gif[% ctx.cache_key %]' class='hidden' alt="[% l('Search in progress icon') %]"/> </span> + + <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]" + class="btn btn-deny float-end"><i class="fas fa-ban"></i> [% l('Clear Form') %]</a> </div> </form> diff --git a/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 b/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 index 5d3b70924d..a5acd5ec2d 100644 --- a/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 +++ b/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 @@ -7,7 +7,7 @@ queries = CGI.param('query'); bools = CGI.param('bool'); qtypes = CGI.param('qtype'); - rowcount = 3; + rowcount = 2; # scalar.merge treats the scalar as a 1-item array WHILE queries.size < rowcount; queries = queries.merge(['']); END; @@ -20,43 +20,40 @@ q = queries.shift; %] <!-- tag the second row so the bool column won't be hidden --> -<fieldset class="adv_fieldset_row" [% IF loop.index == 1 %] id="adv_global_row"[% END %]> - <legend class="visually-hidden">[% l('Search filter set [_1]', loop.index + 1) %]</legend> +<fieldset class="adv_fieldset_row"> + [% # Legends and remove buttons will be numbered dynamically via JS; see reindexLegends() in simple.js %] + <legend class="sr-only visually-hidden">[% l('Search term group [_1]', loop.index + 1) %]</legend> + <div class="col-bool-operator"> - <!-- bool selector. hide for first row. safe to ignore first bool value in form submission --> - <select aria-label="[% l('Boolean search operator') %]" name='bool' - class="form-control w-auto [% IF loop.first %] invisible [% END %]" - [% IF loop.first %] aria-hidden="true" tabindex="-1" [% END %]> + <!-- bool selector. hide for first row. safe to ignore first bool value in form submission --> + <select aria-label="[% l('Boolean search operator') %]" + name='bool' class='form-control bool-operator'> <option value='and' [% b == 'and' ? 'selected="selected"' : '' %]>[% l('And') %]</option> <option value='or' [% b == 'or' ? 'selected="selected"' : '' %]>[% l('Or') %]</option> </select> </div> - - <!-- keyword, subject, etc. selector --> <div class="col-query-type"> - [% INCLUDE "opac/parts/course_search/qtype_selector.tt2" - query_type=qtype %] + <!-- keyword, subject, etc. selector --> + [% INCLUDE "opac/parts/course_search/qtype_selector.tt2" + query_type=qtype %] </div> - <div class="col-match"> - <select aria-label="[% l('Search phrase match strictness') %]" - name='contains' class="form-control w-auto mx-1"> - [% FOR o IN contains_options; -%] - <option value="[% o.value %]" [% c == o.value ? ' selected="selected"' : '' %]>[% o.label %]</option> - [% END %] + <select class='form-control w-100' aria-label="[% l('Search phrase match strictness') %]" + name='contains'> + [% FOR o IN contains_options; -%] + <option value="[% o.value %]" [% c == o.value ? ' selected="selected"' : '' %]>[% o.label %]</option> + [% END %] </select> </div> - <div class="col-term"> - <input aria-label="[% l('Search term') %]" class="form-control w-auto mx-1" - type='text' name='query' value="[% q | html %]" x-webkit-speech /> + <input class="form-control" aria-label="[% l('Search term') %]" + type='search' name='query' value="[% q | html %]" /> </div> - - <div class="col-row-remove"> - <button class="btn btn-remove btn-sm row-remover" onclick="removeSearchRows()"> - <i class="fas fa-times" aria-hidden="true" title="[% l('Remove filter set [_1]', loop.index + 1) %]"></i> - <span class="visually-hidden">[% l('Remove filter set [_1]', loop.index + 1) %]</span> + <div class="col-remove"> + <button type="button" class="btn btn-remove btn-sm row-remover" onclick="removeSearchRows(event)"> + <i class="fas fa-times" aria-hidden="true" title="[% l('Remove search term group [_1]', loop.index + 1) %]"></i> + <span class="visually-hidden">[% l('Remove search term group [_1]', loop.index + 1) %]</span> </button> </div> </fieldset> ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/course_search.tt2 | 34 +++++++++------- .../src/templates-bootstrap/opac/css/style.css.tt2 | 39 ++++++++++++------ .../opac/parts/advanced/global_row.tt2 | 2 +- .../opac/parts/advanced/search.tt2 | 34 ++++++++-------- Open-ILS/src/templates/opac/course_browse.tt2 | 2 +- .../opac/parts/course_search/global_row.tt2 | 47 ++++++++++------------ 6 files changed, 88 insertions(+), 70 deletions(-) hooks/post-receive -- Evergreen ILS