From 212d6aad09b7a2fc35d7e908910de59f3f25e38c Mon Sep 17 00:00:00 2001 From: berick Date: Thu, 7 Apr 2011 10:15:42 -0400 Subject: [PATCH] More my-account cleanup/consistency For consistency, make new sub-pages (payments history, preferences) load as a separate page in the same path (prefs -> prefs_notify) instead of either an ?expand= option or a sub-path page (prefs -> prefs/notify). Let the my-account base page load the generic base page as a wrapper so that my-account page are not required to load both and (for me, anyway) make the inheritance more obvious. --- .../perlmods/lib/OpenILS/WWW/EGCatLoader.pm | 5 +- .../lib/OpenILS/WWW/EGCatLoader/Account.pm | 22 +- .../default/opac/myopac/circ_history.tt2 | 3 +- .../templates/default/opac/myopac/circs.tt2 | 3 +- .../default/opac/myopac/hold_history.tt2 | 3 +- .../templates/default/opac/myopac/holds.tt2 | 3 +- .../templates/default/opac/myopac/lists.tt2 | 3 +- .../templates/default/opac/myopac/main.tt2 | 488 ++++++------------ .../default/opac/myopac/main_payments.tt2 | 30 ++ .../templates/default/opac/myopac/prefs.tt2 | 456 +++++++++++++--- .../{prefs/notify.tt2 => prefs_notify.tt2} | 6 +- .../settings.tt2 => prefs_settings.tt2} | 5 +- .../default/opac/myopac/update_email.tt2 | 3 +- .../default/opac/parts/myopac/base.tt2 | 3 + .../default/opac/parts/myopac/main_base.tt2 | 97 ++++ .../default/opac/parts/myopac/personal.tt2 | 395 -------------- .../default/opac/parts/myopac/prefs_base.tt2 | 57 ++ 17 files changed, 775 insertions(+), 807 deletions(-) create mode 100644 Open-ILS/web/templates/default/opac/myopac/main_payments.tt2 rename Open-ILS/web/templates/default/opac/myopac/{prefs/notify.tt2 => prefs_notify.tt2} (97%) rename Open-ILS/web/templates/default/opac/myopac/{prefs/settings.tt2 => prefs_settings.tt2} (97%) create mode 100644 Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2 delete mode 100644 Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2 create mode 100644 Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2 diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm index 342217c213..33e2822501 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm @@ -121,14 +121,15 @@ sub load { return $self->load_place_hold if $path =~ m|opac/place_hold|; return $self->load_myopac_holds if $path =~ m|opac/myopac/holds|; return $self->load_myopac_circs if $path =~ m|opac/myopac/circs|; + return $self->load_myopac_payments if $path =~ m|opac/myopac/main_payments|; return $self->load_myopac_main if $path =~ m|opac/myopac/main|; return $self->load_myopac_update_email if $path =~ m|opac/myopac/update_email|; return $self->load_myopac_bookbags if $path =~ m|opac/myopac/lists|; return $self->load_myopac_bookbag_update if $path =~ m|opac/myopac/list/update|; return $self->load_myopac_circ_history if $path =~ m|opac/myopac/circ_history|; return $self->load_myopac_hold_history if $path =~ m|opac/myopac/hold_history|; - return $self->load_myopac_prefs_notify if $path =~ m|opac/myopac/prefs/notify|; - return $self->load_myopac_prefs_settings if $path =~ m|opac/myopac/prefs/settings|; + return $self->load_myopac_prefs_notify if $path =~ m|opac/myopac/prefs_notify|; + return $self->load_myopac_prefs_settings if $path =~ m|opac/myopac/prefs_settings|; return $self->load_myopac_prefs if $path =~ m|opac/myopac/prefs|; return Apache2::Const::OK; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm index 552e5c5079..e51ddd95c2 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm @@ -551,23 +551,11 @@ sub load_myopac_hold_history { return Apache2::Const::OK; } -sub load_myopac_main { - my $self = shift; - my $limit = $self->cgi->param('limit') || 0; - my $offset = $self->cgi->param('offset') || 0; - my $expand = $self->cgi->param('expand') || ''; - - return $self->load_myopac_payments($limit, $offset) - if $expand eq 'payments'; - - return $self->load_myopac_fines($limit, $offset); -} - # TODO: add other filter options as params/configs/etc. sub load_myopac_payments { my $self = shift; - my $limit = shift || 0; - my $offset = shift || 0; + my $limit = $self->cgi->param('limit') || 0; + my $offset = $self->cgi->param('offset') || 0; my $e = $self->editor; my $args = {}; @@ -584,10 +572,10 @@ sub load_myopac_payments { -sub load_myopac_fines { +sub load_myopac_main { my $self = shift; - my $limit = shift || 0; - my $offset = shift || 0; + my $limit = $self->cgi->param('limit') || 0; + my $offset = $self->cgi->param('offset') || 0; my $e = $self->editor; my $ctx = $self->ctx; diff --git a/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2 b/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2 index e21e67fd8d..4b2f27b941 100644 --- a/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2 @@ -1,7 +1,6 @@ [% PROCESS "default/opac/parts/header.tt2"; PROCESS "default/opac/parts/marc_misc.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; myopac_page = "circs"; limit = CGI.param('limit') || 25; offset = CGI.param('offset') || 0; diff --git a/Open-ILS/web/templates/default/opac/myopac/circs.tt2 b/Open-ILS/web/templates/default/opac/myopac/circs.tt2 index 2e68ca1b71..c16d28cf2f 100644 --- a/Open-ILS/web/templates/default/opac/myopac/circs.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/circs.tt2 @@ -1,7 +1,6 @@ [% PROCESS "default/opac/parts/header.tt2"; PROCESS "default/opac/parts/misc_util.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; myopac_page = "circs" %]
diff --git a/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2 b/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2 index e2151e2287..62429fe3a9 100644 --- a/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2 @@ -1,7 +1,6 @@ [% PROCESS "default/opac/parts/header.tt2"; PROCESS "default/opac/parts/marc_misc.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; myopac_page = "holds" limit = CGI.param('limit') || 25; offset = CGI.param('offset') || 0; diff --git a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 b/Open-ILS/web/templates/default/opac/myopac/holds.tt2 index acced7f6e4..ec188319eb 100644 --- a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/holds.tt2 @@ -1,7 +1,6 @@ [% PROCESS "default/opac/parts/header.tt2"; PROCESS "default/opac/parts/misc_util.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; myopac_page = "holds" %]
diff --git a/Open-ILS/web/templates/default/opac/myopac/lists.tt2 b/Open-ILS/web/templates/default/opac/myopac/lists.tt2 index f661726c38..70fc3281ec 100644 --- a/Open-ILS/web/templates/default/opac/myopac/lists.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/lists.tt2 @@ -1,7 +1,6 @@ [% PROCESS "default/opac/parts/header.tt2"; PROCESS "default/opac/parts/misc_util.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; myopac_page = "lists" %]
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- [% l('Fines:') %] - - [% money(ctx.user_stats.fines.balance_owed) %] -
- [% l('Pay Fines') %] -
- - -
-
-
-
- - - - - -
[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %] - [% l("View All") %] -
-
-
- - - - - -
[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %] - [% l('View All') %] -
-
-
- - - - - -
[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %] - [% l('View All') %] -
-
- - - -
-
-
- -
-
- [% IF show_payments %] - - - [% ELSE %] - - - [% END %] -
-
- -[% IF !show_payments %] [% IF ctx.fines.circulation.size > 0 %]
@@ -262,213 +154,177 @@ [% END %] - + -[% ELSE %] -
-
- - - - - - - - [% FOR payment IN ctx.payments %] - - - - - - - [% END %] - -
[% l('Payment Date') %][% l('Payment For') %][% l('Amount') %][% l('Receipt') %]
[% date.format(ctx.parse_datetime(payment.mp.payment_ts), DATE_FORMAT) %][% (payment.xact_type == 'grocery') ? payment.last_billing_type : payment.title %][% money(payment.mp.amount) %] - [%# post to print/email form... %] - [% l('Print') %] / [% l('Email') %] -
-
-[% END %] - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
Billing Information - Selected fines you are paying for: - - - - - - - - - -
- Name - - Amount -
-
-
- Total amount to pay: - $ -
-
- Click Cancel to go back and (un)select - other fines. -
First Name
Last Name
Street Address
City
State or Province
ZIP or Postal Code
Credit Card Information
Credit Card #
-
-
- -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - -
Billing Information + Selected fines you are paying for: + + + + + + + + + +
+ Name + + Amount +
+
+
+ Total amount to pay: + $ +
+
+ Click Cancel to go back and (un)select + other fines. +
First Name
Last Name
Street Address
City
State or Province
ZIP or Postal Code
Credit Card Information
Credit Card #
+
+
+
- Security Code -
- -
Exipration Month - -
Expiration Year - -
Edit Billing Address - -
- - -
-
- Important! You must have a printed receipt to be - eligible for a refund on lost items (regulations allow - for no exceptions). -
- - To ensure your necessary receipt information is - not lost, enter your email address above and a - receipt will be emailed to you. Otherwise, make - certain you have a printed receipt in hand before - closing the payment receipt screen. - -
- Refunds are not available for parts and pieces, overdue - fines, or items that do not display a specific title in - My Account. For a full list of refundable and - non-refundable items, visit - http://www.kcls.org/usingthelibrary/borrowing/refundable.cfm

- This site uses VeriSign SSL encryption to ensure your - privacy. -
-
+
+ Security Code + 		+ +
Exipration Month + +
Expiration Year + +
Edit Billing Address + +
+ + +
+
+ Important! You must have a printed receipt to be + eligible for a refund on lost items (regulations allow + for no exceptions). +
+ + To ensure your necessary receipt information is + not lost, enter your email address above and a + receipt will be emailed to you. Otherwise, make + certain you have a printed receipt in hand before + closing the payment receipt screen. + +
+ Refunds are not available for parts and pieces, overdue + fines, or items that do not display a specific title in + My Account. For a full list of refundable and + non-refundable items, visit + http://www.kcls.org/usingthelibrary/borrowing/refundable.cfm

+ This site uses VeriSign SSL encryption to ensure your + privacy. +
[% END %] diff --git a/Open-ILS/web/templates/default/opac/myopac/main_payments.tt2 b/Open-ILS/web/templates/default/opac/myopac/main_payments.tt2 new file mode 100644 index 0000000000..3749bdaec5 --- /dev/null +++ b/Open-ILS/web/templates/default/opac/myopac/main_payments.tt2 @@ -0,0 +1,30 @@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/main_base.tt2"; + myopac_page = "main"; + myopac_main_page = "payments"; +%] +
+ + + + + + + + + [% FOR payment IN ctx.payments %] + + + + + + + [% END %] + +
[% l('Payment Date') %][% l('Payment For') %][% l('Amount') %][% l('Receipt') %]
[% date.format(ctx.parse_datetime(payment.mp.payment_ts), DATE_FORMAT) %][% (payment.xact_type == 'grocery') ? payment.last_billing_type : payment.title %][% money(payment.mp.amount) %] + [%# post to print/email form... %] + [% l('Print') %] / [% l('Email') %] +
+
+[% END %] diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 index 1f40c0b100..5846c153ff 100644 --- a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 @@ -1,67 +1,401 @@ [% PROCESS "default/opac/parts/header.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; - myopac_page = "prefs" - prefs_page = (ctx.path_info.match('/prefs$')) ? 'personal' : - (ctx.path_info.match('/prefs/notify')) ? 'notify' : 'settings'; -%] - -
-
-
- - [% IF prefs_page == 'personal' %] -
- -
-
- -
-
- -
- [% ELSIF prefs_page == 'notify' %] -
- -
-
- -
-
- -
- [% ELSE %] -
- -
-
- -
-
- -
- [% END %] -
-
- -

- -
- [% l('Account Information and Preferences') %] - - [% l('Export List') %] - + WRAPPER "default/opac/parts/myopac/prefs_base.tt2"; + myopac_page = "prefs"; + prefs_page = 'personal' %] + +
+
+ + + + + + +
+ [% l("Your account expired on") %] + ! + [% l("Please see a librarian to renew your account.") %]
+
+ +
+ + + + + + + + + + + + +
+ [% l("* Staff Notes *") %]
:

-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -[% - IF prefs_page == 'personal'; - # By default, load the personal info page - INCLUDE 'default/opac/parts/myopac/personal.tt2'; - ELSE; - content; - END; -%] + + + + + + + + + + + + + + + + + + + + + + + + + [% IF ctx.user.ident_value %] + + + + + [% END %] + + + + + + + + + + + + + + + + + + + + + + + +
[% l("Name") %][% 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") %][% ctx.user.day_phone | html %][% l("Change") %]
+ + Enter New [% l("Day Phone") %]: + + + + + + + + + +
+ [% l("Evening Phone") %][% ctx.user.evening_phone | html %][% l("Change") %]
New + [% l("Evening Phone") %]: + + + +
+ [% l("Other Phone") %][% ctx.user.other_phone | html %][% l("Change") %]
Enter + New [% l("Other Phone") %]: + + + +
+
+
+ + Username Help +
+
[% l("Username") %] + 		[% ctx.user.usrname | html %][% l("Change") %]
[% l("Enter new username:") %] + + + +
+ [% l("Password") %] + [% l("(not shown)") %][% l("Change") %]
+ + + + + + + + + + + + + + + + + + + +
+ + [% l("Enter current password:") %] + + + +
[% l("Enter new password:") %] +
[% l("Re-enter new password:") %] + +
+ +
[% l("Email Address") %][% ctx.user.email | html %][% l('Change') %]
+ + [% l("Enter new email address:") %] + + + + + + + + +
+ [% l("Primary Identification") %] + [% + # l('[_1] ([_2])', ctx.user.ident_value, ctx.user.ident_type.name) | html + # XXX uncomment the above line to show primary + # identification. With a minor tweak it could + # alternatively be shown but partially obscured. + %] +
+ [% l("Active Barcode") %][% ctx.user.card.barcode %]
+ [% l("Home Library") %][% ctx.user.home_ou.name %][% l("Change") %]
+ + New home library: + + + + + + + +
+ [% l("Account Creation Date") %] +

+
+
+ + + + + + + + + + [% FOR addr IN ctx.user.addresses %] + + + + [% END %] + +
[% l("Addresses") %]
+ + + + + + + + + + [% IF addr.street2 %] + + + [% END %] + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% l("Address Type") %][% + IF addr.pending == "t"; + "" _ l("*** PENDING ***") _ " "; + END; + addr.address_type | lower | ucfirst; + %]
[% l("Street") %][% addr.street1 | html %]
[% l("Street") %][% addr.street2 | html %]
[% l("City") %][% addr.city | html %]
[% l("County") %][% addr.county| html %]
[% l("State") %][% addr.state | html %]
[% l("Country") %][% addr.country | html %]
[% l("Zip") %][% addr.post_code | html %]
+ Edit Address +
+
+ [% END %] diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs/notify.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs_notify.tt2 similarity index 97% rename from Open-ILS/web/templates/default/opac/myopac/prefs/notify.tt2 rename to Open-ILS/web/templates/default/opac/myopac/prefs_notify.tt2 index e8486224a0..14a824e605 100644 --- a/Open-ILS/web/templates/default/opac/myopac/prefs/notify.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/prefs_notify.tt2 @@ -1,6 +1,8 @@ [% PROCESS "default/opac/parts/header.tt2"; - WRAPPER "default/opac/myopac/prefs.tt2"; - myopac_page = "prefs/notify" %] + WRAPPER "default/opac/parts/myopac/prefs_base.tt2"; + myopac_page = "prefs_notify"; + prefs_page = 'notify' %] +
diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs/settings.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs_settings.tt2 similarity index 97% rename from Open-ILS/web/templates/default/opac/myopac/prefs/settings.tt2 rename to Open-ILS/web/templates/default/opac/myopac/prefs_settings.tt2 index 3e111ffefc..4267d3ae34 100644 --- a/Open-ILS/web/templates/default/opac/myopac/prefs/settings.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/prefs_settings.tt2 @@ -1,6 +1,7 @@ [% PROCESS "default/opac/parts/header.tt2"; - WRAPPER "default/opac/myopac/prefs.tt2"; - myopac_page = "prefs/notify" %] + WRAPPER "default/opac/parts/myopac/prefs_base.tt2"; + myopac_page = "prefs_notify"; + prefs_page = 'settings' %] USER SETTINGS diff --git a/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 b/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 index 7a9c014d06..92aed44faa 100644 --- a/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 @@ -1,7 +1,6 @@ [% PROCESS "default/opac/parts/header.tt2"; PROCESS "default/opac/parts/misc_util.tt2"; - WRAPPER "default/opac/parts/base.tt2" + - "default/opac/parts/myopac/base.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; myopac_page = "update_email" %]
diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2 index f374db21e9..9e1125a1dc 100644 --- a/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2 @@ -1,3 +1,5 @@ +[% WRAPPER "default/opac/parts/base.tt2" %] + [% myopac_pages = [ {url => "main", name => "Account Summary"}, {url => "circs", name => "Items Checked Out"}, @@ -32,3 +34,4 @@
+[% END %] diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2 new file mode 100644 index 0000000000..0676ee922a --- /dev/null +++ b/Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2 @@ -0,0 +1,97 @@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; +%] + +
+ +
+
[% l('Account Summary') %]
+
+ + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ [% l('Fines:') %] + + [% money(ctx.user_stats.fines.balance_owed) %] +
+ + [%# TODO %] + [% l('Pay Fines') %] +
+ +
+
+
+
+ + + + + +
[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %] + [% l("View All") %] +
+
+
+ + + + + +
[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %] + [% l('View All') %] +
+
+
+ + + + + +
[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %] + [% l('View All') %] +
+
+
+
+
+
+
+ [% IF myopac_main_page == 'main' %] + + + [% ELSE %] + + + [% END %] +
+
+ [% content %] +
+[% END %] diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2 deleted file mode 100644 index fe1be5cd1d..0000000000 --- a/Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2 +++ /dev/null @@ -1,395 +0,0 @@ -
-
- - - - - - -
- [% l("Your account expired on") %] - ! - [% l("Please see a librarian to renew your account.") %]
-
- -
- - - - - - - - - - - - -
- [% l("* Staff Notes *") %]
:

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [% IF ctx.user.ident_value %] - - - - - [% END %] - - - - - - - - - - - - - - - - - - - - - - - -
[% l("Name") %][% 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") %][% ctx.user.day_phone | html %][% l("Change") %]
- - Enter New [% l("Day Phone") %]: - - - - - - - - - -
- [% l("Evening Phone") %][% ctx.user.evening_phone | html %][% l("Change") %]
New - [% l("Evening Phone") %]: - - - -
- [% l("Other Phone") %][% ctx.user.other_phone | html %][% l("Change") %]
Enter - New [% l("Other Phone") %]: - - - -
-
-
- - Username Help -
-
[% l("Username") %] - 		[% ctx.user.usrname | html %][% l("Change") %]
[% l("Enter new username:") %] - - - -
- [% l("Password") %] - [% l("(not shown)") %][% l("Change") %]
- - - - - - - - - - - - - - - - - - - -
- - [% l("Enter current password:") %] - - - -
[% l("Enter new password:") %] -
[% l("Re-enter new password:") %] - -
- -
[% l("Email Address") %][% ctx.user.email | html %][% l('Change') %]
- - [% l("Enter new email address:") %] - - - - - - - - -
- [% l("Primary Identification") %] - [% - # l('[_1] ([_2])', ctx.user.ident_value, ctx.user.ident_type.name) | html - # XXX uncomment the above line to show primary - # identification. With a minor tweak it could - # alternatively be shown but partially obscured. - %] -
- [% l("Active Barcode") %][% ctx.user.card.barcode %]
- [% l("Home Library") %][% ctx.user.home_ou.name %][% l("Change") %]
- - New home library: - - - - - - - -
- [% l("Account Creation Date") %] -

-
-
- - - - - - - - - - [% FOR addr IN ctx.user.addresses %] - - - - [% END %] - -
[% l("Addresses") %]
- - - - - - - - - - [% IF addr.street2 %] - - - [% END %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[% l("Address Type") %][% - IF addr.pending == "t"; - "" _ l("*** PENDING ***") _ " "; - END; - addr.address_type | lower | ucfirst; - %]
[% l("Street") %][% addr.street1 | html %]
[% l("Street") %][% addr.street2 | html %]
[% l("City") %][% addr.city | html %]
[% l("County") %][% addr.county| html %]
[% l("State") %][% addr.state | html %]
[% l("Country") %][% addr.country | html %]
[% l("Zip") %][% addr.post_code | html %]
- Edit Address -
-
-
- diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2 new file mode 100644 index 0000000000..c26be3eb08 --- /dev/null +++ b/Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2 @@ -0,0 +1,57 @@ +[% PROCESS "default/opac/parts/header.tt2"; + WRAPPER "default/opac/parts/base.tt2" + + "default/opac/parts/myopac/base.tt2"; %] + +
+
+
+ + [% IF prefs_page == 'personal' %] +
+ +
+
+ +
+
+ +
+ [% ELSIF prefs_page == 'notify' %] +
+ +
+
+ +
+
+ +
+ [% ELSE %] +
+ +
+
+ +
+
+ +
+ [% END %] +
+
+ +

+ +
+ [% l('Account Information and Preferences') %] + + [% l('Export List') %] + +
+ +
+ +[% content; %] + +
+[% END %] -- 2.43.2