From: Terran McCanna Date: Tue, 15 Dec 2015 23:22:43 +0000 (-0500) Subject: Numerous local customizations to My Account pages for layout and X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Frel_2_9_0_opac;p=evergreen%2Fpines.git Numerous local customizations to My Account pages for layout and to add on-screen assistance to patrons. Signed-off-by: Terran McCanna --- diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index d81cc49d85..de4c045ef4 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -704,6 +704,7 @@ div.format_icon { #holds_temp_parent td { border-bottom:1px solid [% css_colors.border_standard %]; + padding:0px 3px 0px 10px; } #holds_temp_parent input, #holds_temp_parent select { @@ -972,11 +973,17 @@ div.result_table_utils_cont { padding: 10px; } -#acct_checked_main_header th, #acct_holds_main_header th, #acct_checked_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th { +#acct_checked_main_header th, #acct_checked_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th { text-align: left; padding: 0px 10px 0px 10px; } +#acct_holds_main_header tr th { + background: [% css_colors.accent_lighter2 %]; + padding: 10px; + text-align:left; +} + #acct_list_header select, #acct_list_header_anon select { font-weight:normal; text-transform:none; @@ -1017,7 +1024,7 @@ div.result_table_utils_cont { padding-right: 5px; } -.myopac_payments_table th { text-align: left; } +.myopac_payments_table tr th { text-align: left; background-color: [% css_colors.accent_lighter %]; padding:3px;} .myopac_payments_table thead th { border-bottom: 1px dashed [% css_colors.accent_darker %]; } .myopac_payments_table thead th:first-child { width: 8em; } .myopac_payments_table tbody tr:nth-child(odd) { background-color: [% css_colors.accent_lighter %]; } diff --git a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 index 5339b25551..ccfacd2c65 100644 --- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 @@ -40,13 +40,13 @@ limit, offset => (offset + limit)}) %]' [% IF no_next %] class='invisible' [% END %] >[% l('Next') %]► -
+
[%- INCLUDE "opac/parts/preserve_params.tt2" %] [% IF ctx.circs.size > 0 %] - + [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2 index c78c153632..7ca39647a9 100644 --- a/Open-ILS/src/templates/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circs.tt2 @@ -6,7 +6,8 @@

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

-
+ +
+
- [% l('Current Items Checked Out') %] + [% l('Items Currently Checked Out') %]
+

If you are having trouble renewing your items, please contact your + local library.

+
[% IF ctx.circs.size < 1 %]
[% l('You have no items checked out.') %]
@@ -41,18 +46,18 @@ - + - +
- - [% due_date = ctx.parse_datetime(circ.circ.due_date); @@ -201,6 +206,8 @@ END %]
+ [% IF circ.circ.target_copy.call_number.id == -1 %] [% circ.circ.target_copy.dummy_title | html %] [% ELSIF circ.ATTRS.title %] @@ -158,8 +163,8 @@ ) %]">[% circ.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/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 index 8412f42ddb..c2cfdbe72f 100644 --- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 @@ -21,7 +21,7 @@
- [% l("Previously Held Items") %] + [% l("Previously Requested Items") %] limit,offset => (offset - limit)}) %]' [% IF offset == 0 %] class='invisible' [% END %]>◄[% l('Previous') %] @@ -56,17 +56,17 @@ title="[% l('History of items on hold') %]"> - [% l('Title') %] - [% l('Author') %] - [% l('Format') %] - [% l('Pickup Location') %] - [% l('Active On') %] - [% l('Active') %] - [% l('Date Fulfilled') %] - [% l('Status') %] + [% l('Title') %] + [% l('Author') %] + [% l('Format') %] + [% l('Pickup Location') %] + [% l('Active On') %] + [% l('Active?') %] + [% l('Date Fulfilled') %] + [% l('Status') %] - + [% FOR hold IN ctx.holds; attrs = {marc_xml => hold.marc_xml}; PROCESS get_marc_attrs args=attrs; @@ -86,8 +86,8 @@ ) %]">[% attrs.author | html %]
- -
+ +
[% IF attrs.format_icon %] [% attrs.format_label | html %] [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2 index 68f9b4edc4..09c13e3994 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -25,7 +25,7 @@ [% IF CGI.param("available"); l("Items Ready for Pickup"); ELSE; - l("Current Items on Hold"); + l("Items Currently On Hold"); END %] @@ -51,6 +51,8 @@
+

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

@@ -71,12 +73,14 @@ + @@ -97,9 +101,9 @@ [% IF ctx.holds.size && ctx.holds.size < 1 %]
[% l('No holds found.') %]
[% ELSE %] -
[% IF ctx.hold_suspend_post_capture; l('One or more holds could not be suspended because the item is at (or en route to) the pickup library.'); @@ -89,7 +93,7 @@ [% l("Show only available holds") %] [% ELSE -%] [% l("Show all holds") %] | - [% l("Show only available holds") %] + [% l("Show holds that are ready to pick up") %] [% END -%]
- +
+ - + + @@ -199,7 +204,7 @@ ) %]">[% hold.ATTRS.author | html %] -
[% l('Pickup Location') %] [% l('Activate') %] [% l('Cancel if not filled by') %][% l('Active') %][% l('Active?') %] [% l('Status') %] [% l('Notes') %][% l('Edit') %]
+
[% formats = hold.ATTRS.all_formats; diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2 index 9dc672e1d9..b416bd734e 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -17,27 +17,23 @@ [% IF ctx.fines.circulation.size > 0 %]
- - +
[% l("Fines") %]
+
+ - - - - - - - - - + + + + + + [% IF myopac_cc_allowed %] - [% END %] @@ -112,29 +108,24 @@

-
- [% l("Fines") %] -
[% l("Title") %][% l("Author") %][% l("Checkout Date") %][% l("Due Date") %][% l("Date Returned") %][% l("Balance Owed") %][% l("Title") %][% l("Author") %][% l("Checkout Date") %][% l("Due Date") %][% l("Date Returned") %][% l("Balance Owed") %] + - +
- +
[% l("Other Fees") %]
+
+ - - - - - - - - - + + + + + + [% IF myopac_cc_allowed %] - + [% END %] diff --git a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates/opac/myopac/messages/list.tt2 index ba97d6058b..16c81e86df 100644 --- a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 +++ b/Open-ILS/src/templates/opac/myopac/messages/list.tt2 @@ -1,6 +1,8 @@
[% l("Messages") %]
+

If you require assistance, please contact your + local library.

limit, offset => (offset - limit)} ) %]' [% IF offset <= 0 %] class='invisible' [% END %]>◄[% l('Previous') %] @@ -20,6 +22,7 @@ [% IF count <= limit + offset %] class='invisible' [% END %] >[% l('Next') %]►
+
[% IF ctx.message_update_action.defined %] [% IF ctx.message_update_changed > 0 %] @@ -69,12 +72,14 @@ title="[% l('Go') %]" class="opac-button" /> + [% IF count < 1 %]
[% l('No messages found.') %]
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2 index f2462a5d6b..b296f92531 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2 @@ -5,26 +5,27 @@

