From 7d4514c37f52eff6de5b5727b993c17dc3e8865a Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Tue, 23 Dec 2014 11:38:36 -0500 Subject: [PATCH] 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 --- .../src/templates/actor/user/register_table.tt2 | 5 +- Open-ILS/src/templates/kpac/parts/copy_table.tt2 | 7 +- Open-ILS/src/templates/opac/advanced.tt2 | 5 +- Open-ILS/src/templates/opac/browse.tt2 | 7 +- Open-ILS/src/templates/opac/css/style.css.tt2 | 95 +++++++--- Open-ILS/src/templates/opac/login.tt2 | 8 +- Open-ILS/src/templates/opac/myopac/circs.tt2 | 32 ++-- Open-ILS/src/templates/opac/myopac/holds.tt2 | 141 ++++++++++----- Open-ILS/src/templates/opac/myopac/lists.tt2 | 199 +++++++++++---------- Open-ILS/src/templates/opac/myopac/prefs.tt2 | 46 ++--- .../src/templates/opac/myopac/prefs_my_lists.tt2 | 21 ++- .../src/templates/opac/myopac/prefs_notify.tt2 | 25 +-- .../src/templates/opac/myopac/prefs_settings.tt2 | 18 +- .../src/templates/opac/myopac/update_email.tt2 | 4 +- .../src/templates/opac/myopac/update_password.tt2 | 6 +- .../src/templates/opac/myopac/update_username.tt2 | 4 +- .../src/templates/opac/parts/advanced/expert.tt2 | 4 +- .../src/templates/opac/parts/advanced/numeric.tt2 | 8 +- .../src/templates/opac/parts/advanced/search.tt2 | 75 +++++--- .../templates/opac/parts/coded_value_selector.tt2 | 2 +- Open-ILS/src/templates/opac/parts/footer.tt2 | 47 +---- .../templates/opac/parts/hold_error_messages.tt2 | 40 +++-- Open-ILS/src/templates/opac/parts/homesearch.tt2 | 21 ++- Open-ILS/src/templates/opac/parts/login/form.tt2 | 10 +- Open-ILS/src/templates/opac/parts/login/help.tt2 | 14 +- .../templates/opac/parts/login/password_hint.tt2 | 2 +- .../src/templates/opac/parts/myopac/main_base.tt2 | 4 +- .../src/templates/opac/parts/myopac/prefs_base.tt2 | 10 +- .../templates/opac/parts/myopac/prefs_hints.tt2 | 2 + Open-ILS/src/templates/opac/parts/org_selector.tt2 | 7 +- Open-ILS/src/templates/opac/parts/place_hold.tt2 | 22 ++- .../src/templates/opac/parts/place_hold_result.tt2 | 19 +- .../src/templates/opac/parts/pref_lib_display.tt2 | 2 +- .../src/templates/opac/parts/qtype_selector.tt2 | 2 +- .../src/templates/opac/parts/record/cnbrowse.tt2 | 11 +- .../src/templates/opac/parts/record/contents.tt2 | 74 ++++---- .../templates/opac/parts/record/copy_counts.tt2 | 4 +- .../src/templates/opac/parts/record/copy_table.tt2 | 10 +- .../src/templates/opac/parts/record/extras.tt2 | 35 ++-- .../src/templates/opac/parts/record/navigation.tt2 | 8 +- .../src/templates/opac/parts/record/series.tt2 | 2 +- .../src/templates/opac/parts/record/subjects.tt2 | 2 +- .../src/templates/opac/parts/record/summary.tt2 | 72 +++++--- .../templates/opac/parts/result/copy_counts.tt2 | 4 +- .../src/templates/opac/parts/result/facets.tt2 | 5 + .../src/templates/opac/parts/result/paginate.tt2 | 6 +- Open-ILS/src/templates/opac/parts/result/table.tt2 | 19 +- Open-ILS/src/templates/opac/parts/searchbar.tt2 | 17 +- .../templates/opac/parts/sms_carrier_selector.tt2 | 4 +- .../templates/opac/parts/sms_number_textbox.tt2 | 4 +- Open-ILS/src/templates/opac/parts/topnav.tt2 | 9 +- Open-ILS/src/templates/opac/parts/topnav_logo.tt2 | 2 +- Open-ILS/src/templates/opac/password_reset.tt2 | 11 +- Open-ILS/src/templates/opac/password_reset_msg.tt2 | 5 +- Open-ILS/src/templates/opac/register.tt2 | 16 +- Open-ILS/src/templates/opac/results.tt2 | 17 +- Open-ILS/web/images/home-largehelp.png | Bin 0 -> 12100 bytes Open-ILS/web/images/login-person.png | Bin 0 -> 1121 bytes Open-ILS/web/images/logout-x.png | Bin 0 -> 1319 bytes Open-ILS/web/images/navbar-about.png | Bin 0 -> 2228 bytes Open-ILS/web/images/navbar-card.png | Bin 0 -> 3998 bytes Open-ILS/web/images/navbar-findalibrary.png | Bin 0 -> 1511 bytes Open-ILS/web/images/navbar-galileo.png | Bin 0 -> 2612 bytes Open-ILS/web/images/navbar-help.png | Bin 0 -> 1373 bytes Open-ILS/web/images/navbar-home.png | Bin 0 -> 1317 bytes Open-ILS/web/images/navbar-kids.png | Bin 0 -> 4487 bytes Open-ILS/web/images/pines-map.gif | Bin 0 -> 94923 bytes Open-ILS/web/js/dojo/openils/actor/nls/register.js | 4 +- Open-ILS/web/js/ui/default/actor/user/register.js | 31 +++- 69 files changed, 762 insertions(+), 524 deletions(-) create mode 100644 Open-ILS/web/images/home-largehelp.png create mode 100644 Open-ILS/web/images/login-person.png create mode 100644 Open-ILS/web/images/logout-x.png create mode 100644 Open-ILS/web/images/navbar-about.png create mode 100644 Open-ILS/web/images/navbar-card.png create mode 100644 Open-ILS/web/images/navbar-findalibrary.png create mode 100644 Open-ILS/web/images/navbar-galileo.png create mode 100644 Open-ILS/web/images/navbar-help.png create mode 100644 Open-ILS/web/images/navbar-home.png create mode 100644 Open-ILS/web/images/navbar-kids.png create mode 100644 Open-ILS/web/images/pines-map.gif 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 de86006f49..e113da800f 100644 --- a/Open-ILS/src/templates/opac/advanced.tt2 +++ b/Open-ILS/src/templates/opac/advanced.tt2 @@ -10,10 +10,9 @@

