From: Terran McCanna Date: Tue, 23 Dec 2014 16:38:36 +0000 (-0500) Subject: OPAC UI modifications as per OPAC Working Group suggestions. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=487eda1a38c844adc62d8dafdfe8eb51ef4980ca;p=evergreen%2Fpines.git OPAC UI modifications as per OPAC Working Group suggestions. Signed-off-by: Terran McCanna Conflicts: Open-ILS/src/templates/opac/myopac/circs.tt2 Open-ILS/src/templates/opac/myopac/holds.tt2 Open-ILS/src/templates/opac/myopac/prefs.tt2 Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 Open-ILS/src/templates/opac/parts/advanced/search.tt2 Open-ILS/src/templates/opac/parts/footer.tt2 Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 Open-ILS/src/templates/opac/parts/place_hold.tt2 Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 Open-ILS/src/templates/opac/parts/record/extras.tt2 Open-ILS/src/templates/opac/parts/record/navigation.tt2 Open-ILS/src/templates/opac/parts/record/summary.tt2 Open-ILS/src/templates/opac/parts/result/table.tt2 Open-ILS/src/templates/opac/parts/topnav.tt2 Open-ILS/src/templates/opac/register.tt2 Open-ILS/src/templates/opac/results.tt2 replacing copy_table.tt2 with the correct version Conflicts: Open-ILS/src/templates/kpac/parts/copy_table.tt2 Tweaks to OPAC UI - account login page, my account holds page, text call number page Signed-off-by: Terran McCanna Revert label change on item detail page from 'Related electronic resources' to 'Electronic resources.' Signed-off-by: Terran McCanna --- diff --git a/Open-ILS/src/templates/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2 index d3f19a05b1..ba670c2983 100644 --- a/Open-ILS/src/templates/actor/user/register_table.tt2 +++ b/Open-ILS/src/templates/actor/user/register_table.tt2 @@ -34,7 +34,10 @@ - + + diff --git a/Open-ILS/src/templates/kpac/parts/copy_table.tt2 b/Open-ILS/src/templates/kpac/parts/copy_table.tt2 index 7427220d29..c3ff07c11d 100644 --- a/Open-ILS/src/templates/kpac/parts/copy_table.tt2 +++ b/Open-ILS/src/templates/kpac/parts/copy_table.tt2 @@ -15,9 +15,9 @@ END; - - + + [%- @@ -39,12 +39,13 @@ END; + + [%- IF has_parts == 'true' %] [% ELSE %] [%- END %] - [%- END %] diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2 index d2549e94ba..9a183df8cf 100644 --- a/Open-ILS/src/templates/opac/advanced.tt2 +++ b/Open-ILS/src/templates/opac/advanced.tt2 @@ -10,10 +10,9 @@

[% l('Advanced Search') %]

diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2 index 21c3e65a3f..6ec6b6f9b6 100644 --- a/Open-ILS/src/templates/opac/browse.tt2 +++ b/Open-ILS/src/templates/opac/browse.tt2 @@ -7,7 +7,7 @@ INCLUDE "opac/parts/topnav.tt2"; ctx.page_title = l("Browse the Catalog"); - blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 10; + blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 20; depart_list = ['blimit', 'bterm', 'bpivot']; ctx.metalinks.push(''); @@ -44,6 +44,11 @@
[% l('Location') %][% l('Call Number') %][% l('Library System: Library Name') %] [% l('Shelving Location') %][% l('Call Number') %] [% l('Status') %]
[%- INCLUDE "opac/parts/library_name_link.tt2"; -%] [% copy_info.copy_location | html %][% l('[_1] ([_2])', callnum, copy_info.part_label) | html %][% callnum | html %][% copy_info.copy_location | html %] [% copy_info.copy_status | html %]
[%- circ.ATTRS.title.substr(circ.ATTRS.nonfiling_characters) | html %] [% END %] - - - [% due_date = ctx.parse_datetime(circ.circ.due_date, circ.circ.circ_lib); @@ -206,6 +206,8 @@ END %]
- [% IF circ.circ.target_copy.call_number.id == -1 %] + [% IF circ.circ.target_copy.call_number.id == -1 %]   /   [% circ.circ.target_copy.dummy_author | html %] - [% ELSIF circ.ATTRS.author %] - [% circ.ATTRS.author | html %] + [% ELSIF attrs.author %]   /   + [% attrs.author | html %] [% END %] - [% circ.circ.renewal_remaining %] + + [% circ.circ.renewal_remaining %] *
+

* You will be unable to renew items if other patrons have holds on them, + if your account is expired, or if you have more than $10.00 in fines and fees.

[% END %] diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2 index d881d9f3a3..182c9520e7 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -11,7 +11,8 @@

[% l('My Holds') %]

-
+
[% IF CGI.param("available"); l("Items Ready for Pickup"); ELSE; - l("Current Items on Hold"); + l("Items Currently on Hold"); END %] @@ -57,6 +59,8 @@
+

If you require assistance placing a hold or have a question about a hold that you have placed, + please contact your local library.

@@ -69,21 +73,22 @@ - - + + - + - + - [% l('Holds Help') %] + --> [% IF ctx.hold_suspend_post_capture; @@ -93,11 +98,11 @@ [% IF CGI.param("available") -%] - [% l('Show all holds') %] | - [% l("Show only available holds") %] + [% l('Show All Holds') %]   |   + [% l("Showing Holds That Are Ready to Pick Up") %] [% ELSE -%] - [% l("Show all holds") %] | - [% l("Show only available holds") %] + [% l("Showing All Holds") %]   |   + [% l("Show Holds That Are Ready to Pick Up") %] [% END -%] @@ -109,17 +114,19 @@ class="table_no_border_space table_no_cell_pad"> - + - [% sort_head("sort_title", l('Title')) %] - [% sort_head("author", l('Author')) %] - [% sort_head("format", l('Format')) %] - [% l('Pickup Location') %] - [% l('Cancel if not filled by') %] + [% l('Title') %] + [% l('Author') %] [% l('Status') %] - [% l('Notes') %] + [% l('Active?') %] + + [% l('Hold Will Activate On') %] + [% l('Cancel If Not Filled By') %] + [% l('Pickup Location') %] + [% l('Edit Hold Details') %] @@ -179,25 +186,55 @@ ahr = hold.hold.hold %] - +
- - +
+ +
- [% title = hold.ATTRS.title; - IF ahr.hold_type == 'P'; - title = l('[_1] ([_2])', title, hold.hold.part.label); - END; %] - - - [%- title.substr(0,hold.ATTRS.nonfiling_characters) | html %] - [%- title.substr(hold.ATTRS.nonfiling_characters) | html %] + [% + title = attrs.title; + IF ahr.hold_type == 'P'; + title = l('[_1] ([_2])', title, hold.hold.part.label); + END; + %] + [% title | html %]
+ +
+ [% + formats = attrs.all_formats; + IF ahr.hold_type == 'M'; + # only show selected formats for metarecords + formats = []; + FOR ccvm IN hold.metarecord_selected_filters.icons; + NEXT IF ccvm.opac_visible == 'f'; + format = {}; + format.label = ccvm.search_label || ccvm.value; + format.icon = PROCESS get_ccvm_icon ccvm=ccvm; + formats.push(format); + END; + END; + FOR format IN formats + %] + [% format.label | html %] + [% END %]
+ + [%- FOREACH pubnote IN ahr.notes; + IF pubnote.pub == 't'; + %] +
+ [% pubnote.title | html %] +
+ [% pubnote.body | html %] +
+ [%- END; END; %] +
- + + +
+ [% PROCESS get_hold_status hold=hold; %] +
+ + +
+ [% l(ahr.frozen == 'f' ? 'Yes' : 'No') %] +
+ + + +
+ [% IF ahr.frozen == 't' AND ahr.thaw_date; + date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT); + END %] +
- + +
[% IF ahr.expire_time; date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT); END %] +
- -
- [% PROCESS get_hold_status hold=hold; %] -
+ +
+ [% ctx.get_aou(ahr.pickup_lib).name | html %] +
- + + + [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2 index 3f765172b8..4df1aad1ad 100644 --- a/Open-ILS/src/templates/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/lists.tt2 @@ -16,7 +16,10 @@ -

[% l('Create New List') %]

+

Lists allow you to keep track of books you'd like to read in the future, + recommendations you'd like to share with other people, and more. + Learn more about using lists.

+
[% l('Create a New List') %]
[% IF ctx.mylist.size %] @@ -78,12 +81,12 @@ -     - + + + class="opac-button" style="padding:5px 30px 5px 30px;" />
@@ -51,12 +54,12 @@
@@ -96,8 +99,8 @@

[% l("My Existing Basket and Lists") %]

[% INCLUDE "opac/parts/anon_list.tt2" %] [% IF ctx.bookbags.size %] -
- [% l('Saved Lists') %] +
+ [% l('My Lists') %] [% IF limit < ctx.bookbag_count; %] [%- IF offset > 0 -%] @@ -149,7 +152,7 @@
[% FOR bbag IN ctx.bookbags %]
-
+
[% baseurl = ctx.opac_root _ '/myopac/lists'; IF bbag.id != CGI.param("bbid"); url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']); @@ -175,47 +178,26 @@
[% END %] + [% setting = 'opac.default_list'; %]
-
+
[%- INCLUDE "opac/parts/preserve_params.tt2"; %] - [% IF bbag.pub != 't' %] - - + [% IF ctx.user_setting_map.$setting == bbag.id %] + + [% ELSE %] - - + + [% END %]
-
-
- - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
-
[%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
-
- [% setting = 'opac.default_list'; %] -
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - [% IF ctx.user_setting_map.$setting == bbag.id %] - - - [% ELSE %] - - - [% END %] +
[% IF ctx.is_staff %] @@ -239,13 +221,29 @@ />
[% END %] -
- [% IF bbag.pub == 't'; %] +
+
+ + [%- INCLUDE "opac/parts/preserve_params.tt2"; %] + [% IF bbag.pub != 't' %] + + + [% ELSE %] + + + [% END %] +
+
+
+
+ [% IF bbag.pub == 't'; %]RSS: [% l('RSS Feed') %] [% END %] - [% IF bbag.pub == 't'; %] +
+
+ [% IF bbag.pub == 't'; %] [% l('HTML View') %] [% END %]
-
+
+
+
+ + + [%- INCLUDE "opac/parts/preserve_params.tt2"; %] + +
+
[% IF CGI.param("bbid") == bbag.id %] -
- [% IF bbag.items.size %] -
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2" params=['loc', 'query', 'qtype']; %] - [% INCLUDE "opac/parts/filtersort.tt2" - value=CGI.param('sort') mode='bookbag' %] - - -
-
- [% END %] +
+
@@ -280,18 +286,26 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] -

[% l('Edit List Description') %]

-
- -
- + + + + + + -
-
- -
-
[% l("Save changes to name or description?") %] @@ -322,7 +336,9 @@ [% END %]
[% END %] - +
+ [% IF bbag.items.size > 0 %] - - - - - - + + [% END %] [% UNLESS bbag.items.size %] - [% END %] @@ -418,13 +444,14 @@ [% END %] [% END %] - [% IF CGI.param("edit_notes") == bbag.id %] - + [% IF CGI.param("edit_notes") == bbag.id AND bbag.items.size %] + [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2 index 4608f1eff3..95984b1b1a 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2 @@ -6,14 +6,14 @@

[% l('Account Preferences') %]

-
@@ -333,32 +349,42 @@ inputs[i].checked = this.checked;}"/> + [% l('Title') %] - [% l('Author(s)') %] + + [% l('Author') %] + [% l('Local Call Number') %] + [% l('Publication Date') %] + [% l('Format') %] + [% l('Notes') %] [% IF CGI.param("edit_notes") != bbag.id %] | [% l('Edit') %] [% END %] + + [%- INCLUDE "opac/parts/preserve_params.tt2"; %] + +
+
[% l("This list contains no items.") %]
[%- INCLUDE "opac/parts/preserve_params.tt2"; %] - +
+
- - - + [% END %] - + @@ -70,7 +70,7 @@ [%- ELSE %] + title="[% l('Change Username') %]">[% l("Change User Name") %] [%- END %] @@ -80,7 +80,7 @@ [%- ELSE %] + title="[% l('Change Password') %]">[% l("Change Password") %] [%- END %] @@ -90,7 +90,7 @@ [%- ELSE %] + title="[% l('Update Email Address') %]">[% l('Change Email Address') %] [%- END %] @@ -125,28 +125,29 @@ - + - [% ELSE %] - [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] - [% END %] - - + + + [% ELSE %] + [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] + + + [% END %]
[% l("Name") %][% l( + [% l( HUMAN_NAME_FORMAT, ctx.user.prefix, ctx.user.first_given_name, @@ -38,12 +38,12 @@ ctx.user.pref_suffix ) | html %]
[% l("Day Phone") %][% l("Day (Primary) Phone") %] [% ctx.user.day_phone | html %]
[% l("Change") %]
[% l("Change") %]
[% l('Change') %]
[% date.format(ctx.parse_datetime(ctx.user.create_date), DATE_FORMAT) %]
[% l("Account Expiration Date") %] - [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%] + [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%] [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] - Please visit a PINES library to renew your card.


- +
- + @@ -172,7 +173,7 @@ - [% END %] + [% END %] + [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 index 87eda1198f..92516e00d2 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 @@ -6,8 +6,11 @@

[% l('List Preferences') %]

+

Lists allow you to keep track of books you'd like to read in the future, + recommendations you'd like to share with other people, and more. + Learn more about using lists.

-
[% l("Addresses") %][% l("Pending Addresses") %]
- +
@@ -193,7 +194,7 @@ - [% IF pending_addr OR edit_addr_id == cur_id; + [% IF pending_addr OR edit_addr_id == cur_id; update_addr = pending_addr || addr %]
[% l("Address Type") %][% addr.address_type | html %]
[% l("Street") %][% addr.street1 | html %]
[% l("Street") %][% addr.street2 | html %]
@@ -233,7 +234,8 @@
@@ -21,7 +24,7 @@ [%- setting = 'opac.lists_per_page' -%] - + [%- setting = 'opac.list_items_per_page' -%] - +
- [% l('List Items Help') %] + />-->
- [% l('List Items Help') %] + />-->
- +
+ +
[% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %] [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 index 47b7f72677..2422d69320 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 @@ -10,7 +10,7 @@ [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/> + title="[% l('Notification Preferences') %]" style="width:100%;max-width:900px;"> [% IF ctx.updated_user_settings %] @@ -28,7 +28,7 @@ with the rest of the table. As an alternative, we can repeat the label as a title attr. http://www.w3.org/TR/WCAG20-TECHS/H44.html %] - [% email_label = l('Notify by Email by default when a hold is ready for pickup?') %] + [% email_label = l('Notify by Email when a hold is ready for pickup?') %] - [% phone_label = l('Notify by Phone by default when a hold is ready for pickup?') %] + [% phone_label = l('Notify by Phone when a hold is ready for pickup?') %] - + - [% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %] + [% sms_label = l('Notify by Text when a hold is ready for pickup?') %] - + [% setting = 'opac.default_sms_notify' %] - + [% END %] @@ -97,9 +97,12 @@ [% END %] -
@@ -41,7 +41,7 @@ setting = 'opac.hold_notify'; -%]
[% setting = 'opac.default_phone' %]
@@ -62,7 +62,7 @@ setting = 'opac.hold_notify'; -%]
[% l('Default Mobile Carrier') %]           [% l('Mobile Carrier') %] [% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]
- [% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %] +
[% l('Hint: Use the full 10 digits of your phone #, no spaces, no dashes'); %]
- - + +
+ [% END %] +
+ +
[% END %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 index 70f76a92f3..9c3fefbf53 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 @@ -9,7 +9,7 @@
+ title="[% l('Search and History Preferences') %]" style="width:100%;max-width:900px;"> [% IF ctx.confirm_history_delete %] @@ -33,7 +33,7 @@ [%- setting = 'opac.hits_per_page' -%] - + [%- setting = 'opac.default_search_location'; -%] - + [%- setting = 'opac.default_pickup_location'; -%] - +
- [% l('Search Hits Help') %][% l('Search Hits Help') %] + />-->
[%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; @@ -65,7 +65,7 @@
[%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; @@ -176,9 +176,9 @@
- [% IF !ctx.confirm_history_delete %] - - [% END %] +
+ +
[% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %] [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/update_email.tt2 b/Open-ILS/src/templates/opac/myopac/update_email.tt2 index 34e4420542..74a9d420de 100644 --- a/Open-ILS/src/templates/opac/myopac/update_email.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_email.tt2 @@ -31,6 +31,8 @@ + + diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2 index f58be699e4..222dc5bc57 100644 --- a/Open-ILS/src/templates/opac/myopac/update_password.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_password.tt2 @@ -30,11 +30,13 @@
- + - - + +
[% l('Current Password') %]
[% l(' Note: Passwords must be 7 characters (or more) in length and contain at least one number.') %]
+ +
diff --git a/Open-ILS/src/templates/opac/myopac/update_username.tt2 b/Open-ILS/src/templates/opac/myopac/update_username.tt2 index 5c32c24e0b..fa7d703093 100644 --- a/Open-ILS/src/templates/opac/myopac/update_username.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_username.tt2 @@ -32,7 +32,9 @@ [% l('Current Username') %][% ctx.user.usrname | html %] [% l('Current Password') %] [% l('New Username') %] - + + + diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 index a424bc4114..94018b8760 100644 --- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 +++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 @@ -1,5 +1,5 @@
-
[% l("Expert Search") %]
+
[% l("MARC Record Search") %]
@@ -37,7 +37,7 @@ [%- lib_select_id = "expert_search_library"; -%] -
-
- - - - - - - [% l('Clear Form') %] -
- -
-
[% l('Search Filters') %]
+
+
[% l('Choose Search Limits:') %]
+

Tip: Ctrl-Click to select multiple lines or to deselect lines (Shift-Click for Macs).

+ [% in_row = 0; FOR adv_chunk IN search.adv_config; @@ -58,24 +46,20 @@ [% END; %]
- + [% END %] + + +
+
+ +
+ + [% l('Clear Form') %] + + + + + +
diff --git a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 index c8eb62e71c..52e72ba261 100644 --- a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 +++ b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 @@ -19,7 +19,7 @@ +
[% INCLUDE "opac/parts/login/username_hint.tt2" %] +
[% l('Enter your PINES library card number. Example: 220110026626051') %] +
[% l('If you have set up a user name, you may enter that instead of the card number.') %]
- +
[% INCLUDE "opac/parts/login/password_hint.tt2" %] [% IF reset_password == 'true' %] [% l('Forgot your password?') %] [% END %]
-
+
[% redirect = CGI.param('redirect_to'); # Don't use referer unless we got here from elsewhere within the TPAC diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2 index 2e0f4712e7..df472bdfc8 100644 --- a/Open-ILS/src/templates/opac/parts/login/help.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/help.tt2 @@ -1,15 +1,23 @@ diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 index 76b32ef0fc..f9552d30e0 100644 --- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 @@ -1,3 +1,3 @@ -
+
[%- l('If this is your first time logging in, please enter the 4 digit PIN you were assigned by library staff. Example: 0926'); %]
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 index ea434eccfa..4e038b0ac7 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 @@ -38,9 +38,9 @@
[%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); - fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT); + fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT); %] - [% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %] + [% l("Your library card expired on [_1]. Please visit a PINES library to renew your card.", fmt_expire_date) %] [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 index cdf936faec..7148528b77 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 @@ -4,7 +4,7 @@ [% acct_prefs_pages = [ {url => "prefs", name => l("Personal Information")}, {url => "prefs_notify", name => l("Notification Preferences")}, - {url => "prefs_settings", name => l("Search and History Preferences")}, + {url => "prefs_settings", name => l("Search Preferences")}, {url => "prefs_my_lists", name => l("My Lists Preferences")} ]; skin_root = "../" @@ -27,14 +27,16 @@ -

+
-
+ + [% l('Export List') %]
+ --> [%- # Select box navigation for mobile view %]
diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 index dc90c92895..b42e83769e 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 @@ -1,5 +1,7 @@ + \ No newline at end of file diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2 index ab4d7c91f0..a97f94c1bf 100644 --- a/Open-ILS/src/templates/opac/parts/org_selector.tt2 +++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2 @@ -29,7 +29,7 @@ BLOCK build_org_selector; @@ -238,14 +240,14 @@ function maybeToggleNumCopies(obj) {
[% IF !ctx.user.email and !ctx.is_staff; l('No configured Email address. See "My Account" for setting your Email address.'); - ELSE; l('Email Address:') %] [% ctx.user.email %][% END %] + ELSE; l('Email Address: ') %] [% ctx.user.email %][% END %]
[%- IF allow_phone_notifications == 'true' %]
-
@@ -255,7 +257,7 @@ function maybeToggleNumCopies(obj) { [% IF ctx.default_sms_notify %]checked="checked"[% END %]/>
- [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]
+ [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]

[% INCLUDE "opac/parts/sms_number_textbox.tt2" %]
[% END %] @@ -284,9 +286,14 @@ function maybeToggleNumCopies(obj) { [% IF CGI.param('from_basket') %]
[% END %] + +
+ + alt="[% l('Submit') %]" class="opac-button" style="padding:10px 50px 10px 50px;" /> [% END # some_holds_allowed %] diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 index 1f26d1edbb..ceeb35ce0a 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 @@ -15,7 +15,10 @@ function disable_submit() {
-

[% l('Place Hold') %]

+
+ [% l('Result of Placing Hold:') %] +
+
@@ -37,9 +40,11 @@ function disable_submit() { override = 1; END; %] - + -->
[% @@ -60,7 +65,7 @@ function disable_submit() {
[% IF hdata.hold_success %] -
[% l("Hold was successfully placed"); %]
+
[% l("Hold was successfully placed!"); %]
[% IF hdata.frozen %]
@@ -96,12 +101,12 @@ function disable_submit() { [% ELSIF hdata.hold_failed; any_failures = 1 %] -
[% l("Hold was not successfully placed"); %]
+
[% l("Hold could not be placed."); %]
[% IF hdata.hold_local_block %]
[% l("There is already a copy available at your local library.") %]
[% ELSIF hdata.hold_failed_event || hdata.hold_local_alert %] -
- [% l('Problem:') %] +
+ [% l('Reason:') %] [% fail_part_key = hdata.hold_failed_event.payload.fail_part; @@ -109,7 +114,7 @@ function disable_submit() { # display: (hdata.age_protect ? - l("The title you have requested is not available for hold requests at this time. Please contact your local library for assistance.") : + l("The title you have requested is not available for hold requests at this time. Please contact your local library for assistance.") : FAIL_PART_MSG_MAP.$fail_part_key || EVENT_MSG_MAP.$event_key || FAIL_PART_MSG_MAP.$fail_part_key || diff --git a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 index 9fe7d9cecf..192dbb080e 100644 --- a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 +++ b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 @@ -1,6 +1,6 @@ [%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %] [% - l('Preferred library: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); + l('Preferred search location: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); IF NOT ctx.is_staff %][% l('?') %][% END; %] diff --git a/Open-ILS/src/templates/opac/parts/qtype_selector.tt2 b/Open-ILS/src/templates/opac/parts/qtype_selector.tt2 index aad63e1910..e5b6b30f72 100644 --- a/Open-ILS/src/templates/opac/parts/qtype_selector.tt2 +++ b/Open-ILS/src/templates/opac/parts/qtype_selector.tt2 @@ -12,7 +12,7 @@ END; -%] @@ -14,7 +15,7 @@ [% l("<< Previous Page") %] - + - + [%- END; %] @@ -208,7 +205,7 @@ BLOCK render_all_contents; [%- content_html = PROCESS render_all_contents; IF content_html.length > 0; %] -

[% l('Content descriptions') %]

+

[% l('Contents / Notes') %]

[% l("Shelf Browser") %][% l("") %] [% l("Next Page >>") %] @@ -33,10 +34,10 @@ [% rec_attrs = {marc_xml => cn.record.marc}; PROCESS get_marc_attrs args=rec_attrs; %] - + src="[% ctx.media_prefix %]/opac/extras/ac/jacket/medium/r/[% cn.record.id | uri %]" />
[% cn.label | html %]
l('With Note: '), xpath => '//*[@tag="501"]' }, { - display_field => 'thesis', - label => l('Dissertation Note: '), + label => l('Dissertation: '), xpath => '//*[@tag="502"]' }, { - display_field => 'bibliography', - label => l('Bibliography, etc. Note: '), + label => l('Bibliography, etc.: '), xpath => '//*[@tag="504"]' }, { - display_field => 'toc', - label => l('Formatted Contents Note: '), + label => l('Contents: '), xpath => '//*[@tag="505"]' }, { - label => l('Restrictions on Access Note: '), + label => l('Restrictions on Access: '), xpath => '//*[@tag="506"]' }, { label => l('Scale Note for Graphic Material: '), @@ -30,48 +27,48 @@ contents = [ label => l('Creation/Production Credits Note: '), xpath => '//*[@tag="508"]' }, { - label => l('Citation/References Note: '), + label => l('Citation/References: '), xpath => '//*[@tag="510"]' }, { display_field => 'performers', - label => l('Participant or Performer Note: '), + label => l('Participant or Performer: '), xpath => '//*[@tag="511"]' }, { - label => l('Type of Report and Period Covered Note: '), + label => l('Type of Report and Period Covered: '), xpath => '//*[@tag="513"]' }, { - label => l('Data Quality Note: '), + label => l('Data Quality: '), xpath => '//*[@tag="514"]' }, { - label => l('Numbering Peculiarities Note: '), + label => l('Numbering Peculiarities: '), xpath => '//*[@tag="515"]' }, { - label => l('Type of Computer File or Data Note: '), + label => l('Type of Computer File or Data: '), xpath => '//*[@tag="516"]' }, { - label => l('Date/Time and Place of an Event Note: '), + label => l('Date/Time and Place of an Event: '), xpath => '//*[@tag="518"]' }, { display_field => 'abstract', label => l('Summary, etc.: '), xpath => '//*[@tag="520"]' }, { - label => l('Target Audience Note: '), + label => l('Target Audience: '), xpath => '//*[@tag="521"]' }, { - label => l('Geographic Coverage Note: '), + label => l('Geographic Coverage: '), xpath => '//*[@tag="522"]' }, { - label => l('Preferred Citation of Described Materials Note: '), + label => l('Preferred Citation: '), xpath => '//*[@tag="524"]' }, { label => l('Supplement Note: '), xpath => '//*[@tag="525"]' }, { - label => l('Study Program Information Note: '), + label => l('Study Program Information: '), xpath => '//*[@tag="526"]' }, { - label => l('Additional Physical Form available Note: '), + label => l('Additional Physical Form Available: '), xpath => '//*[@tag="530"]' }, { label => l('Reproduction Note: '), @@ -80,58 +77,58 @@ contents = [ label => l('Original Version Note: '), xpath => '//*[@tag="534"]' }, { - label => l('Location of Originals/Duplicates Note: '), + label => l('Location of Originals/Duplicates: '), xpath => '//*[@tag="535"]' }, { - label => l('Funding Information Note: '), + label => l('Funding Information: '), xpath => '//*[@tag="536"]' }, { - label => l('System Details Note: '), + label => l('System Details: '), xpath => '//*[@tag="538"]' }, { - label => l('Terms Governing Use and Reproduction Note: '), + label => l('Terms Governing Use and Reproduction: '), xpath => '//*[@tag="540"]' }, { - label => l('Immediate Source of Acquisition Note: '), + label => l('Immediate Source of Acquisition: '), xpath => '//*[@tag="541"]' }, { label => l('Information Relating to Copyright Status: '), xpath => '//*[@tag="542"]' }, { - label => l('Location of Other Archival Materials Note: '), + label => l('Location of Other Archival Materials: '), xpath => '//*[@tag="544"]' }, { label => l('Biographical or Historical Data: '), xpath => '//*[@tag="545"]' }, { - label => l('Language Note: '), + label => l('Language: '), xpath => '//*[@tag="546"]' }, { label => l('Former Title Complexity Note: '), xpath => '//*[@tag="547"]' }, { - label => l('Issuing Body Note: '), + label => l('Issuing Body: '), xpath => '//*[@tag="550"]' }, { - label => l('Entity and Attribute Information Note: '), + label => l('Entity and Attribute Information: '), xpath => '//*[@tag="552"]' }, { - label => l('Cumulative Index/Finding Aids Note: '), + label => l('Cumulative Index/Finding Aids: '), xpath => '//*[@tag="555"]' }, { - label => l('Information About Documentation Note: '), + label => l('Information About Documentation: '), xpath => '//*[@tag="556"]' }, { label => l('Ownership and Custodial History: '), xpath => '//*[@tag="561"]' }, { - label => l('Copy and Version Identification Note: '), + label => l('Copy and Version Identification: '), xpath => '//*[@tag="562"]' }, { label => l('Binding Information: '), xpath => '//*[@tag="563"]' }, { - label => l('Case File Characteristics Note: '), + label => l('Case File Characteristics: '), xpath => '//*[@tag="565"]' }, { label => l('Methodology Note: '), @@ -140,22 +137,22 @@ contents = [ label => l('Linking Entry Complexity Note: '), xpath => '//*[@tag="580"]' }, { - label => l('Publications About Described Materials Note: '), + label => l('Publications About Described Materials: '), xpath => '//*[@tag="581"]' }, { label => l('Action Note: '), xpath => '//*[@tag="583"]' }, { - label => l('Accumulation and Frequency of Use Note: '), + label => l('Accumulation and Frequency of Use: '), xpath => '//*[@tag="584"]' }, { - label => l('Exhibitions Note: '), + label => l('Exhibitions: '), xpath => '//*[@tag="585"]' }, { - label => l('Awards Note: '), + label => l('Awards: '), xpath => '//*[@tag="586"]' }, { - label => l('Source of Description Note: '), + label => l('Source of Description: '), xpath => '//*[@tag="588"]' } ]; @@ -198,7 +195,7 @@ BLOCK render_all_contents; IF content.match('\S'); -%]
[% cont.label %][% cont.label %] [% content %]
[%- content_html %] diff --git a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 index e6e783f244..44fa9bb357 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 @@ -1,5 +1,5 @@ -

[% l('Available copies') %]

+

[% l('Currently available copies') %]

    [%- depths = ctx.copy_summary.size; depth = 0; @@ -24,7 +24,7 @@ IF ou_count > 0 && this_depth != ctx.copy_depth %] - [%- l('(Show)'); %] + [%- l('(Show copies)'); %] [%- END; %] [%- depth = depth + 1; diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 index 41e942909a..f54a3dd652 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 @@ -25,12 +25,8 @@ FOREACH copy_info IN copies; END; END; -%] -[%- -IF has_copies or ctx.foreign_copies; - depth = CGI.param('copy_depth').defined ? CGI.param('copy_depth') : CGI.param('depth').defined ? CGI.param('depth') : ctx.copy_summary.last.depth; - total_copies = ctx.copy_summary.$depth.count; -%] -
+[%- IF has_copies; %] +
[% IF serial_holdings -%] @@ -106,7 +102,7 @@ END; # FOREACH bib [% END %] - + [%- IF has_parts == 'true' %] [%- END %] diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2 index 45fb5b02d9..8c9718e8d4 100644 --- a/Open-ILS/src/templates/opac/parts/record/extras.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2 @@ -55,13 +55,13 @@ 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 => 'awards', label => l('Recommended Reads and Reviews')}, {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 => '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')} + {name => 'cnbrowse', label => l('Browse the Shelves')}, + {name => 'marchtml', label => l('View MARC Record')} ]; FOREACH extra IN extras; @@ -71,13 +71,13 @@
- [% IF !CGI.request_uri.match('expand') AND !ctx.is_staff AND name == 'awards'; + [% + IF tab_is_active(name) OR name == 'awards'; href = mkurl('', {}, ['expand', 'ac']); - arrow = arrow_down; - ELSE; - IF tab_is_active(name); - href = mkurl('', {}, ['expand', 'ac']); - arrow = arrow_down; + arrow = arrow_down; + ELSE; + IF name == 'addedcontent' AND default_ac; + href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; ELSE; IF name == 'addedcontent' AND default_ac; href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; @@ -94,16 +94,12 @@
- [% IF !ctx.is_staff AND name == 'awards' AND !CGI.request_uri.match('expand'); - INCLUDE "opac/parts/record/awards.tt2"; - ELSE; - IF tab_is_active(name); - IF name == 'marchtml'; - ctx.marchtml; - ELSE; - # Load the template for the selected extra - INCLUDE "opac/parts/record/${name}.tt2"; - END; + [% IF tab_is_active(name) OR name == 'awards'; + IF name == 'marchtml'; + ctx.marchtml; + ELSE; + # Load the template for the selected extra + INCLUDE "opac/parts/record/${name}.tt2"; END; END; %] @@ -111,3 +107,4 @@ [% END %]
+ diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2 index e44e8da928..f7c905bc69 100644 --- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2 @@ -1,14 +1,14 @@ [% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %]
- ◄ [% l('Search Results') %] + ◄ [% l('Return to Search Results') %] - - [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %] + + [% l('Now showing item [_1] of about [_2]', ctx.search_result_index + 1, ctx.hit_count) %] [%- INCLUDE "opac/parts/pref_lib_display.tt2" %] @@ -35,7 +35,7 @@ ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms); %] [% l('Next') %] ► + href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next Item') %] ► [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2 index a5ad664c8b..9d29e31d39 100644 --- a/Open-ILS/src/templates/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/series.tt2 @@ -57,7 +57,7 @@ END; [%- series_anchors = PROCESS render_series; IF series_anchors.length > 0; %] -

[% l('Search for related items by series') %]

+

[% l('Find related items by series') %]

    [% series_anchors %]
diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 index f987125c38..a4efc9670a 100644 --- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 @@ -139,6 +139,6 @@ [%- subject_html = PROCESS render_all_subjects; IF subject_html.length > 0; %] -

[% l('Search for related items by subject') %]

+

[% l('Find similar items by subject') %]

[%- subject_html %] [%- END %] diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index 3bc0ef5855..ee3af2963b 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -6,12 +6,11 @@ -
[%-# This holds the record summary information %]
-

[% IF attrs.hl.title; attrs.hl.title; ELSE; attrs.title_extended | html; END %]

+

[% IF attrs.hl.title; attrs.hl.title; ELSE; attrs.title_extended | html; END %]

[%- FOR link880 IN attrs.graphic_titles; FOR alt IN link880.graphic; @@ -148,7 +147,7 @@ [% IF !ctx.is_staff %] @@ -209,7 +208,7 @@ num_uris = merged_uris.size; IF num_uris > 0; -%] -

[% l("Electronic resources") %]

+

[% l("Electronic resources") %]

[%- IF num_uris > 1 %]
    [% END %] [%- FOR uri IN merged_uris %] @@ -237,6 +236,10 @@ IF num_uris > 0; IF ebook_api.enabled == 'true'; INCLUDE "opac/parts/ebook_api/avail.tt2"; END; +[%- END %] + +[%- # Hold/copy summary + IF ctx.copy_summary.0.count %] [%- END %]
    @@ -259,11 +262,38 @@ INCLUDE "opac/parts/record/copy_counts.tt2"; END; count_entry = count_entry + 1; END; - l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].", + l("[quant,_1,current hold,current holds] on [quant,_2,total copy,total copies]", ctx.record_hold_count, ctx.copy_summary.$count_entry.count) %]

    + + +[%- merged_uris = args.uris.merge(args.online_res); +num_uris = merged_uris.size; +IF num_uris > 0; +-%] +

    [% l("Related electronic resources") %]

    +
    + [%- IF num_uris > 1 %]
      [% END %] + [%- FOR uri IN merged_uris %] + [%- IF num_uris == 1 -%] +

      + [%- ELSE -%] +

    • + [%- END -%] + [% uri.link %][% ' - ' _ uri.note IF uri.note %] + + [%- IF attrs.gtin13; ''; END; %] + [%- IF num_uris == 1 %]

      [% ELSE %]
      • [% END %] + [%- END %] + [%- IF num_uris > 1 %]
    [% END %] +
    +[%- END %] + +[%- INCLUDE "opac/parts/record/copy_table.tt2" copies=ctx.copies %] + +
    [%- END %]
    [%- @@ -325,7 +355,7 @@ END; %]
    -

    [% l("Record details") %]

    +

    [% l("Item details") %]

      [%- IF attrs.hl.isbn.size; FOR isbn IN attrs.hl.isbn %]
    • diff --git a/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2 index dc8aab797c..7824f01445 100644 --- a/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2 @@ -11,7 +11,7 @@ %]
      [% IF ctx.get_aou(attrs.copy_counts.$depth.org_unit).opac_visible == 't' %] - [% l('[_1] of [quant,_2,copy,copies] available at [_3].', + [% l('[_1] out of [quant,_2,copy,copies] are currently available at [_3]', attrs.copy_counts.$depth.available, attrs.copy_counts.$depth.count, ou_name) | html @@ -31,7 +31,7 @@ [%- IF attrs.plib_copy_counts.$depth.count > 0 AND ( hiding_disabled OR ctx.org_within_hiding_scope(org_unit.id)) %]
      [% - l('[_1] of [quant,_2,copy,copies] available at [_3].', + l('[_1] out of [quant,_2,copy,copies] are currently available at [_3].', attrs.plib_copy_counts.$depth.available, attrs.plib_copy_counts.$depth.count, ou_name) | html diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2 index 38f231ffc6..366af54a13 100644 --- a/Open-ILS/src/templates/opac/parts/result/facets.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2 @@ -1,4 +1,9 @@
      +
      +
      + [% l('Narrow Your Search') %]
      + Tip: Click on the links below to narrow down your search results. To remove a search limit you've selected, click on the link again. +
      [% long_facets = CGI.param('long_facet') || []; diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 index ba66454335..0ffe6be63d 100644 --- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 @@ -1,12 +1,12 @@ [% BLOCK results_count_header %]
      - [% ctx.bookbag ? l('List Contents') : l('Search Results') %] + [%~ IF ctx.hit_count == ctx.pagable_limit; ctx.hit_count = ctx.hit_count _ '+'; END ~%] [%~ |l('' _ ctx.result_start _'', '' _ ctx.result_stop _ '', '' _ ctx.hit_count _ '') ~%] - Results [_1] - [_2] of [_3] + Now showing results [_1] - [_2] of about [_3] [%~ END %] [%~ |l('' _ (page + 1) _ '', @@ -14,7 +14,7 @@ (page [_1] of [_2]) [%~ END %] - +       [%- INCLUDE "opac/parts/pref_lib_display.tt2" %] diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2 index 21652c4069..6656c60c48 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -116,8 +116,8 @@
[% copy_info.copy_location | html %][% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](Text)[% END %][% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](Send Text)[% END %][% copy_info.part_label | html %] [% l('Book cover') %]
+ name='item_jacket' class='result_table_pic' width="85" style="border:1px solid #ccc;" + src='[% ctx.media_prefix %]/opac/extras/ac/jacket/medium/r/[% rec.bre_id | uri %]' />
@@ -193,10 +193,10 @@ END; [%- UNLESS show_detail_view; IF attrs.pubdate; pubdate_clean = attrs.pubdate | html; - l(" ([_1])", pubdate_clean); + l("Publication Date: ([_1])", pubdate_clean); ELSIF attrs.copyright; copyright_clean = attrs.copyright | html; - l(" ([_1])", copyright_clean); + l("Copyright Date: ([_1])", copyright_clean); END; END -%] @@ -209,7 +209,8 @@ END; + class="table_no_border_space table_no_cell_pad table_no_border results_info_table" + style="margin-left:40px;"> [% UNLESS rec.mmr_id OR show_detail_view %] [% IF args.holdings.size > 0 %] @@ -363,7 +364,7 @@ END;