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=b5e8ecddf8b8798f7854c4f6a4ba1da8599cd681;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 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 --- diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index 4078189947..14d6d37463 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -936,6 +936,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 { @@ -1379,6 +1380,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; diff --git a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 index 1faffe6e24..bf51f659a9 100644 --- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 @@ -45,7 +45,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 1f80ae053c..1579ed6544 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 %] @@ -145,7 +146,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 068557fd47..8cfd1f1da5 100644 --- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 @@ -29,7 +29,7 @@
- [% l("Previously Held Items") %] + [% l("Previously Requested Items") %] limit,offset => (offset - limit)}) %]' [% IF offset == 0 %] class='invisible' [% END %]>◄[% l('Previous') %] @@ -63,14 +63,17 @@ - - - - - + + + + + + + + - + [% FOR hold IN ctx.holds; attrs = {marc_xml => hold.marc_xml}; PROCESS get_marc_attrs args=attrs; @@ -90,8 +93,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 eaffd13635..e49bc09db5 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -35,7 +35,7 @@ [% IF CGI.param("available"); l("Items Ready for Pickup"); ELSE; - l("Items Currently on Hold"); + l("Items Currently On Hold"); END %] @@ -63,6 +63,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.

@@ -83,6 +85,7 @@ + + --> @@ -110,23 +114,24 @@ [% 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.'); @@ -101,8 +105,8 @@ [% 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 -%]
- +
+ - - - - - - - + + + - + + + + + + @@ -194,15 +199,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 e6d7f1381e..b37af03944 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -17,29 +17,22 @@ [% IF ctx.fines.circulation.size > 0 %]
- -
- - - [% IF myopac_cc_allowed %] - [% l("Pay Selected Circulation Charges") %] - [% ELSE %] - [% l("Circulation Charges") %] - [% END %] - - -
- - - - +
[% l("Fines") %]
+
+ - - [% IF myopac_cc_allowed %] + + + + + + + [% IF myopac_cc_allowed %] [% END %] @@ -130,28 +123,26 @@ [% IF ctx.fines.grocery.size > 0 %]
-

-
- - - [% IF myopac_cc_allowed %] - [% l("Pay Selected Other Charges") %] - [% ELSE %] - [% l("Other Charges") %] - [% END %] - - -
- -
[% l("Title") %][% l("Author") %][% l("Checkout Date") %][% l("Due Date") %][% l("Date Returned") %][% l("Balance Owed") %] + title="[% l('Click to (un)select all fines') %]" /> + [% l("Owed") %]
- +
+
+
+
[% l("Other Fees") %]
+
+ - - [% IF myopac_cc_allowed %] - + + + + + + [% 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 7702c1e150..030138844c 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("Transaction Start Time") %][% l("Last Payment Time") %][% l("Initial Amount Owed") %][% l("Total Amount Paid") %][% l("Balance Owed") %][% l("Billing Type") %] + [% l("Owed") %]
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 4e038b0ac7..9830cf5b8a 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 84bd822859..9b745486f8 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2 @@ -263,7 +263,6 @@ function toggleActivationDate() { 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 1535104401..c96514f763 100644 --- a/Open-ILS/src/templates/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates/opac/parts/topnav.tt2 @@ -26,7 +26,8 @@