[% l('Advanced Search') %]

@@ -27,7 +26,7 @@ id="num_search">[% l('Numeric Search') %] [% l('Expert Search') %] + id="expert_search">[% l('MARC Record Search') %]
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2 index ea27b7d71e..4542803745 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(''); @@ -43,6 +43,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 5a0c3c41d0..eaffd13635 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 12f8003d7a..13fb85461a 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') %]
@@ -65,22 +68,22 @@ -     - + + + class="opac-button" style="padding:5px 30px 5px 30px;" />
@@ -51,12 +54,12 @@
-

[% l("My Existing 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 -%] @@ -132,7 +135,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']); @@ -158,47 +161,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 %] @@ -222,13 +204,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 %] +
+
@@ -263,18 +269,26 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] -

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

-
- -
- + + + + + + -
-
- -
-
[% l("Save changes to name or description?") %] @@ -287,19 +301,9 @@ -
- [% IF bbag.items.size %] -
- - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
- [% END %] - +
+ [% IF bbag.items.size > 0 %] - - - - - - + + [% END %] [% UNLESS bbag.items.size %] - [% END %] @@ -395,13 +409,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 f2462a5d6b..aee4e849ae 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2 @@ -6,25 +6,25 @@

[% l('Account Preferences') %]

-
@@ -310,32 +314,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"; %] - +
+
- - - + - + @@ -51,7 +51,7 @@ [%- ELSE %] + title="[% l('Change Username') %]">[% l("Change User Name") %] [%- END %] @@ -61,7 +61,7 @@ [%- ELSE %] + title="[% l('Change Password') %]">[% l("Change Password") %] [%- END %] @@ -71,7 +71,7 @@ [%- ELSE %] + title="[% l('Update Email Address') %]">[% l('Change Email Address') %] [%- END %] @@ -106,28 +106,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, ctx.user.second_given_name, ctx.user.family_name, ctx.user.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.


- +
- + @@ -153,7 +154,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") %]
- +
@@ -174,7 +175,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 %]
@@ -214,7 +215,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 415dcec51f..b92c3dfa5d 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; @@ -134,9 +134,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 a729953248..31b557fa54 100644 --- a/Open-ILS/src/templates/opac/myopac/update_email.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_email.tt2 @@ -30,7 +30,9 @@ [% l('Current Email') %][% ctx.user.email | html %] [% l('Current Password') %] [% l('New Email') %] - + + + diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2 index 48f490f109..6d4c419ed7 100644 --- a/Open-ILS/src/templates/opac/myopac/update_password.tt2 +++ b/Open-ILS/src/templates/opac/myopac/update_password.tt2 @@ -33,8 +33,10 @@ [% l('Current Password') %] [% l('New Password') %] [% l('New Password Again') %] - [% 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 @@ +
-
[% l('Please include leading zeros.') %]
-
[% l('Example: 0026626051') %]
+
[% 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; @@ -206,14 +213,14 @@ function toggleActivationDate() {
[% 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' %]
-
@@ -223,7 +230,7 @@ function toggleActivationDate() { [% 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 %] @@ -247,9 +254,14 @@ function toggleActivationDate() { [% l('Enter date in MM/DD/YYYY format') %]

+ +
+ + 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 873b9bfd03..5cf8f00bac 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 @@ -7,7 +7,10 @@
-

[% l('Place Hold') %]

+
+ [% l('Result of Placing Hold:') %] +
+
@@ -29,9 +32,11 @@ override = 1; END; %] - + -->
[% @@ -52,7 +57,7 @@
[% IF hdata.hold_success %] -
[% l("Hold was successfully placed"); %]
+
[% l("Hold was successfully placed!"); %]
[% IF hdata.frozen %]
@@ -88,12 +93,12 @@ [% 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; @@ -101,7 +106,7 @@ # 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; %] @@ -196,7 +196,7 @@ END [%- 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"]' }, { - label => l('Dissertation Note: '), + label => l('Dissertation: '), xpath => '//*[@tag="502"]' }, { - label => l('Bibliography, etc. Note: '), + label => l('Bibliography, etc.: '), xpath => '//*[@tag="504"]' }, { - 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: '), xpath => '//*[@tag="507"]' }, { - label => l('Creation/Production Credits Note: '), + label => l('Creation/Production Credits: '), xpath => '//*[@tag="508"]' }, { - label => l('Citation/References Note: '), + label => l('Citation/References: '), xpath => '//*[@tag="510"]' }, { - 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"]' }, { 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: '), @@ -73,58 +73,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: '), @@ -133,22 +133,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"]' } ]; @@ -186,7 +186,7 @@ END 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 eee85e8f09..bb41a7b94a 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 4be6b8326c..a8ac5e1374 100644 --- a/Open-ILS/src/templates/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/series.tt2 @@ -44,7 +44,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 b0702a427d..34293dbf9b 100644 --- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 @@ -101,6 +101,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 d26810dec7..2db60aa25d 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 %]
-

[% attrs.title_extended | html %]

+

[% attrs.title_extended | html %]

[%- FOR link880 IN attrs.graphic_titles; FOR alt IN link880.graphic; @@ -110,34 +109,30 @@ [% label %] + + Learn about lists [% END %] [% END %]
-
- [% IF ctx.mylist.size %] - [%- IF ctx.user; %] - [% l('View My Lists') %][% l(' View My Lists') %] - [%- ELSE %] - [% l('View My Temporary List') %][% l(' View My Temporary List') %] - [%- END %] - [% END %] -
-
- [% l('Print / Email Actions Image') %] - [% l('Print') %] / - [% l('Email') %] -
- [%- IF ctx.refworks.enabled == 'true' %] - [%- INCLUDE 'opac/parts/record/refworks.tt2' %] - [%- END %] + + [%- IF ctx.refworks.enabled == 'true' %] + [%- INCLUDE 'opac/parts/record/refworks.tt2' %] + [%- END %] [% IF !ctx.is_staff %] [% END %] +>>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions. [%- IF ctx.is_staff %]
@@ -182,7 +177,7 @@ num_uris = merged_uris.size; IF num_uris > 0; -%] -

[% l("Electronic resources") %]

+

[% l("Electronic resources") %]

[%- IF num_uris > 1 %]
[% 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 %]' />
@@ -152,10 +152,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 -%] @@ -168,7 +168,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 %] [% IF args.holdings.size > 0 %] @@ -322,7 +323,7 @@ END;