TPac: password reset honors success/error style

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>

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 63caca7..fbcc8e7 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -1598,7 +1598,7 @@ sub load_password_reset {
 
         } else { # 2 password values needed
 
-            $ctx->{pwreset} = {style => 'error', status => 'TWO_PASSWORDS'};
+            $ctx->{pwreset} = {status => 'TWO_PASSWORDS'};
         }
 
     } elsif ($barcode or $username) {
@@ -1609,7 +1609,7 @@ sub load_password_reset {
             'open-ils.actor', 
             'open-ils.actor.patron.password_reset.request', @params);
 
-        $ctx->{pwreset} = {style => 'plain', status => 'REQUEST_SUCCESS'};
+        $ctx->{pwreset} = {status => 'REQUEST_SUCCESS'};
     }
 
     $logger->info("patron password reset resulted in " . Dumper($ctx->{pwreset}));

diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index bc35a64..b0533ac 100644 (file)
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -16,7 +16,7 @@
         NO_MATCH => l('Passwords did not match. Please try again'),
         NOT_ACTIVE => l('This was not an active password reset request. Your password has not been reset.'),
         NOT_STRONG => l('The password you chose was not considered complex enough to protect your account. Your password has not been reset.'),
-        TWO_PASSWORDS => l('Please enter your password twice'),
+        TWO_PASSWORDS => l('Please enter and repeat your new password.'),
         REQUEST_SUCCESS => l('Your user name or barcode has been submitted for a password reset. ' _ 
             'If a matching account with an email address is found, you will soon receive an email at that address with further instructions for resetting your password.')
     }

diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 80e1766..226e4b9 100644 (file)
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -1030,3 +1030,6 @@ a.opac-button {
 
 
 .bookbag-item-row td { vertical-align: top; }
+
+.error { color: red; font-weight: bold; }
+.success { color: green; font-weight: bold; }