From 04cbfdbdf1ad2052bce0a8b342d6d2f02378e893 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 8 Sep 2020 12:29:58 -0400 Subject: [PATCH] LP#1778972: Tweaks and fixes to Bootstrap 4 template - Add "aria-hidden" to Font Awesome icons as recommended by Font Awesome for accessibility. - Minor changes to the color scheme. - Some adjustments to the way alignment is defined: Bootstrap 4 classes like "text-center" can be an impediment to customization because they use "!important." I've removed many instances of such classes in favor of putting alignment in CSS. - Ajustments to responsive behavior. I've made some changes to grid class definitions to improve flexibility of layouts at various browser widths. - Whitespace and other typo corrections. I've worked to remove trailing whitespace and replace tabs with spaces. Signed-of-by: Owen Leonard Signed-off-by: Galen Charlton Signed-off-by: Jane Sandberg --- .../src/templates-bootstrap/opac/ReadMe.txt | 2 +- .../src/templates-bootstrap/opac/advanced.tt2 | 8 +- .../src/templates-bootstrap/opac/browse.tt2 | 42 +- .../opac/css/mediaQuery.css.tt2 | 206 +++---- .../opac/css/style.css.tt2 | 505 +++++++++++------- .../src/templates-bootstrap/opac/home.tt2 | 4 +- .../src/templates-bootstrap/opac/login.tt2 | 2 +- .../src/templates-bootstrap/opac/mylist.tt2 | 4 +- .../templates-bootstrap/opac/mylist/clear.tt2 | 8 +- .../templates-bootstrap/opac/mylist/email.tt2 | 10 +- .../templates-bootstrap/opac/mylist/print.tt2 | 8 +- .../opac/myopac/circ_history.tt2 | 20 +- .../templates-bootstrap/opac/myopac/circs.tt2 | 40 +- .../opac/myopac/hold_history.tt2 | 7 +- .../templates-bootstrap/opac/myopac/holds.tt2 | 67 +-- .../opac/myopac/holds/edit.tt2 | 32 +- .../opac/myopac/list/update.tt2 | 8 +- .../templates-bootstrap/opac/myopac/lists.tt2 | 91 ++-- .../templates-bootstrap/opac/myopac/main.tt2 | 6 +- .../opac/myopac/main_pay.tt2 | 8 +- .../opac/myopac/main_payment_form.tt2 | 54 +- .../opac/myopac/main_payments.tt2 | 12 +- .../opac/myopac/messages/list.tt2 | 30 +- .../opac/myopac/messages/single_message.tt2 | 10 +- .../templates-bootstrap/opac/myopac/prefs.tt2 | 48 +- .../opac/myopac/prefs_my_lists.tt2 | 6 +- .../opac/myopac/prefs_notify.tt2 | 16 +- .../opac/myopac/prefs_settings.tt2 | 14 +- .../opac/myopac/update_email.tt2 | 4 +- .../opac/myopac/update_username.tt2 | 6 +- .../opac/parts/advanced/expert.tt2 | 6 +- .../opac/parts/advanced/global_row.tt2 | 5 +- .../opac/parts/advanced/numeric.tt2 | 10 +- .../opac/parts/advanced/search.tt2 | 33 +- .../opac/parts/anon_list.tt2 | 45 +- .../templates-bootstrap/opac/parts/base.tt2 | 16 +- .../opac/parts/bookbag_actions.tt2 | 8 +- .../opac/parts/cart_nav.tt2 | 16 +- .../opac/parts/check_value_selector.tt2 | 10 +- .../opac/parts/chilifresh.tt2 | 4 +- .../opac/parts/coded_value_selector.tt2 | 12 +- .../opac/parts/config-fresh.tt2 | 4 +- .../templates-bootstrap/opac/parts/config.tt2 | 4 +- .../opac/parts/css/colors.tt2 | 46 +- .../opac/parts/css/fonts.tt2 | 2 +- .../opac/parts/filter_group_selector.tt2 | 4 +- .../opac/parts/filtersort.tt2 | 4 +- .../templates-bootstrap/opac/parts/footer.tt2 | 25 +- .../opac/parts/goog_analytics.tt2 | 4 +- .../templates-bootstrap/opac/parts/header.tt2 | 16 +- .../opac/parts/hold_status.tt2 | 2 +- .../opac/parts/homesearch.tt2 | 8 +- .../src/templates-bootstrap/opac/parts/js.tt2 | 10 +- .../opac/parts/library/core_info.tt2 | 8 +- .../opac/parts/library_name_link.tt2 | 8 +- .../opac/parts/library_name_link_from_ou.tt2 | 4 +- .../opac/parts/locale_picker.tt2 | 4 +- .../opac/parts/login/form.tt2 | 16 +- .../opac/parts/login/help.tt2 | 8 +- .../opac/parts/login/login_modal.tt2 | 56 +- .../opac/parts/metarecord_hold_filters.tt2 | 12 +- .../opac/parts/misc_util.tt2 | 50 +- .../opac/parts/myopac/base.tt2 | 74 +-- .../opac/parts/myopac/column_sort_support.tt2 | 4 +- .../opac/parts/myopac/main_base.tt2 | 2 +- .../opac/parts/org_selector.tt2 | 26 +- .../opac/parts/place_hold.tt2 | 80 +-- .../opac/parts/place_hold_result.tt2 | 31 +- .../opac/parts/pref_lib_display.tt2 | 4 +- .../opac/parts/preserve_params.tt2 | 2 +- .../opac/parts/qtype_selector.tt2 | 3 +- .../opac/parts/record/addedcontent.tt2 | 16 +- .../opac/parts/record/authors.tt2 | 18 +- .../opac/parts/record/awards.tt2 | 8 +- .../opac/parts/record/cnbrowse.tt2 | 41 +- .../opac/parts/record/contents.tt2 | 2 +- .../opac/parts/record/copy_counts.tt2 | 2 +- .../opac/parts/record/copy_table.tt2 | 90 ++-- .../opac/parts/record/extras.tt2 | 30 +- .../opac/parts/record/issues-mfhd.tt2 | 2 +- .../opac/parts/record/navigation.tt2 | 40 +- .../opac/parts/record/refworks.tt2 | 6 +- .../opac/parts/record/series.tt2 | 10 +- .../opac/parts/record/subjects.tt2 | 4 +- .../opac/parts/record/summary.tt2 | 76 +-- .../opac/parts/record/summaryplus.tt2 | 6 +- .../opac/parts/result/adv_filter.tt2 | 4 +- .../opac/parts/result/copy_counts.tt2 | 2 +- .../opac/parts/result/facets-hz.tt2 | 34 +- .../opac/parts/result/facets.tt2 | 42 +- .../opac/parts/result/lowhits.tt2 | 30 +- .../opac/parts/result/paginate.tt2 | 16 +- .../opac/parts/result/table.tt2 | 98 ++-- .../opac/parts/searchbar.tt2 | 75 +-- .../opac/parts/staff_saved_searches.tt2 | 12 +- .../templates-bootstrap/opac/parts/topnav.tt2 | 6 +- .../opac/parts/topnav_links.tt2 | 58 +- .../opac/parts/topnav_subnav.tt2 | 55 +- .../opac/password_reset.tt2 | 20 +- .../templates-bootstrap/opac/place_hold.tt2 | 2 +- .../src/templates-bootstrap/opac/record.tt2 | 2 +- .../templates-bootstrap/opac/record/email.tt2 | 17 +- .../src/templates-bootstrap/opac/register.tt2 | 44 +- .../src/templates-bootstrap/opac/results.tt2 | 95 ++-- .../templates-bootstrap/opac/temp_warn.tt2 | 2 +- 105 files changed, 1534 insertions(+), 1395 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt b/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt index 5fd954adf0..104815f91d 100644 --- a/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt +++ b/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt @@ -9,7 +9,7 @@ /////////////////////TOOLTIPS/////////////////////////////////////////// - + - +

