From: Terran McCanna Date: Thu, 6 May 2021 20:05:54 +0000 (-0400) Subject: OPAC Tweaks in Response to Patron & Library Feedback X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4cb19a8b0c547b0b16918e4aaf86eefba84f3390;p=evergreen%2Fpines.git OPAC Tweaks in Response to Patron & Library Feedback 1. OPAC Filter Display Issue (the OPAC search results bar was losing some of the search filters at some window widths) 2. Missing Cover Art Issue (if there is added content, but the added content has no cover, the cover art box showed alt text) 3. Group Formats and Editions Wording (change wording to 'Combine Same Title' and add contextual help pop-up) 4. Add contextual help popups to search bar fields. 5. Add contextual help popups to hold placement page. 6. Add contextual help to search preferences page. 7. Add contextual help to Items Checked Out page. 8. Charges Table Issue (fixed problem where table rows and headers weren't matching up on mobile devices if online payment was not enabled) 9. Record Summary Display (broke out of "More Details" so that it is more visible) 10. Account Summary Display (bold links if there are items out or holds ready) 11. Patron Messages Display (preserve line breaks) 12. Search Results Display (add "More info" button") 13. Address on Library Info page (was only showing mailing address - now shows physical/billing address and shows mailing address only if different from billing address) Signed-off-by: Terran McCanna --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Library.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Library.pm index d0b17a6898..4e82fa77d2 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Library.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Library.pm @@ -43,7 +43,7 @@ sub load_library { if ($address) { $ctx->{mailing_address} = $address; } elsif (!$address && $aou->mailing_address) { - # We didn't get cached hours, so hit the database + # We didn't get cached address, so hit the database my $session = OpenSRF::AppSession->create("open-ils.actor"); $ctx->{mailing_address} = $session->request('open-ils.actor.org_unit.address.retrieve', @@ -51,6 +51,14 @@ sub load_library { $library_cache->put_cache($address_cache_key, OpenSRF::Utils::JSON->perl2JSON($ctx->{mailing_address}), 360); } + # PINES: Get physical address too + if ($aou->billing_address) { + my $session = OpenSRF::AppSession->create("open-ils.actor"); + $ctx->{billing_address} = + $session->request('open-ils.actor.org_unit.address.retrieve', + $aou->billing_address)->gather(1); + } + # Get current hours of operation my $hours_cache_key = "TPAC_aouhoo_cache_$lib_id"; my $hours = OpenSRF::Utils::JSON->JSON2perl($library_cache->get_cache($hours_cache_key)); diff --git a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 index d98c372231..c447680356 100644 --- a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 @@ -85,19 +85,19 @@ only screen and (max-width: 650px) { .holdingsTable td:nth-of-type(3):before { content: "Call number"; display: flex;} .holdingsTable td:nth-of-type(4):before { content: "Status"; display: flex;} - .chargesTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .chargesTable td:nth-of-type(1):before { content: ""; display: flex; } .chargesTable td:nth-of-type(2):before { content: "Owed"; display: flex; } .chargesTable td:nth-of-type(3):before { content: "Billing Type"; display: flex;} .chargesTable td:nth-of-type(4):before { content: "Note"; display: flex;} .chargesTable td:nth-of-type(5):before { content: "Date"; display: flex;} - .chargesMainTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .chargesMainTable td:nth-of-type(1):before { content: ""; display: flex; } .chargesMainTable td:nth-of-type(2):before { content: "Owed"; display: flex; } .chargesMainTable td:nth-of-type(3):before { content: "Billing Type"; display: flex;} .chargesMainTable td:nth-of-type(4):before { content: "Title"; display: flex;} .chargesMainTable td:nth-of-type(5):before { content: "Checkout"; display: flex;} .chargesMainTable td:nth-of-type(6):before { content: "Due"; display: flex;} - .chargesMainTable td:nth-of-type(7):before { content: "Returned/Renewed"; display: flex;} + .chargesMainTable td:nth-of-type(7):before { content: "Status"; display: flex;} .activeHoldstable td:nth-of-type(1):before { content: "Select"; display: flex; } .activeHoldstable td:nth-of-type(2):before { content: "Cover"; display: flex; } 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 b93824a67a..88a4a93907 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -3942,6 +3942,15 @@ select option:disabled { background-color: #ddd; } +pre { + overflow-x: auto; + white-space: pre-wrap; + white-space: -moz-pre-wrap; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + word-wrap: break-word; +} + @media only screen and (max-width: 1200px) { .carousel { margin-left: 430px; diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index 80bdef5529..89a9ba2c87 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -23,6 +23,11 @@
[% END %] +

+ [% l("Charges On Your Account") %] +

+
[% l("PINES Account Tips") %]
+ [% IF ctx.fines.circulation.size > 0 %]
@@ -34,30 +39,25 @@ [% l("Circulation Charges") %] [% END %] -
- -
- - [% IF myopac_cc_allowed %] - - [% END %] - @@ -70,15 +70,16 @@ attrs.title = f.xact.reservation.target_resource_type.name; END %] - [% IF myopac_cc_allowed %] + - [% END %] - - [% END %] @@ -138,11 +138,17 @@ [% IF ctx.fines.grocery.size > 0 %] -
-

- [% l("Charges On Your Account") %] -

