From b5526129ae87d32910b0388a90de0c608240a6d5 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Tue, 15 Dec 2015 18:22:43 -0500 Subject: [PATCH] Numerous local customizations to My Account pages for layout and to add on-screen assistance to patrons. 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_settings.tt2 --- Open-ILS/src/templates/opac/css/style.css.tt2 | 9 +++- .../src/templates/opac/myopac/circ_history.tt2 | 2 +- Open-ILS/src/templates/opac/myopac/circs.tt2 | 7 +-- .../src/templates/opac/myopac/hold_history.tt2 | 21 ++++---- Open-ILS/src/templates/opac/myopac/holds.tt2 | 56 +++++++++++---------- Open-ILS/src/templates/opac/myopac/main.tt2 | 53 ++++++++----------- .../src/templates/opac/myopac/messages/list.tt2 | 5 ++ Open-ILS/src/templates/opac/myopac/prefs.tt2 | 3 +- .../src/templates/opac/myopac/prefs_settings.tt2 | 2 - .../src/templates/opac/parts/myopac/main_base.tt2 | 2 + Open-ILS/src/templates/opac/parts/place_hold.tt2 | 1 - Open-ILS/src/templates/opac/parts/topnav.tt2 | 7 ++- Open-ILS/web/images/navbar-list.png | Bin 0 -> 1031 bytes Open-ILS/web/images/navbar-messages.png | Bin 0 -> 1067 bytes 14 files changed, 91 insertions(+), 77 deletions(-) create mode 100644 Open-ILS/web/images/navbar-list.png create mode 100644 Open-ILS/web/images/navbar-messages.png diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index 7b83acda5b..48a3513f0f 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -694,6 +694,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 { @@ -976,6 +977,12 @@ div.result_table_utils_cont { 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; @@ -1016,7 +1023,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 7e6edc4f9d..8d9291e6e1 100644 --- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 @@ -40,7 +40,7 @@ limit, offset => (offset + limit)}) %]' [% IF no_next %] class='invisible' [% END %] >[% l('Next') %]► -
+
[%- INCLUDE "opac/parts/preserve_params.tt2" %] diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2 index 2bfbba290b..a4b87a802f 100644 --- a/Open-ILS/src/templates/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circs.tt2 @@ -6,7 +6,6 @@

[% 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 %] @@ -142,7 +143,7 @@ [% IF circ.circ.renewal_remaining < 1 %] disabled="disabled" [% END %] value="[% circ.circ.id %]" /> - + [% IF circ.circ.target_copy.call_number.id == -1 %] [% circ.circ.target_copy.dummy_title | html %] [% ELSIF circ.ATTRS.title %] diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 index 9905e6c60f..701f7a9d28 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') %] @@ -55,14 +55,17 @@ - - - - - + + + + + + + + - + [% FOR hold IN ctx.holds; attrs = {marc_xml => hold.marc_xml}; PROCESS get_marc_attrs args=attrs; @@ -82,8 +85,8 @@ ) %]">[% attrs.author | html %] -
[% l('Title') %][% l('Author') %] [% l('Format') %][% l('Pickup Location') %] [% l('Status') %][% l('Title') %][% l('Author') %] [% l('Format') %][% l('Pickup Location') %] [% l('Active On') %][% l('Active?') %][% l('Date Fulfilled') %][% l('Status') %]
-
+
+
[% 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 adf4ea514d..d93f3115b1 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -29,7 +29,7 @@ [% IF CGI.param("available"); l("Items Ready for Pickup"); ELSE; - l("Items Currently on Hold"); + l("Items Currently On Hold"); END %] @@ -57,6 +57,8 @@ please contact your local library.

+

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

@@ -77,6 +79,7 @@ + + -->
[% 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.'); @@ -95,32 +99,33 @@ [% l('Show All Holds') %]   |   [% l("Showing Holds That Are Ready to Pick Up") %] [% ELSE -%] - [% l("Showing All Holds") %]   |   - [% l("Show Holds That Are Ready to Pick Up") %] + [% l("Show all holds") %] | + [% l("Show holds that are ready to pick up") %] [% END -%]
- [% if ctx.holds.size && ctx.holds.size < 1 %] -
[% l('no holds found.') %]
- [% else %] - - + [% IF ctx.holds.size && ctx.holds.size < 1 %] +
[% l('No holds found.') %]
+ [% ELSE %] +
+ - - - - - - - + + + - + + + + + + @@ -188,15 +193,14 @@ +
[% l('Title') %][% l('Author') %][% l('Status') %][% l('Active?') %][% l('Hold Will Activate On') %][% l('Cancel If Not Filled By') %][% sort_head("sort_title", l('Title')) %][% sort_head("author", l('Author')) %][% sort_head("format", l('Format')) %] [% l('Pickup Location') %][% l('Edit Hold Details') %][% l('Activate') %][% l('Cancel if not filled by') %][% l('Active?') %][% l('Status') %][% l('Notes') %][% l('Edit') %]
- [% - title = attrs.title; - IF ahr.hold_type == 'P'; - title = l('[_1] ([_2])', title, hold.hold.part.label); - END; - %] - [% title | html %]
- -
+ [% hold.ATTRS.author | html %] +
+
+
[% formats = attrs.all_formats; IF ahr.hold_type == 'M'; 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 aee4e849ae..b296f92531 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2 @@ -5,7 +5,8 @@

[% l('Account Preferences') %]

- +

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

- [% 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") %] -
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 index 8c50b48dbe..7a5c024aab 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 @@ -76,7 +76,6 @@ %] - [% skip_warn = l('Skip warning when adding to temporary book list?') %] 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 13ca4ad3b6..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.

diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2 index e85671f457..67338afd1c 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2 @@ -214,7 +214,6 @@ value="[% l('Submit') %]" title="[% l('Submit') %]" 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 dd6b48bb8b..9b1cf9c143 100644 --- a/Open-ILS/src/templates/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates/opac/parts/topnav.tt2 @@ -26,7 +26,8 @@