[% l('Catalog') %]

@@ -66,7 +66,7 @@ [% END;%]

[% l('Additional Resources') %]

[% INCLUDE 'opac/parts/footer.tt2' %] - + [% INCLUDE 'opac/parts/js.tt2' %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 index e3a0eda8c3..f54b472241 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 @@ -42,7 +42,7 @@ # mkurl('http://flarg.baz/squz', {foo => 'bar', boo => ['baz', 'faz']}); # # New page, clear all existing params before applying new ones: - # mkurl('/fuz/buster', {foo => 'bar', boo => 'baz'}, 1); + # mkurl('/fuz/buster', {foo => 'bar', boo => 'baz'}, 1); # # Current page, clear 'some_param' from the existing params: # mkurl('', {foo => 'bar', boo => 'baz'}, ['some_param']); @@ -66,10 +66,10 @@ cgi.delete('move_cart_by_default'); cgi.delete('cart_none_selected'); cgi.delete('list_none_selected'); - - # x and y are artifacts of using tags + + # x and y are artifacts of using tags # instead of true submit buttons, and their values are never used. - cgi.delete('x', 'y'); + cgi.delete('x', 'y'); # apply user params FOR k IN params.keys; @@ -144,10 +144,10 @@ # the full HTML attribute key="value" is produced MACRO html_text_attr(name, value) BLOCK; IF value.length >= 75; - value = value.substr(71, value.length, '...'); - END; - value = value.replace('\s*$', ''); # remove trailing whitespace - HTML.attributes($name => value); + value = value.substr(71, value.length, '...'); + END; + value = value.replace('\s*$', ''); # remove trailing whitespace + HTML.attributes($name => value); END; MACRO img_alt(text) BLOCK; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 index f2eb5e68e7..bb7f6cd2f6 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 @@ -1,5 +1,5 @@ [% BLOCK get_hold_status %] -
+
[% IF hold.hold.status == 4 %] [% l("Available") %] [% IF ahr.shelf_expire_time %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 index 721c0604b9..e79cfb3c56 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 @@ -1,4 +1,6 @@ - + +[%- + PROCESS "opac/parts/css/colors.tt2"; +%] + [% PROCESS carousels %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 index 8ddf1a6471..488c95b412 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 @@ -1,6 +1,6 @@ - + [% INCLUDE "opac/i18n_strings.tt2" %] @@ -65,7 +65,7 @@ [% FOR summary IN ctx.mfhd_summaries %] [% IF summary.sre_id != -1 %] { - 'id' : '[% summary.sre_id %]', + 'id' : '[% summary.sre_id %]', 'label' : '[% summary.location | replace("'", "\\'") %]', 'entryNum' : [% loop.index %], 'owning_lib' : '[% summary.owning_lib %]' @@ -141,7 +141,7 @@ [% INCLUDE "opac/parts/acjs.tt2" IF ctx.page == 'record' %] [% IF ctx.page == 'advanced' %] - [% END %] @@ -180,10 +180,10 @@ var aou_hash = { - + - + -[% END; %] -[% END; %] +[% END %] +[% END %]
[% END -%] [% END -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 index be7abb9f72..15bc33678a 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 @@ -1,36 +1,36 @@ [% WRAPPER "opac/parts/base.tt2" %] [% myopac_pages = [ - {children => 0, parent => "parent",url => "main", text => l("Home"), name => l("Account Summary")}, + {children => 0, parent => "parent",url => "main", text => l(" Home"), name => l("Account Summary")}, - {children => 2, parent => "parent",url => "charges", text => l("[_1]Charges", money(ctx.user_stats.fines.balance_owed)), name => l("Charges")}, - {children => 0, parent => "charges",url => "charges", text => l("Current Charges"), name => l("Current Charges")}, - {children => 0, parent => "charges",url => "main_payments", text => l("Payment History"), name => l("Payment History")}, + {children => 2, parent => "parent",url => "charges", text => l(" [_1]Charges", money(ctx.user_stats.fines.balance_owed)), name => l("Charges")}, + {children => 0, parent => "charges",url => "charges", text => l(" Current Charges"), name => l("Current Charges")}, + {children => 0, parent => "charges",url => "main_payments", text => l(" Payment History"), name => l("Payment History")}, - {children => 0, parent => "parent", url => "messages", text => l("[_1]Messages", ctx.user_stats.messages.unread), name => l("Messages")}, + {children => 0, parent => "parent", url => "messages", text => l(" [_1]Messages", ctx.user_stats.messages.unread), name => l("Messages")}, - {children => 3, parent => "parent",url => "circs", text => l("[_1]Items Checked Out", ctx.user_stats.checkouts.total_out), name = l("Circulations")}, - {children => 0, parent => "circs", url => "circs", text => l("Current Items Checked Out"), name=> l("Circulations")}, - {children => 0, parent => "circs", url => "ebook_circs", text => l("E-Items Currently Checked Out"), name => l("E-Items Currently Checked Out")}, - {children => 0, parent => "circs", url => "circ_history", text => l("Check Out History"), name => l("Check Out History")}, + {children => 3, parent => "parent",url => "circs", text => l(" [_1]Items Checked Out", ctx.user_stats.checkouts.total_out), name = l("Circulations")}, + {children => 0, parent => "circs", url => "circs", text => l(" Current Items Checked Out"), name=> l("Circulations")}, + {children => 0, parent => "circs", url => "ebook_circs", text => l(" E-Items Currently Checked Out"), name => l("E-Items Currently Checked Out")}, + {children => 0, parent => "circs", url => "circ_history", text => l(" Check Out History"), name => l("Check Out History")}, - {children => 4, parent => "parent",url => "holds", text => l("[_1]Holds / [_2] Ready", ctx.user_stats.holds.total, ctx.user_stats.holds.ready), name => l("Holds")}, - {children => 0, parent => "holds", url => "holds", text => l("Items on Hold"), name => l("Holds")}, - {children => 0, parent => "holds", url => "ebook_holds", text => l("E-Items on Hold"), name => l("E-Items on Hold")}, - {children => 0, parent => "holds", url => "ebook_holds_ready", text => l(" E-Items Ready for Checkout"), name => l("E-Items Ready for Checkout")}, - {children => 0, parent => "holds", url => "hold_history", text => l("Holds History"), name => l("Holds History")}, + {children => 4, parent => "parent",url => "holds", text => l(" [_1]Holds / [_2] Ready", ctx.user_stats.holds.total, ctx.user_stats.holds.ready), name => l("Holds")}, + {children => 0, parent => "holds", url => "holds", text => l(" Items on Hold"), name => l("Holds")}, + {children => 0, parent => "holds", url => "ebook_holds", text => l(" E-Items on Hold"), name => l("E-Items on Hold")}, + {children => 0, parent => "holds", url => "ebook_holds_ready", text => l(" E-Items Ready for Checkout"), name => l("E-Items Ready for Checkout")}, + {children => 0, parent => "holds", url => "hold_history", text => l(" Holds History"), name => l("Holds History")}, - {children => 4, parent => "parent", url => "prefs", text => l("Preferences"),name => l("Preferences")}, - {children => 0, parent => "prefs", url => "prefs", text => l("Personal Information"), name => l("Preferences")}, - {children => 0, parent => "prefs", url => "prefs_notify", text => l("Notifications"), name => l("Notifications")}, - {children => 0, parent => "prefs", url => "prefs_settings", text => l("Search & History"), name => l("Search & History")}, - {children => 0, parent => "prefs", url => "prefs_my_lists", text => l("Lists"), name => l("Lists")}, + {children => 4, parent => "parent", url => "prefs", text => l(" Preferences"),name => l("Preferences")}, + {children => 0, parent => "prefs", url => "prefs", text => l(" Personal Information"), name => l("Preferences")}, + {children => 0, parent => "prefs", url => "prefs_notify", text => l(" Notifications"), name => l("Notifications")}, + {children => 0, parent => "prefs", url => "prefs_settings", text => l(" Search & History"), name => l("Search & History")}, + {children => 0, parent => "prefs", url => "prefs_my_lists", text => l(" Lists"), name => l("Lists")}, - - {children => 0, parent => "parent", url => "lists", text => l("My Lists"), name => l("My Lists")} + + {children => 0, parent => "parent", url => "lists", text => l(" My Lists"), name => l("My Lists")} ]; IF (ctx.show_reservations_tab == 'true'); - myopac_pages.push({children => 0, parent => "parent", url => "reservations", text => l(" Reservations"), name => l("Reservations")}); + myopac_pages.push({children => 0, parent => "parent", url => "reservations", text => l(" Reservations"), name => l("Reservations")}); END; skin_root = "../" %] @@ -40,12 +40,13 @@
[% INCLUDE "opac/parts/searchbar.tt2" %]
- -
-
-
+
+
+
+
+
- + [%- FOREACH page IN myopac_pages; IF page.url == myopac_page || page.url == parent; active = "active"; @@ -53,13 +54,13 @@ ELSE; active = ""; END -%] - + [% IF page.parent == "parent" && page.children > 0; %] -
+
- +
[%- FOREACH child IN myopac_pages; -%] [% IF child.parent == page.url; @@ -80,21 +81,22 @@
[% ELSIF page.parent == "parent"; %] - + [% page.text; %] - + [% END %] [% END %] +
-
+
[% content %] - +
- - + + [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/column_sort_support.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/column_sort_support.tt2 index 6d5ba47ce7..ab934b8a4c 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/column_sort_support.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/column_sort_support.tt2 @@ -1,4 +1,4 @@ -[%# Produce a URL for a given field that cycles for sorting from +[%# Produce a URL for a given field that cycles for sorting from "nothing" to "ascending" to "descending" then back to "nothing". %] [% MACRO sort_url(field) @@ -29,7 +29,7 @@ %] [%# Column headers for sortable columns %] -[% MACRO sort_head(field, field_label) +[% MACRO sort_head(field, field_label) BLOCK %] [% l(field_label) %][%- sort_indicator(field) %] [% END diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 index 05b3efca52..f63e4227b3 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 @@ -2,7 +2,7 @@ PROCESS "opac/parts/misc_util.tt2"; WRAPPER "opac/parts/myopac/base.tt2"; - + %] [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/org_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/org_selector.tt2 index d37f99a4e7..e368399678 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/org_selector.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/org_selector.tt2 @@ -1,6 +1,6 @@ [% # Org Unit Selector Widget : -# INCLUDE build_org_selector id='selector-id' name='selector-name' +# INCLUDE build_org_selector id='selector-id' name='selector-name' # value=org_id show_loc_groups=1/0 can_have_vols_only=1/0 # can_have_users_only=1/0 valid_org_list=[1,2,3] # @@ -14,24 +14,24 @@ BLOCK build_org_selector; node_stack = [{org => org_unit || ctx.aouct_tree || ctx.aou_tree}]; inherited_vis = ctx.get_cgf('opac.org_unit.non_inherited_visibility').enabled == 'f'; - IF !name; + IF !name; name = loc_name; END; IF !value; value = loc_value; END; - # if the selected org unit is out of hiding scope, + # if the selected org unit is out of hiding scope, # disable the ou-hide scoping altogether. hiding_disabled = ctx.org_hiding_disabled(value); -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 index 89ca80067d..419e7c1069 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 @@ -15,11 +15,11 @@ function toggleActivationDate() { // Check for not equal to block so it works on first click. if (block.style.display != "block") { block.style.display = "block"; - anchor.innerHTML = " " + actText; + anchor.innerHTML = " " + actText; if (cb.checked != true) cb.checked = true; } else { block.style.display = "none"; - anchor.innerHTML = " " + inActText; + anchor.innerHTML = " " + inActText; } // Prevent the href from being followed, thus overriding the CSS. return false; @@ -68,13 +68,13 @@ function maybeToggleNumCopies(obj) { ELSE; some_holds_allowed = 1; END; END %] - [% IF loop.first %] + [% IF loop.first %]
- [% + [% redirect = CGI.param('hold_source_page') || CGI.param('redirect_to') || CGI.referer; # since we have to be logged in to get this far, return to a secure page - redirect = redirect.replace('^http:', 'https:') + redirect = redirect.replace('^http:', 'https:') %] @@ -106,11 +106,11 @@ function maybeToggleNumCopies(obj) { - + onkeydown="return debounce_barcode_change(event)" autofocus />
[% END %] - - - - - [% l('Set activation date') %] + + + + + [% l('Set activation date') %]
- + [% IF CGI.param('from_basket') %] - +
[% END %] - [% IF NOT metarecords.disabled AND ctx.hold_data.size == 1 %] + [% IF NOT metarecords.disabled AND ctx.hold_data.size == 1 %] [% IF CGI.param('hold_type') == 'T' AND hdata.record.metarecord AND !hdata.part_required %] [% bre_id = hdata.target.id %] - + [% l('Advanced Hold Options') %] [% END %] [% IF CGI.param('hold_type') == 'M' AND CGI.param('bre_id') %] - + [% l('Basic Hold Options') %] [% END %] [% IF hdata.metarecord_filters.formats.size OR # should this be size > 1 @@ -316,7 +316,7 @@ function maybeToggleNumCopies(obj) {
[% END # some_holds_allowed %] - +
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 index a32781f4fc..6f2597d8e3 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 @@ -31,7 +31,7 @@ function disable_submit() { PROCESS get_marc_attrs args=attrs %] - [% + [% override = 0; IF hdata.could_override || hdata.hold_local_alert; override_possible = 1; @@ -39,21 +39,21 @@ function disable_submit() { END; %] [% IF override %] - - [% END %] + checked='checked' /> + [% END %] - + [% IF hdata.parts %] [% END %] - + [% IF hdata.hold_success %]
[% l("Hold was successfully placed for: "); %]
- [% + [% title = attrs.title_extended; IF hdata.selected_part AND hdata.parts AND hdata.parts.size > 0; FOREACH part IN hdata.parts; @@ -63,18 +63,18 @@ function disable_submit() { END; END; %] - +

[% title | html %]

[% IF hdata.frozen %] - + [% l("Hold is suspended") %] [% IF hdata.thaw_date %]
[% l("Reactivate on [_1]", date.format(ctx.parse_datetime(hdata.thaw_date), DATE_FORMAT)); END %] - + [% END %]
[% IF ctx.is_staff %] @@ -146,17 +146,16 @@ function disable_submit() { [% |l %]You have permission to override some of the failed holds. Click Submit to override and place your hold on the selected items.[% END %]
- + [% END %] - - [% IF any_failures OR ctx.general_hold_error %] - [% l('Back To Search') %] - [% l('Cancel') %] + [% IF any_failures OR ctx.general_hold_error %] + [% l('Back To Search') %] + [% l('Cancel') %] [% ELSE %]
- [% l('Back To Search') %] + [% l('Back To Search') %] [% IF ctx.is_staff %] [% IF CGI.param('hold_type') == 'C'; hold_type_label = l('copy'); diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/pref_lib_display.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/pref_lib_display.tt2 index 9fe7d9cecf..951de0318e 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/pref_lib_display.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/pref_lib_display.tt2 @@ -2,6 +2,6 @@ [% l('Preferred library: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); IF NOT ctx.is_staff %][% l('?') %][% END; %] + %]" class="preflib_change" title="[% l("Change preferred library"); %]">[% l('?') %][% END %] -[%- END; %] +[%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/preserve_params.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/preserve_params.tt2 index 3517f58e31..41eafb0750 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/preserve_params.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/preserve_params.tt2 @@ -1,4 +1,4 @@ -[%- +[%- UNLESS params; params = ['locg', 'loc', 'query', 'qtype', 'sort']; END; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/qtype_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/qtype_selector.tt2 index 9e9a2bcc33..ecb7e0e980 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/qtype_selector.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/qtype_selector.tt2 @@ -13,7 +13,8 @@ END; -%] - [% query_type = query_type || CGI.param('qtype') || search.default_qtypes.0; FOR qt IN query_types; NEXT IF browse_only AND NOT qt.browse -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/addedcontent.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/addedcontent.tt2 index 131e56cc8e..05f640d0b1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/addedcontent.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/addedcontent.tt2 @@ -1,6 +1,6 @@ -
+
-[% +[% ac_types = { reviews => l('Reviews'), anotes => l('Author Notes'), @@ -10,19 +10,19 @@ }; selected_type = CGI.param('ac'); - + # For each type of added content, render the link if it's known to have - # content, do not render the link if it's known to not have content. If + # content, do not render the link if it's known to not have content. If # the content status is unknown, render the link, but hide the link via CSS # if dojo is enabled. If dojo is not enabled, render and display the link. %]
- [% + [% all_hidden = 1; FOR type IN ac_types.keys; tab_class = 'ac_tab'; - SET tab_class = tab_class _ ' ac_tab_selected' IF type == selected_type; + SET tab_class = tab_class _ ' ac_tab_selected' IF type == selected_type; IF ctx.added_content.$type.status != '2'; # no content all_hidden = 0; IF ctx.added_content.$type.status == '3' AND want_dojo; # status unknown @@ -37,8 +37,8 @@
- [% - IF selected_type; + [% + IF selected_type; content = ctx.added_content.$selected_type.content; IF content; content; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/authors.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/authors.tt2 index 25dac9a5cc..3f5243a886 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/authors.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/authors.tt2 @@ -1,23 +1,23 @@ -[%- +[%- PROCESS "opac/parts/relators.tt2"; author_cnt = 0; authors = [ { - type => 'author', + type => 'author', label => l('Author'), xpath => '//*[@tag="100"]|//*[@tag="110"]|//*[@tag="111"]' }, { - type => 'added', + type => 'added', label => l('Added Author'), xpath => '//*[@tag="700"]|//*[@tag="710"]|//*[@tag="711"]' }, { - type => 'cast', + type => 'cast', label => l('Cast'), xpath => '//*[@tag="511"][@ind1="1"]' }, { - type => 'notes', + type => 'notes', label => l('Author Notes: '), xpath => '' # Comes from added content... } @@ -111,10 +111,10 @@ BLOCK build_author_links; END; END; url = mkurl(ctx.opac_root _ '/results', {query => qterm.replace('^\s*(.*?)\s*$', '$1'), qtype => 'author'}, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms)); - tlabel = tlabels.join(', '); - tlabels = []; + tlabel = tlabels.join(', '); + tlabels = []; author_type = (tlabel || label) | html; - + # schema.org changes IF type == 'author'; IF tag.substr(1,2) == '10' && args.schema.itemtype && args.schema.itemtype.match('MusicAlbum'); @@ -180,7 +180,7 @@ END;
[%- FOREACH author IN authors; - NEXT UNLESS author.xpath; + NEXT UNLESS author.xpath; authlist = []; PROCESS build_author_links( xpath=author.xpath, label=author.label, type=author.type diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/awards.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/awards.tt2 index 1e8183339e..84226570b9 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/awards.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/awards.tt2 @@ -1,7 +1,7 @@ -
+
- [% IF ENV.OILS_CHILIFRESH_URL %] + [% IF ENV.OILS_CHILIFRESH_URL %] [% l('Patron Reviews:') %]
@@ -9,7 +9,7 @@
[% END %] - [% IF ENV.OILS_NOVELIST_URL %] + [% IF ENV.OILS_NOVELIST_URL %]

[% l('Loading Recommendations...') %]

@@ -18,6 +18,6 @@
[% END %] - +
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 index 4e5d6e3b16..73cf33b642 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 @@ -1,26 +1,31 @@ -[% +[% cnoffset = CGI.param('cnoffset'); cnoffset = cnoffset.match('^-?\d+$') ? cnoffset : 0; # verify cnoffset is a sane value %]
-
+

[% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]

-
- - - - - - + +
+
+ [% l("<< Previous Page") %] +
+ +
+

[% l("Shelf Browser") %]

+
+ +
+ [% l("Next Page >>") %] +
+
+ +
+ +
- [% l("<< Previous Page") %] - [% l("Shelf Browser") %] - [% l("Next Page >>") %] -
[%- tr_open = 0; PROCESS get_library; @@ -29,11 +34,11 @@ [% END -%] [% END %] - [%- IF has_parts == 'true' %] @@ -115,7 +115,7 @@ END; # FOREACH bib [% IF ctx.is_staff %] [%- IF ctx.is_browser_staff %] [% l('view') %] - [% IF ctx.has_perm('UPDATE_COPY', copy_info.circ_lib) + [% IF ctx.has_perm('UPDATE_COPY', copy_info.circ_lib) OR ctx.has_perm('UPDATE_COPY', copy_info.call_number_owning_lib) %] | [% l('edit') %] @@ -124,10 +124,10 @@ END; # FOREACH bib [% l('view') %] [%# if the user can edit copies, show the copy edit link %] - [% IF ctx.has_perm('UPDATE_COPY', copy_info.circ_lib) + [% IF ctx.has_perm('UPDATE_COPY', copy_info.circ_lib) OR ctx.has_perm('UPDATE_COPY', copy_info.call_number_owning_lib) %] | - [% l(' edit') %] @@ -145,13 +145,13 @@ END; # FOREACH bib [% copy_info.age_protect ? ctx.get_crahp(copy_info.age_protect).name : l('None') | html %] - [%- END %] @@ -274,46 +274,44 @@ END; # FOREACH bib [%- END; # FOR copy_info %] - [%- IF ctx.copy_offset > 0 AND NOT serial_holdings; - new_offset = ctx.copy_offset - ctx.copy_limit; + [%- IF ctx.copy_offset > 0 AND NOT serial_holdings; + new_offset = ctx.copy_offset - ctx.copy_limit; IF new_offset < 0; new_offset = 0; END %] [%- IF copies.size >= ctx.copy_limit AND NOT serial_holdings AND (ctx.copy_offset + ctx.copy_limit < total_copies) %] - - [%- IF ctx.copy_offset > 0 AND NOT serial_holdings; - new_offset = ctx.copy_offset - ctx.copy_limit; - IF new_offset < 0; new_offset = 0; END %] - + [%- IF ctx.copy_offset > 0 AND NOT serial_holdings; + new_offset = ctx.copy_offset - ctx.copy_limit; + IF new_offset < 0; new_offset = 0; END %] + - [%- END %] - [%- IF copies.size >= ctx.copy_limit AND NOT serial_holdings AND (ctx.copy_offset + ctx.copy_limit < total_copies) %] - + [%- END %] + [%- IF copies.size >= ctx.copy_limit AND NOT serial_holdings AND (ctx.copy_offset + ctx.copy_limit < total_copies) %] + - [%- END %] + + [%- END %] [%- END %] [%- END %] [% IF NOT serial_holdings && ctx.copy_limit < total_copies -%] - - - - [%- END %] + + + + [%- END %]
-
+
[% rec_attrs = {marc_xml => cn.record.marc}; PROCESS get_marc_attrs args=rec_attrs; %] -
[% cn.label | html %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 index db80b475c2..883d8e1ac1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 @@ -157,7 +157,7 @@ contents = [ }, { label => l('Source of Description Note: '), xpath => '//*[@tag="588"]' - } + } ]; BLOCK render_contents; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 index 15b8a70bc5..ab2aa74df6 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 @@ -27,7 +27,7 @@ title="[% l('Show copies at [_1]', ou_name) | html; %]"> [%- l('(Show)'); %] [%- END; %] - + [%- depth = depth + 1; END; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 index 38f1295d7b..0432fff0af 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 @@ -65,7 +65,7 @@ IF has_copies or ctx.foreign_copies; @@ -104,8 +104,8 @@ END; # FOREACH bib
[% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') - OR ctx.aou_tree.id, 'sms.enable') == 1 %]([% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') + OR ctx.aou_tree.id, 'sms.enable') == 1 %](Text)[% END %][% copy_info.part_label | html %] [% + [% IF ctx.get_org_setting(copy_info.circ_lib, 'circ.holds.age_protect.active_date') == 1; disp_date = copy_info.active_date ? copy_info.active_date : copy_info.create_date; ELSE; disp_date = copy_info.create_date; END; - + IF disp_date; date.format( ctx.parse_datetime(disp_date), @@ -175,7 +175,7 @@ END; # FOREACH bib param_sep = l(" / "); # Only staff get to place copy or volume holds - IF ctx.is_staff; + IF ctx.is_staff; hold_link = '' _ l('Copy hold') _ ''; IF copy_info.call_number != last_cn; - last_cn = copy_info.call_number; + last_cn = copy_info.call_number; hold_link = hold_link _ param_sep; hold_link = hold_link _ '' _ l('Issue hold') _ ''; - END; + END; hold_link; - ELSE; + ELSE; l("Not holdable"); END %]
+
« [% l('Previous [_1]', ctx.copy_offset - new_offset) %] - - [% + + [% l('Next [_1]', ctx.copy_limit) %] » -
- [%- more_copies_limit = 50 %] [%# TODO: config %] - [%- IF ctx.copy_limit != more_copies_limit AND copies.size >= ctx.copy_limit AND ctx.copy_limit < total_copies %] -
- [% l('Show more copies icon') %] - [% l('Show more copies') %] -
- [%- ELSIF ctx.copy_limit == more_copies_limit %] -
- [% l('Show fewer copies icon') %] - [% l('Show fewer copies') %] -
- [%- END %] -
+ [%- more_copies_limit = 50 %] [%# TODO: config %] + [%- IF ctx.copy_limit != more_copies_limit AND copies.size >= ctx.copy_limit AND ctx.copy_limit < total_copies %] +
+ [% l('Show more copies') %] +
+ [%- ELSIF ctx.copy_limit == more_copies_limit %] +
+ [% l('Show fewer copies') %] +
+ [%- END %] +
-[% END; %] +[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 index 6af8516265..48f246a503 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 @@ -3,7 +3,7 @@ arrow_down = '▼'; %]
-
+
[% IF ctx.google_books_preview; label = l('Google Preview'); @@ -30,8 +30,8 @@ IF attrs.summaries.0; hide_summary = 0; ELSE; # Expose content cafe if it's reasonable to do so. # This approach only works when using embedded content cafe. - IF ENV.OILS_CONTENT_CAFE_USER; - ident = attrs.isbn_clean || attrs.upc; + IF ENV.OILS_CONTENT_CAFE_USER; + ident = attrs.isbn_clean || attrs.upc; IF ident; hide_summary = 0; END; END; END; @@ -52,44 +52,44 @@ END; extras = [ - {name => 'summaryplus', label => l('Summaries & More'), hide => hide_summary}, - {name => 'annotation', label => l('Annotation'), hide => 1}, - {name => 'awards', label => l('Awards, Reviews, & Suggested Reads')}, + {name => 'summaryplus', label => l('Summaries & More'), hide => hide_summary}, + {name => 'annotation', label => l('Annotation'), hide => 1}, + {name => 'awards', label => l('Awards, Reviews, & Suggested Reads')}, {name => 'excerpt', label => l('Excerpt'), hide => 1}, {name => 'issues', label => l('Issues Held'), hide => !(ctx.have_holdings_to_show || ctx.have_mfhd_to_show)}, - {name => 'preview', label => l('Preview'), hide => 1}, + {name => 'preview', label => l('Preview'), hide => 1}, {name => 'addedcontent', label => l('Additional Content'), hide => hide_ac}, # hide if all content is known to not exist {name => 'cnbrowse', label => l('Shelf Browser')}, {name => 'marchtml', label => l('MARC Record')} ]; FOREACH extra IN extras; - IF extra.hide; NEXT; END; + IF extra.hide; NEXT; END; name = extra.name; %]
- [% + [% IF tab_is_active(name); href = mkurl('', {}, ['expand', 'ac']); arrow = arrow_down; ELSE; IF name == 'addedcontent' AND default_ac; - href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; + href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; ELSE; - href = mkurl('', {expand => name}) _ '#' _ name; + href = mkurl('', {expand => name}) _ '#' _ name; END; arrow = arrow_right; END; %]
- + [% arrow %] [% extra.label | html %] +
- [% IF tab_is_active(name); %]
- + [% IF name == 'marchtml'; ctx.marchtml; ELSE; @@ -98,7 +98,7 @@ END; -%]
- [% END; %] + [% END %]
[% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/issues-mfhd.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/issues-mfhd.tt2 index bd6bb97cf2..37d1f9499d 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/issues-mfhd.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/issues-mfhd.tt2 @@ -36,7 +36,7 @@ - [% END; %] + [% END %] [% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 index ce85b68f09..c1fe478165 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 @@ -1,13 +1,12 @@ [% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %] -
- - +
+
-
+
[% IF ctx.prev_search_record; prev_args = {}; - IF ctx.search_page > 0 AND + IF ctx.search_page > 0 AND ctx.search_result_index % ((ctx.page_size * ctx.search_page)) == 0; # first record in the page prev_args.page = ctx.search_page - 1; END; @@ -17,29 +16,29 @@ href='[% ctx.prev_rec_url %]'>◄ [% l('Previous') %] [% END %]
-
+
- - [% l('Back To Results') %] - - - + + [% l('Back To Results') %] + + +
- [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %] + [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
- [%- INCLUDE "opac/parts/pref_lib_display.tt2" %] + [%- INCLUDE "opac/parts/pref_lib_display.tt2" %] - +
-
- [% +
+ [% IF ctx.next_search_record; next_args = {}; IF (ctx.page_size * (ctx.search_page + 1)) == ctx.search_result_index + 1; @@ -50,7 +49,8 @@ [% l('Next') %] ► [% END %] -
+
+
[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/refworks.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/refworks.tt2 index b8775c7ceb..240c43c024 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/refworks.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/refworks.tt2 @@ -6,13 +6,13 @@ ou_name = ctx.get_aou(loc).name | uri; # Generate the gross RefWorks URL, based on parameters from config.tt2 - rw_uri = ctx.refworks.url _ + rw_uri = ctx.refworks.url _ '/express/expressimport.asp?vendor=' _ ou_name _ '&filter=MARC+Format&database=All+MARC+Formats&' _ 'encoding=65001&url=http%3A%2F%2F' _ - CGI.server_name _ - '/opac/extras/supercat/marctxt/record/' _ + CGI.server_name _ + '/opac/extras/supercat/marctxt/record/' _ ctx.bre_id; %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 index b9b8f4e3c2..c6894574a8 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 @@ -1,5 +1,5 @@ -[%- - series_tags = ['440', '490', '800', '810', '811', '830', '694']; +[%- + series_tags = ['440', '490', '800', '810', '811', '830', '694']; loc = ctx.search_ou; BLOCK render_series; @@ -8,7 +8,7 @@ BLOCK render_series; hl_field = attrs.hl_field; FOREACH s IN attrs.hl_display_fields.series_title; search_term = s.value.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ').replace('\s+$', '') | html; - + url = mkurl(ctx.opac_root _ '/results', { qtype=>'series', query=>search_term }, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms) ); @@ -34,7 +34,7 @@ BLOCK render_series; single_term = subfield.textContent | html; all_terms.push(subfield.textContent.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ')); total_term = all_terms.join(" ").replace('\s+$', ''); - + url = mkurl(ctx.opac_root _ '/results', { qtype=>'series', query=>total_term }, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms) ); @@ -46,7 +46,7 @@ BLOCK render_series; END; results.push(series); END; - END; + END; END; FOR entry IN results; -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 index f987125c38..7f0f58e11f 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 @@ -1,4 +1,4 @@ -[% +[% subjects = [ { display_field => 'subject', @@ -118,7 +118,7 @@ -[% +[% ELSE; content = PROCESS render_subject(s=subj); IF content.match('\S'); diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 index 496af04475..c433c76e7f 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 @@ -49,7 +49,7 @@ ctx.metalinks.push(' - +
@@ -71,7 +71,7 @@ ctx.metalinks.push(' [%- INCLUDE "opac/parts/record/authors.tt2" %]
+ class="btn btn-action btn-sm my-3"> More Details

[% l("Record details") %]

    @@ -315,13 +315,13 @@ ctx.metalinks.push('
- +
@@ -340,81 +340,81 @@ ctx.metalinks.push('
-
-
+
+
[%- search_ou = ctx.search_ou; IF ctx.place_unfillable || ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size && (ctx.holds_block.enabled != 'true' || !attrs.org_copy_counts.$search_ou.available) ) %] -
- + - [% l('Place Hold') %] + [% l('Place Hold') %]
[%- END -%] [%- IF ebook_api.enabled == 'true' && args.ebook %] -
+
-
+
[%- END -%] -
+
[% operation = ctx.mylist.grep('^' _ ctx.bre_id _ '$').size ? "delete" : "add"; addhref = mkurl(ctx.opac_root _ '/mylist/add', {record => ctx.bre_id}, stop_parms); delhref = mkurl(ctx.opac_root _ '/mylist/delete', {record => ctx.bre_id}, stop_parms); label = (operation == "add") ? l("Add to Basket") : l("Remove from Basket"); %] - - + [% l("Add to basket") %] - - + [% l("Remove from basket") %]
[% IF ctx.mylist.size %] -
+
[%- IF ctx.user; %] - [% l(' View Basket') %] + [% l(' View Basket') %] [%- ELSE %] - [% l(' View My Basket') %] + [% l(' View My Basket') %] [%- END %]
[% END %] - + [% IF !ctx.is_staff %] [% IF ctx.user; %] [% INCLUDE "opac/parts/bookbag_actions.tt2"; %] - [% END; %] + [% END %] [% END %] - -
- + +
+ [% l('Print') %] / +
- + [% l('Permalink') %]
[% END %] [% IF !search.no_highlight %] -
+
[% IF CGI.param('no_highlight') %] [% ELSE %] [% END %] - + [% CGI.param('no_highlight') ? l('Enable Highlighting') : l('Disable Highlighting') %]
[% END %] [%- IF ctx.is_staff %] -
+
- + [% l('Clear Added Content Cache') %]
[%- END %] - +
- +
- +
- +

[% l('Holds') %]

[% @@ -482,7 +482,7 @@ ctx.metalinks.push(' ctx.record_hold_count, ctx.copy_summary.$count_entry.count) %]

- +
[%- diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summaryplus.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summaryplus.tt2 index 23e21ea1a2..1ca1784bb1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summaryplus.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summaryplus.tt2 @@ -1,4 +1,4 @@ -
+
[%- IF attrs.summary %]
[% l('Summary: ') %] @@ -11,8 +11,8 @@ [%- IF ENV.OILS_CONTENT_CAFE_USER %] [% ident = attrs.isbn_clean || attrs.upc %] - [%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 index 7f211172c9..39a42073f7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 @@ -34,7 +34,7 @@ FOR filter IN ctx.query_struct.filters;
×
@@ -58,7 +58,7 @@ FOR filter IN ctx.query_struct.filters; title="[% l('Remove location filter') %]" href="[% mkurl('', {}, ['fi:locations']) %]" rel="nofollow" vocab=""> ×
-
+
[%- END; # IF locations -%] [%- IF pubdate_filters.grep('^' _ filter.name _ '$').size; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2 index dc8aab797c..b198400bb7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2 @@ -26,7 +26,7 @@ org_unit = ctx.get_aou(attrs.plib_copy_counts.$depth.org_unit); ou_name = org_unit.name; UNLESS displayed_ous.exists(ou_name); - + %] [%- IF attrs.plib_copy_counts.$depth.count > 0 AND ( hiding_disabled OR ctx.org_within_hiding_scope(org_unit.id)) %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets-hz.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets-hz.tt2 index 30646dc691..be1338f4ea 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets-hz.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets-hz.tt2 @@ -1,6 +1,6 @@
-[% +[% long_facets = CGI.param('long_facet') || []; selected_facets = CGI.param('facet') || []; @@ -14,16 +14,16 @@ DEFAULT_DISPLAY_COUNT = facet.default_display_count || 5; IF facet.display; - # facet display configuration present. Traverse the - # configuration lists, find the matching facets from - # search facet data, and append them to the sorted + # facet display configuration present. Traverse the + # configuration lists, find the matching facets from + # search facet data, and append them to the sorted # list of facets. FOR display_chunk IN facet.display; FOR display_field IN display_chunk.facet_order; # find the matching facet in the facet data FOR facet IN ctx.search_facets.values; - IF facet.cmf.field_class == display_chunk.facet_class + IF facet.cmf.field_class == display_chunk.facet_class AND facet.cmf.name == display_field; sorted_facets.push(facet); END; @@ -31,17 +31,17 @@ IF facet.display; END; END; -ELSE; +ELSE; # No facet display configuration is present. # show all facets, sorted by name. # collect facet type labels for easier sorting - labels = []; + labels = []; FOR facet IN ctx.search_facets.values; labels.push(facet.cmf.label); END; - + # We used to do a sort here, but now that's handled in EGCatLoader. sorted_facets = ctx.search_facets.values; END; @@ -57,7 +57,7 @@ FOR facet IN sorted_facets;
-

[% facet.cmf.label %]

+

[% facet.cmf.label %]

[% IF long_facets.grep(long_key).0; new_long = []; @@ -76,7 +76,7 @@ FOR facet IN sorted_facets; [% l("Fewer") %] [% ELSIF facet.data.size > DEFAULT_DISPLAY_COUNT %] - [% l("More") %] @@ -92,8 +92,8 @@ FOR facet IN sorted_facets; new_facets = []; this_selected = 0; FOR selected IN selected_facets; - IF selected == param_string; - this_selected = 1; + IF selected == param_string; + this_selected = 1; ELSE; new_facets.push(selected); END; @@ -109,9 +109,9 @@ FOR facet IN sorted_facets; display_count_by_cmf.$fid = display_count_by_cmf.$fid + 1; IF this_selected; - # This facet is already selected by the user. + # This facet is already selected by the user. # Link removes the facet from the set of selected facets. - %] + %]
[% IF new_facets.size == 0 %] @@ -126,9 +126,9 @@ FOR facet IN sorted_facets;
([% facet_data.count; IF facet_data.count == (ctx.superpage + 1) * ctx.superpage_size; '+'; END %])
- [% + [% ELSE; - # This facet is not currently selected. If selected, + # This facet is not currently selected. If selected, # append this facet to the list of currently active facets. %]
@@ -141,7 +141,7 @@ FOR facet IN sorted_facets;
([% facet_data.count %])
- + [% END %] [% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 index 5e39a1e8c7..f38cbdc05c 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 @@ -1,6 +1,6 @@
-[% +[% long_facets = CGI.param('long_facet') || []; selected_facets = CGI.param('facet') || []; @@ -14,16 +14,16 @@ DEFAULT_DISPLAY_COUNT = facet.default_display_count || 5; IF facet.display; - # facet display configuration present. Traverse the - # configuration lists, find the matching facets from - # search facet data, and append them to the sorted + # facet display configuration present. Traverse the + # configuration lists, find the matching facets from + # search facet data, and append them to the sorted # list of facets. FOR display_chunk IN facet.display; FOR display_field IN display_chunk.facet_order; # find the matching facet in the facet data FOR facet IN ctx.search_facets.values; - IF facet.cmf.field_class == display_chunk.facet_class + IF facet.cmf.field_class == display_chunk.facet_class AND facet.cmf.name == display_field; sorted_facets.push(facet); END; @@ -31,17 +31,17 @@ IF facet.display; END; END; -ELSE; +ELSE; # No facet display configuration is present. # show all facets, sorted by name. # collect facet type labels for easier sorting - labels = []; + labels = []; FOR facet IN ctx.search_facets.values; labels.push(facet.cmf.label); END; - + # We used to do a sort here, but now that's handled in EGCatLoader. sorted_facets = ctx.search_facets.values; END; @@ -54,11 +54,11 @@ FOR facet IN sorted_facets; fid = facet.cmf.id; long_key = fclass _ fname %] -
+
- [% facet.cmf.label %] - + [% facet.cmf.label %] +
@@ -68,8 +68,8 @@ FOR facet IN sorted_facets; new_facets = []; this_selected = 0; FOR selected IN selected_facets; - IF selected == param_string; - this_selected = 1; + IF selected == param_string; + this_selected = 1; ELSE; new_facets.push(selected); END; @@ -85,9 +85,9 @@ FOR facet IN sorted_facets; display_count_by_cmf.$fid = display_count_by_cmf.$fid + 1; IF this_selected; - # This facet is already selected by the user. + # This facet is already selected by the user. # Link removes the facet from the set of selected facets. - %] + %]
[% IF new_facets.size == 0 %] @@ -102,9 +102,9 @@ FOR facet IN sorted_facets;
([% facet_data.count; IF facet_data.count == (ctx.superpage + 1) * ctx.superpage_size; '+'; END %])
- [% + [% ELSE; - # This facet is not currently selected. If selected, + # This facet is not currently selected. If selected, # append this facet to the list of currently active facets. %]
@@ -117,9 +117,9 @@ FOR facet IN sorted_facets;
([% facet_data.count %])
- + [% END %] - + [% END %]
[% IF long_facets.grep(long_key).0; @@ -139,7 +139,7 @@ FOR facet IN sorted_facets; [% l("Fewer") %] [% ELSIF facet.data.size > DEFAULT_DISPLAY_COUNT %] - [% l("More") %] @@ -147,7 +147,7 @@ FOR facet IN sorted_facets; [% END %]
- +
[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/lowhits.tt2 index 60db23fe06..0cfd2b7b95 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/lowhits.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/lowhits.tt2 @@ -9,10 +9,10 @@

[% qhtml = CGI.param('query') | html; IF ctx.bookbag; - wbbag = ctx.bookbag.name | html; - fmt_bookbag = '' _ wbbag _ ''; + wbbag = ctx.bookbag.name | html; + fmt_bookbag = '' _ wbbag _ ''; IF is_advanced OR is_special; - l('Sorry, no entries were found for your search within [_1].', fmt_bookbag); + l('Sorry, no entries were found for your search within [_1].', fmt_bookbag); ELSE; l('Sorry, no entries were found for [_1] within [_2].', '' _ qhtml _ '', fmt_bookbag); END; @@ -33,35 +33,35 @@ [% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]

[% l('Keyword Search Tips') %]
- [% i18n_advsearch = l('Advanced Search'); + [% i18n_advsearch = l('Advanced Search'); l('Try changing to [_1].', '' _ i18n_advsearch _ '') %]

[% l('Adjacency') %]
[% l('Multiple words are not searched together as a phrase. They will ' _ - 'be found in various parts of the record. To search for a phrase, enclose your ' _ - 'search terms in quotation marks.') %]
- [% i18n_searchphrase = l('garcia marquez'); + 'be found in various parts of the record. To search for a phrase, enclose your ' _ + 'search terms in quotation marks.') %]
+ [% i18n_searchphrase = l('garcia marquez'); l('(example: [_1])', '"' _ i18n_searchphrase _ '"') %]

[% l('Truncation') %]
[% l('Words may be right-hand truncated using an asterisk. Use a single asterisk * ' _ - 'to truncate any number of characters.') %]
- [% i18n_searchtrunc = l('environment* agency'); + 'to truncate any number of characters.') %]
+ [% i18n_searchtrunc = l('environment* agency'); l('(example: [_1])', '' _ i18n_searchtrunc _ '') %]

[% l('Anchored Searching') %]
[% l('You may use ^ and $ to indicate "phrase begins with" and ' _ - '"phrase ends with," respectively, within a search phrase ' _ - 'enclosed in quotation marks.') %]
- [% i18n_searchbegins = l('harry'); - i18n_searchends = l('stone'); + '"phrase ends with," respectively, within a search phrase ' _ + 'enclosed in quotation marks.') %]
+ [% i18n_searchbegins = l('harry'); + i18n_searchends = l('stone'); l('(examples: [_1] for phrases that begin with the term [_2]. ' _ '[_3] for phrases that end in [_4].)', - '"^' _ i18n_searchbegins _ '"', '' _ i18n_searchbegins _ '', - '"' _ i18n_searchends _ '$"', '' _ i18n_searchends _ '') %] + '"^' _ i18n_searchbegins _ '"', '' _ i18n_searchbegins _ '', + '"' _ i18n_searchends _ '$"', '' _ i18n_searchends _ '') %]

[% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 index 6c0c9d3553..d2676a598b 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 @@ -1,7 +1,7 @@ [% BLOCK results_count_header %] -
+
[%- INCLUDE "opac/parts/pref_lib_display.tt2" %] - + - + [%~ IF ctx.hit_count == ctx.pagable_limit; ctx.hit_count = ctx.hit_count _ '+'; END ~%] [%~ |l('' _ ctx.result_start _'', diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 index c394f7c6fb..7cffdccc7f 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 @@ -11,7 +11,7 @@ %]
- [% PROCESS "opac/parts/result/paginate.tt2" %] + [% PROCESS "opac/parts/result/paginate.tt2" %] [% ctx.results_count_header = PROCESS results_count_header; ctx.results_count_header %]
@@ -29,7 +29,7 @@ [% ctx.mylist.size %] - + [% l('selected') %] @@ -38,7 +38,7 @@
[% END %] - + [% FOR rec IN ctx.records; attrs = {}; attrs.marc_xml = rec.marc_xml; @@ -55,7 +55,7 @@ IF rec.mmr_id; IF rec.mr_constituent_count > 1; # metarecords link to record list page - record_url_path = ctx.opac_root _ '/results'; + record_url_path = ctx.opac_root _ '/results'; add_parms = {metarecord => rec.mmr_id}; del_parms = ['page']; ELSE; @@ -67,14 +67,14 @@ END; hold_type = 'M'; ELSE; - record_url_path = ctx.opac_root _ '/record/' _ rec.bre_id; + record_url_path = ctx.opac_root _ '/record/' _ rec.bre_id; add_parms = { badges => rec.badges.join(',') }; del_parms = ['quux']; hold_type = 'T'; END; -%] - +
- +
[% IF !ctx.is_meta; %] @@ -86,16 +86,16 @@ class="result_record_selector" value="[% rec.bre_id %]" /> [% END %]
-
+
-
+
[% attrs.title | html;%]
-
+
-
- +
+
[% IF rec.mmr_id %] @@ -110,19 +110,19 @@ [%- IF attrs.format_label; %] [% FOR format IN attrs.all_formats %] - [% format.label | html %] + [% format.label | html %] [% format.label | html %] [% END %] [%- END %] - + [%- UNLESS show_detail_view; IF attrs.pubdate; pubdate_clean = attrs.pubdate | html; l(" ([_1])", pubdate_clean); ELSIF attrs.copyright; copyright_clean = attrs.copyright | html; - l(" ([_1])", copyright_clean); + l(" ([_1])", copyright_clean); END; END -%] @@ -140,18 +140,18 @@ [% alt.value | html %]
[%- END; END; -%] - + [%- END; END; -%]
- - - + + + [% IF rec.popularity > 0.0 AND ctx.hide_badge_scores != 'true' %]
[% l('Popularity:') %] [% rec.popularity %] / 5.0
[% END %] - - + [%- IF show_detail_view -%] [% IF args.holdings.size > 0 %] - + [% END %] @@ -286,7 +286,7 @@ END; %] -