-
[% l("PINES Account Tips") %]
+
+
+ + + [% IF myopac_cc_allowed %] + [% l("Pay Other Selected Charges") %] + [% ELSE %] + [% l("Other Charges") %] + [% END %] + +
[% IF myopac_cc_allowed %]
@@ -157,14 +163,13 @@
- + [% IF myopac_cc_allowed %] + + [% END %] [% l("Owed") %] [% l("Billing Type") %] [% l("Title") %] [% l("Checkout") %] [% l("Due ") %] [% l("Returned/Renewed") %]
- + [% END %] + [% money(f.xact.balance_owed) %] @@ -125,7 +126,6 @@ [% l('(fines accruing)') %] [% END %]
- - [% IF myopac_cc_allowed %] - [% END %] @@ -177,12 +182,12 @@ [% FOR f IN ctx.fines.grocery %] [% c = c + 1; %] - [% IF myopac_cc_allowed %] - [% END %] [%- setting = 'opac.default_search_location'; -%] - +
+ [% IF myopac_cc_allowed %] + [% END %] [% l("Owed") %] [% l("Billing Type") %] [% l("Note") %]
+ [% IF myopac_cc_allowed %] + [% END %] Amount Owed diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 index 77cae5248f..3b9c1f78b5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 @@ -6,6 +6,7 @@ parent="circs"; %]

[% l('Current Items Checked Out') %]

+

[% l("Do you want to save a list of items you check out? Enable that feature by going to Preferences > Search & History.") %]

[% l("PINES Account Tips") %]
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 b3efce2379..da968afe49 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 @@ -54,7 +54,8 @@

+

Hint: The list of libraries is organized by regional library system, then the names of the branches within that system. If you are not sure which library is closest to you, use the Library Locations Map to find the name of your local library system and branch.

 [%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/library/core_info.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/library/core_info.tt2 index 220118badc..c7c98769a3 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/library/core_info.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/library/core_info.tt2 @@ -15,18 +15,36 @@

[% ctx.library.name | html %]

- [%- IF ctx.library.mailing_address; %] + [%- IF ctx.billing_address; %] +
+
+

[% l('Address') %]

+ [% IF ctx.mailing_address.street1 != ctx.billing_address.street1; %] +

[% l('Building Location') %]

+ [% END %] + + [% ctx.billing_address.street1 | html %] + [%- IF ctx.billing_address.street2; "
"; ctx.billing_address.street2 | html; END; %] +
+ [% ctx.billing_address.city | html %], + [% ctx.billing_address.state | html %] + [% ctx.billing_address.post_code | html %]
+ Map / Directions +
+
+ [%- END; %] + + + [%- IF ctx.mailing_address AND (ctx.mailing_address.street1 != ctx.billing_address.street1); %]
-

[% l('Location') %]

+

[% l('Mailing Address') %]

[% ctx.mailing_address.street1 | html %] [%- IF ctx.mailing_address.street2; "
"; ctx.mailing_address.street2 | html; END; %]
[% ctx.mailing_address.city | html %], [% ctx.mailing_address.state | html %] [% ctx.mailing_address.post_code | html %]
-
- Map / Directions
[%- END; %] 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 d9894ff5d2..c0179b6e53 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 @@ -173,9 +173,9 @@ function maybeToggleNumCopies(obj) { [% IF hdata.parts.size > 0 %]
[% IF enable.radio.parts == 'true' %] -
[% IF !hdata.part_required %] @@ -229,6 +229,7 @@ function maybeToggleNumCopies(obj) {

[%- org_select_id = 'pickup_lib'; -%] + [% PROCESS "opac/parts/org_selector.tt2"; INCLUDE build_org_selector name='pickup_lib' value=ctx.default_pickup_lib id=org_select_id @@ -236,6 +237,7 @@ function maybeToggleNumCopies(obj) {

[% l('Notify when hold is ready for pickup?') %] +

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 faff6b450c..95563c060d 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 @@ -98,10 +98,9 @@
-
- [% attrs.title | html;%]
+
+
@@ -176,11 +175,7 @@ [%- END; END; -%]
- [%- IF !show_detail_view AND args.holdings.size > 0 %] -
- [% l('Call number:') %] [% args.holdings.0.label | html %] -
- [% END %] + [% IF rec.popularity > 0.0 AND ctx.hide_badge_scores != 'true' %]
[% l('Popularity:') %] [% rec.popularity %] / 5.0
@@ -387,7 +382,7 @@ - + @@ -397,6 +392,8 @@ [%- END -%] + + [%- IF ebook_api.enabled == 'true' && args.ebook %] @@ -405,8 +402,7 @@ ['query','tag','subfield','term','_special','sort','page']) %]" [% html_text_attr('title', l('Check Out [_1]', attrs.title)) %] class="btn btn-action" role="button" rel="nofollow" vocab=""> [% l('Check Out E-Item') %] - - + + + + [% l("More Info") %] + [% IF ENV.OILS_CONTENT_CAFE_USER %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index 2ef8a3be47..fff99d5764 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -67,7 +67,7 @@ END;
@@ -102,11 +102,12 @@ END;
@@ -171,16 +172,11 @@ END; [% END %] [% END %] - [% IF fcount > 0 %] -
- [ [% l('[quant,_1,filter,filters] applied', fcount) %] ] -
- [% END %] - [% IF ctx.query_struct.filters.size > 0 %] + [% IF fcount > 2 %] [% stuff = INCLUDE 'opac/parts/result/adv_filter.tt2' %] [% IF stuff %]

[% l('Search Results filters') %]

-
+
[% l('Filtered by:') %]
[% stuff %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/results.tt2 b/Open-ILS/src/templates-bootstrap/opac/results.tt2 index 7b10786fa6..02b06d3890 100755 --- a/Open-ILS/src/templates-bootstrap/opac/results.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/results.tt2 @@ -116,7 +116,10 @@ name="modifier" value="metabib" onchange="search_modifier_onchange('metabib', this, true)" [% CGI.param('modifier').grep('metabib').size ? ' checked="checked"' : '' %] /> - [% l('Group By Formats and Editions') %] + [% l('Combine Same Title') %] + + +
[% END %]