May 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch rel_3_14 updated. 0a83c6a889612bffdfb9ab0459ff81d49e1357a4
by Git User 19 May '25

19 May '25

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_14 has been updated via 0a83c6a889612bffdfb9ab0459ff81d49e1357a4 (commit) from 9180a919d72361c20cc58f1f94439437cbd7bded (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 0a83c6a889612bffdfb9ab0459ff81d49e1357a4 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 18 16:38:27 2025 +0000 LP2078713 Label for OPAC privacy waiver name field Adds a label tag for the Name field under "Allow others to use my account" in the OPAC search and history preferences. Release-note: Adds label to "Allow others to use my account" name input Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Dan Guarracino <dguarracino(a)owwl.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 index a0909bd514..eb40cacd63 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 @@ -153,8 +153,8 @@ </div> [% END %] <div> - <label class="form-label">[% l('Name:') %]</label> - <input type="textbox" class="form-control" name="waiver_name_new"/> + <label class="form-label" for="waiver_name_new">[% l('Name:') %]</label> + <input type="textbox" class="form-control" name="waiver_name_new" id="waiver_name_new"/> <div class="form-check w-100"> <input for="waiver_place_holds" type="checkbox" class="form-check-input" name="waiver_place_holds" id="waiver_place_holds" value="new"/> diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 index 146fae7ba0..52364bc1a5 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 @@ -152,7 +152,7 @@ [% END %] <br/> <div> - [% l('Name:') %] <input type="textbox" name="waiver_name_new"/><br/> + <label for="waiver_name_new">[% l('Name:') %]</label> <input type="textbox" name="waiver_name_new" id="waiver_name_new"/><br/> <label><input type="checkbox" name="waiver_place_holds" value="new"/>[% l('Place Holds') %]</label> <label><input type="checkbox" name="waiver_pickup_holds" value="new"/>[% l('Pick Up Holds') %]</label> <label><input type="checkbox" name="waiver_checkout_items" value="new"/>[% l('Check Out Items') %]</label> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 | 4 ++-- Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. b726e5a1f5d668ef5059b89232bba1a452084786
by Git User 19 May '25

19 May '25

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 b726e5a1f5d668ef5059b89232bba1a452084786 (commit) from 014bb049c0ed1e4265cf0d48197a3bc9bce0fb3b (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 b726e5a1f5d668ef5059b89232bba1a452084786 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 18 16:38:27 2025 +0000 LP2078713 Label for OPAC privacy waiver name field Adds a label tag for the Name field under "Allow others to use my account" in the OPAC search and history preferences. Release-note: Adds label to "Allow others to use my account" name input Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Elizabeth Davis <elizabeth.davis(a)sparkpa.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Dan Guarracino <dguarracino(a)owwl.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 index a0909bd514..eb40cacd63 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 @@ -153,8 +153,8 @@ </div> [% END %] <div> - <label class="form-label">[% l('Name:') %]</label> - <input type="textbox" class="form-control" name="waiver_name_new"/> + <label class="form-label" for="waiver_name_new">[% l('Name:') %]</label> + <input type="textbox" class="form-control" name="waiver_name_new" id="waiver_name_new"/> <div class="form-check w-100"> <input for="waiver_place_holds" type="checkbox" class="form-check-input" name="waiver_place_holds" id="waiver_place_holds" value="new"/> diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 index 146fae7ba0..52364bc1a5 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 @@ -152,7 +152,7 @@ [% END %] <br/> <div> - [% l('Name:') %] <input type="textbox" name="waiver_name_new"/><br/> + <label for="waiver_name_new">[% l('Name:') %]</label> <input type="textbox" name="waiver_name_new" id="waiver_name_new"/><br/> <label><input type="checkbox" name="waiver_place_holds" value="new"/>[% l('Place Holds') %]</label> <label><input type="checkbox" name="waiver_pickup_holds" value="new"/>[% l('Pick Up Holds') %]</label> <label><input type="checkbox" name="waiver_checkout_items" value="new"/>[% l('Check Out Items') %]</label> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 | 4 ++-- Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 9180a919d72361c20cc58f1f94439437cbd7bded
by Git User 19 May '25

19 May '25

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_14 has been updated via 9180a919d72361c20cc58f1f94439437cbd7bded (commit) via 291d3cf5a25f7ced290a8317fd51dcb72508b1a9 (commit) via f85797baaf9400ade217eb0137fab90021648d40 (commit) from 367ad7dee3c586f67f072e6a0f69ed5682677ffc (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 9180a919d72361c20cc58f1f94439437cbd7bded Author: Stephanie Leary <stephanie.leary(a)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(a)equinoxoli.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off-by: Terran McCanna <tmccanna(a)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 291d3cf5a25f7ced290a8317fd51dcb72508b1a9 Author: Stephanie Leary <stephanie.leary(a)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(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)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 f85797baaf9400ade217eb0137fab90021648d40 Author: Brian Kennedy <brian.kennedy(a)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(a)bc.libraries.coop> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)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" %] -  - <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" %] +  + <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" %]  - <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; %]  -<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"> -  - <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 %]> +  + <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> - -  <div class="col-query-type"> - [% INCLUDE "opac/parts/course_search/qtype_selector.tt2" - query_type=qtype %] +  + [% 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

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 5fce7551c00b50cd03dcb6a90d27c06793289ed8
by Git User 19 May '25

19 May '25

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(a)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(a)equinoxoli.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off-by: Terran McCanna <tmccanna(a)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(a)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(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)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(a)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(a)bc.libraries.coop> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)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" %] -  - <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" %] +  + <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" %]  - <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; %]  -<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"> -  - <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 %]> +  + <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> - -  <div class="col-query-type"> - [% INCLUDE "opac/parts/course_search/qtype_selector.tt2" - query_type=qtype %] +  + [% 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

1 0

[GIT] Evergreen ILS branch main updated. 014bb049c0ed1e4265cf0d48197a3bc9bce0fb3b
by Git User 19 May '25

19 May '25

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 014bb049c0ed1e4265cf0d48197a3bc9bce0fb3b (commit) via 55b03d2fb51001fba8431aad242e969743c8984f (commit) via 5c33804fe3f3c2e159d060f4ac8c19dca5bef8c0 (commit) from 1f5d2c8e0449423dfd3a80181e51d2ddb19f41eb (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 014bb049c0ed1e4265cf0d48197a3bc9bce0fb3b Author: Stephanie Leary <stephanie.leary(a)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(a)equinoxoli.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off-by: Terran McCanna <tmccanna(a)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 55b03d2fb51001fba8431aad242e969743c8984f Author: Stephanie Leary <stephanie.leary(a)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(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)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 5c33804fe3f3c2e159d060f4ac8c19dca5bef8c0 Author: Brian Kennedy <brian.kennedy(a)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(a)bc.libraries.coop> Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)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" %] -  - <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" %] +  + <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" %]  - <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; %]  -<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"> -  - <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 %]> +  + <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> - -  <div class="col-query-type"> - [% INCLUDE "opac/parts/course_search/qtype_selector.tt2" - query_type=qtype %] +  + [% 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

1 0

[GIT] Evergreen ILS branch main updated. 1f5d2c8e0449423dfd3a80181e51d2ddb19f41eb
by Git User 19 May '25

19 May '25

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 1f5d2c8e0449423dfd3a80181e51d2ddb19f41eb (commit) from 6493ac73e950a8d3bd682279a1f9bd7d129f301d (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 1f5d2c8e0449423dfd3a80181e51d2ddb19f41eb Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon May 19 18:14:53 2025 +0000 LP2111283 Fix button type on bib ID/TCN search In the recent updates to the bib ID/TCN search page, the revised form's button was lacking a type attribute. This makes it default to the 'submit' type, which is what was intended, but our lint rules require us to declare that explicitly. This adds the missing type="submit" attribute. Release-note: Adds a missing button type attribute to satisfy lint rules Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index 7cf4ac55f8..ba6a1ffa4f 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -29,7 +29,7 @@ (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> - <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()"> + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" type="submit"> <span *ngIf="!searchInProgress" i18n>Search</span> <span *ngIf="searchInProgress" i18n>Searching...</span> </button> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 367ad7dee3c586f67f072e6a0f69ed5682677ffc
by Git User 19 May '25

19 May '25

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_14 has been updated via 367ad7dee3c586f67f072e6a0f69ed5682677ffc (commit) from 90c480e3dffc916e862ae4d1e45ef4e8f8bcba66 (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 367ad7dee3c586f67f072e6a0f69ed5682677ffc Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon May 19 18:14:53 2025 +0000 LP2111283 Fix button type on bib ID/TCN search In the recent updates to the bib ID/TCN search page, the revised form's button was lacking a type attribute. This makes it default to the 'submit' type, which is what was intended, but our lint rules require us to declare that explicitly. This adds the missing type="submit" attribute. Release-note: Adds a missing button type attribute to satisfy lint rules Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index 7cf4ac55f8..ba6a1ffa4f 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -29,7 +29,7 @@ (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> - <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()"> + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" type="submit"> <span *ngIf="!searchInProgress" i18n>Search</span> <span *ngIf="searchInProgress" i18n>Searching...</span> </button> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 793faca5381f2d65914a7f96856e0079f9ba0617
by Git User 19 May '25

19 May '25

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 793faca5381f2d65914a7f96856e0079f9ba0617 (commit) from 99c30adb72a1c9755d5f74f9e2383d2b77a4bfff (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 793faca5381f2d65914a7f96856e0079f9ba0617 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon May 19 18:14:53 2025 +0000 LP2111283 Fix button type on bib ID/TCN search In the recent updates to the bib ID/TCN search page, the revised form's button was lacking a type attribute. This makes it default to the 'submit' type, which is what was intended, but our lint rules require us to declare that explicitly. This adds the missing type="submit" attribute. Release-note: Adds a missing button type attribute to satisfy lint rules Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html index 7cf4ac55f8..ba6a1ffa4f 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html @@ -29,7 +29,7 @@ (keyup.enter)="search()" [(ngModel)]="identValue" formControlName="bibIdentValue" class="form-control mx-2 w-auto" aria-describedby="bib-ident-status" /> - <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()"> + <button class="btn btn-primary" [disabled]="searchInProgress" (click)="search()" type="submit"> <span *ngIf="!searchInProgress" i18n>Search</span> <span *ngIf="searchInProgress" i18n>Searching...</span> </button> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/bib-by-ident.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 7295cd04d79ceb20734e107970c83a206f80549b
by Git User 19 May '25

19 May '25

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_13 has been updated via 7295cd04d79ceb20734e107970c83a206f80549b (commit) from 43bdf904a6af6d631014f9301628a5dd974f808d (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 7295cd04d79ceb20734e107970c83a206f80549b Author: Jason Stephenson <jason(a)sigio.com> Date: Fri Aug 14 12:42:24 2020 -0400 LP 1890629: Make Self-Registration Opt-in Settings Lookup Tree Aware Patron self-registration in the OPAC only shows the opt-in settings if the events are owned specifically at one of the locations where patron self-registration is also allowed. The event could be owned higher up the org. tree from the libraries that allow self-registration, particularly in a consortium where not all members do self-registration. This patch changes the search for opt-in events to include the ancestor org. units of those that allow self-registration. Release-note: Makes patron self-registration aware of org unit tree. Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm index 4949d10073..99b692bad5 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm @@ -6,6 +6,7 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Application::AppUtils; use OpenILS::Utils::CStoreEditor qw/:funcs/; use OpenILS::Event; +use List::MoreUtils qw/uniq/; use Data::Dumper; $Data::Dumper::Indent = 0; my $U = 'OpenILS::Application::AppUtils'; @@ -135,13 +136,20 @@ sub collect_opt_in_settings { my $self = shift; my $e = $self->editor; + # Get the valid_orgs and their ancestors, because the event def + # may be owned higher up the tree. + my @opt_orgs = (); + for my $orgs (map { $U->get_org_ancestors($_) } @{ $self->ctx->{register}{valid_orgs} }) { + push(@opt_orgs, @{$orgs}); + } + my $types = $e->json_query({ select => {cust => ['name']}, from => {atevdef => 'cust'}, transform => 'distinct', where => { '+atevdef' => { - owner => [ map { $_ } @{ $self->ctx->{register}{valid_orgs} } ], + owner => [ uniq @opt_orgs ], active => 't' } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 90c480e3dffc916e862ae4d1e45ef4e8f8bcba66
by Git User 19 May '25

19 May '25

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_14 has been updated via 90c480e3dffc916e862ae4d1e45ef4e8f8bcba66 (commit) from 03b9783eaed54a5f64f30b6f720ffdd3a7e89d7b (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 90c480e3dffc916e862ae4d1e45ef4e8f8bcba66 Author: Jason Stephenson <jason(a)sigio.com> Date: Fri Aug 14 12:42:24 2020 -0400 LP 1890629: Make Self-Registration Opt-in Settings Lookup Tree Aware Patron self-registration in the OPAC only shows the opt-in settings if the events are owned specifically at one of the locations where patron self-registration is also allowed. The event could be owned higher up the org. tree from the libraries that allow self-registration, particularly in a consortium where not all members do self-registration. This patch changes the search for opt-in events to include the ancestor org. units of those that allow self-registration. Release-note: Makes patron self-registration aware of org unit tree. Signed-off-by: Jason Stephenson <jason(a)sigio.com> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm index c3530334ea..2cb875e217 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm @@ -6,6 +6,7 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Application::AppUtils; use OpenILS::Utils::CStoreEditor qw/:funcs/; use OpenILS::Event; +use List::MoreUtils qw/uniq/; use Data::Dumper; $Data::Dumper::Indent = 0; my $U = 'OpenILS::Application::AppUtils'; @@ -142,13 +143,20 @@ sub collect_opt_in_settings { my $self = shift; my $e = $self->editor; + # Get the valid_orgs and their ancestors, because the event def + # may be owned higher up the tree. + my @opt_orgs = (); + for my $orgs (map { $U->get_org_ancestors($_) } @{ $self->ctx->{register}{valid_orgs} }) { + push(@opt_orgs, @{$orgs}); + } + my $types = $e->json_query({ select => {cust => ['name']}, from => {atevdef => 'cust'}, transform => 'distinct', where => { '+atevdef' => { - owner => [ map { $_ } @{ $self->ctx->{register}{valid_orgs} } ], + owner => [ uniq @opt_orgs ], active => 't' } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0