[% l('Account Preferences') %]

- -
- [% l("Other Fees") %] -
[% l("Transaction Start Time") %][% l("Last Payment Time") %][% l("Initial Amount Owed") %][% l("Total Amount Paid") %][% l("Balance Owed") %][% l("Billing Type") %][% l("Transaction Start Time") %][% l("Last Payment Time") %][% l("Initial Amount Owed") %][% l("Total Amount Paid") %][% l("Balance Owed") %][% l("Billing Type") %] -
+

If you need to change your phone number or address, please visit your + local library.

+
- - - + - + @@ -51,7 +52,7 @@ [%- ELSE %] + title="[% l('Change Username') %]">[% l("Change User Name") %] [%- END %] @@ -61,7 +62,7 @@ [%- ELSE %] + title="[% l('Change Password') %]">[% l("Change Password") %] [%- END %] @@ -71,7 +72,7 @@ [%- ELSE %] + title="[% l('Update Email Address') %]">[% l('Change Email Address') %] [%- END %] @@ -106,28 +107,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 +155,7 @@ - [% END %] + [% 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 9f1288c8b5..e43b875cf1 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 @@
[% l("Addresses") %][% l("Pending Addresses") %]
- +
@@ -174,7 +176,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 +216,8 @@
+ title="[% l('Search and History Preferences') %]" style="width:100%;max-width:900px;"> [% IF ctx.updated_user_settings %] @@ -22,7 +22,7 @@ [%- setting = 'opac.hits_per_page' -%] - + [%- setting = 'opac.default_search_location'; -%] - + [%- setting = 'opac.default_pickup_location'; -%] - + + [%- setting = 'history.circ.retention_start' -%] [% circ_name = l('Keep history of checked out items?') %] @@ -86,6 +87,7 @@ [%- setting = 'opac.temporary_list_no_warn' -%] + [% skip_warn = l('Skip warning when adding to temporary book list?') %] @@ -121,7 +123,9 @@
- [% l('Search Hits Help') %][% l('Search Hits Help') %] + />-->
[%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; @@ -54,7 +54,7 @@
[%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; @@ -65,6 +65,7 @@ %]
- +
+ +
[% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %] [% END %] 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 bf84e80294..399532069a 100644 --- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 @@ -7,6 +7,8 @@
[% l('Account Summary') %]
+

If you require assistance with your account, please contact your + local library.

@@ -32,20 +34,20 @@
[%- 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 %]
- - - + + + - + - +
[% l("Account Expiration Date") %] - [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] -
[% l("Account Expiration Date") %] + [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] +
[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %][% l("Items Currently Checked Out ([_1])", ctx.user_stats.checkouts.total_out) %] @@ -63,7 +65,7 @@
[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %][% l('Items Ready for Pickup ([_1])', ctx.user_stats.holds.ready) %] diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2 index e9fc008bd2..9e875d03b9 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2 @@ -4,7 +4,9 @@ %]
-

[% l('Place Hold') %]

+
+ [% l('Place Hold On:') %] +
[% some_holds_allowed = -1 %] @@ -16,18 +18,7 @@ redirect = redirect.replace('^http:', 'https:') %] - [% - usr_barcode = CGI.param('usr_barcode') | html; - is_requestor = CGI.param('is_requestor'); - - IF is_requestor == ''; - is_requestor = '0'; - END; - - IF is_requestor == '0' && usr_barcode == ctx.staff_recipient.card.barcode; - usr_barcode = ''; - END; - %] + [% IF ctx.is_staff %]

@@ -39,7 +30,7 @@ [% l("Place hold for patron by barcode:") %] @@ -107,7 +98,7 @@ [% bre_id = hdata.target.id %] - [% l('Advanced Hold Options') %] +
[% l('Advanced Hold Options') %] [% END %] [% IF CGI.param('hold_type') == 'M' AND CGI.param('bre_id') %] @@ -156,14 +147,14 @@

[% 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' %]
-
@@ -173,17 +164,21 @@ [% 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 %]

+ +
+ + 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/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2 index 719ffa1390..9b1cf9c143 100644 --- a/Open-ILS/src/templates/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates/opac/parts/topnav.tt2 @@ -12,6 +12,7 @@ @@ -25,7 +26,8 @@