From: berick Date: Mon, 14 Mar 2011 21:46:13 +0000 (-0400) Subject: integrated update-email address action into account prefs X-Git-Url: http://git.equinoxoli.org/?p=evergreen-equinox.git;a=commitdiff_plain;h=284468da04d903467c3be92230d5195f65c03bd5 integrated update-email address action into account prefs --- 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 54c1803..e92a4bd 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm @@ -480,7 +480,7 @@ sub load_myopac_update_email { $e->authtoken, $email); my $url = $self->apache->unparsed_uri; - $url =~ s/update_email/main/; + $url =~ s/update_email/prefs/; return $self->generic_redirect($url); } diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css index d095b1d..ce35479 100644 --- a/Open-ILS/web/css/skin/default/opac/style.css +++ b/Open-ILS/web/css/skin/default/opac/style.css @@ -950,3 +950,8 @@ div.select-wrapper:hover { .subtle-button:hover { text-decoration: underline; cursor: pointer; } .no-dec:hover { text-decoration: none; } .pending-addr td { background-color: #ffcccc !important; border: 0 !important; } + +#account-update-email table { text-align: center; padding: 20px; margin-top: 30px; border-collapse: collapse; } +#account-update-email table td { padding: 5px 15px 5px 15px; border-bottom: 1px solid #ddd; text-align: left;} +#account-update-email-error { font-size: 1.5em; padding: 10px; border:1px solid #e9ebf3;} + diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 index ebfbebd..bb62854 100644 --- a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 +++ b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 @@ -475,14 +475,9 @@ - - [% l("Email Address") %] - + [% l("Email Address") %] [% ctx.user.email | html %] - - [% l("Change") %] + [% l('Change') %] diff --git a/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 b/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 new file mode 100644 index 0000000..22b089a --- /dev/null +++ b/Open-ILS/web/templates/default/opac/myopac/update_email.tt2 @@ -0,0 +1,24 @@ +[% 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"; + myopac_page = "update_email" %] +
+ +[% IF ctx.invalid_email %] +
+ [% | l(ctx.invalid_email) %] + The email address "[_1]" is invalid. Please try a different email address. + [% END %] +
+[% END %] + +
+ + + + +
[% l('Current Email') %][% ctx.user.email | html %]
[% l('New Email') %]
+
+ +[% END %]