--- loncom/interface/resetpw.pm	2012/02/16 22:18:07	1.27
+++ loncom/interface/resetpw.pm	2013/02/05 15:45:18	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.27 2012/02/16 22:18:07 raeburn Exp $
+# $Id: resetpw.pm,v 1.31 2013/02/05 15:45:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -206,7 +206,10 @@ sub get_uname {
 sub send_token {
     my ($uname,$udom,$email,$server,$domdesc,$contact_name,
         $contact_email) = @_;
-    my $msg = &mt('Thank you for your request to reset the password for your LON-CAPA account.').'<br /><br />';
+    my $msg =
+        '<p class="LC_info">'
+       .&mt('Thank you for your request to reset the password for your LON-CAPA account.')
+       .'</p>';
 
     my $now = time;
     my $temppasswd = &create_passwd();
@@ -228,10 +231,21 @@ sub send_token {
         if ($result eq 'ok') {
             $msg .= &mt("An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.");
         } else {
-            $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
+            $msg .=
+                '<p class="LC_error">'
+               .&mt('An error occurred when sending a message to the e-mail address'
+                   .' associated with your LON-CAPA account.')
+               .'</p>'
+               .&display_actions($contact_email,$domdesc);
+
         }
     } else {
-        $msg .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
+        $msg .=
+            '<p class="LC_error">'
+           .&mt('An error occurred creating a token required for the'
+               .' password reset process.')
+           .'</p>'
+           .&display_actions($contact_email,$domdesc);
     }
     return $msg;
 }
@@ -260,8 +274,12 @@ sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email) = @_;
     my $msg;
     if ($error eq 'invalid') {
-        $msg = '<p class="LC_warning">'.&mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)
-              .'</p>'.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');
+        $msg =
+            '<p class="LC_warning">'
+            .&mt('The username you provided was not verified as a valid username'
+                .' in the LON-CAPA system for the [_1] domain.','<i>'.$domdesc.'</i>')
+              .'</p>';
+        $msg .= &display_actions($contact_email,$domdesc);
     } else {
         if ($error eq 'baduseremail') {
             $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
@@ -272,14 +290,8 @@ sub invalid_state {
         } elsif ($error eq 'authentication') {
             $msg = &mt('The username you provided uses an authentication type which can not be reset directly via LON-CAPA.');
         }
-        $msg = '<p class="LC_warning">'.$msg.'</p>';
-        if ($contact_email ne '') {
-            my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
-            $msg .= '<br /> '.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.'
-                                 ,'<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);
-        } else {
-            $msg .= '<br /> '.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
-        }
+        $msg = '<p class="LC_warning">'.$msg.'</p>'
+              .&display_actions($contact_email,$domdesc);
     }
     return $msg;
 }
@@ -317,11 +329,21 @@ sub reset_passwd {
                     my $result = &send_mail($domdesc,$data{'email'},$mailmsg,
                                             $contact_name,$contact_email);
                     if ($result eq 'ok') {
-                        $msg .= &mt('An e-mail confirming setting of the password for your LON-CAPA account has been sent to [_1].',$data{'email'});
+                        $msg .=
+                            '<p class="LC_success">'
+                           .&mt('An e-mail confirming setting of the password'
+                               .' for your LON-CAPA account has been sent to [_1].'
+                                ,$data{'email'})
+                           .'</p>';
                     } else {
-                        $msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'});
+                        $msg .=
+                            '<p class="LC_error">'
+                           .&mt('An error occurred when sending e-mail to [_1]'
+                               .' confirming setting of your new password.'
+                                ,$data{'email'})
+                           .'</p>';
                     }
-                    $msg .= '<br /><br />'
+                    $msg .= '<br />'
                            .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';
                 } elsif ($change_failed eq 'invalid_client') {
                     my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'});
@@ -337,7 +359,13 @@ sub reset_passwd {
                            $opentag = '<a href="'.$url.'">';
                            $closetag = '</a>';
                         }
-                        $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please try again from your [_1]home server[_2].',$opentag,$closetag);
+                        $msg .=
+                            '<p class="LC_warning">'
+                           .&mt('A problem occurred when attempting to reset'
+                               .' the password for your account.'
+                               .' Please try again from your [_1]home server[_2].'
+                                ,$opentag,$closetag)
+                           .'</p>';
                     }
                 } else {
                     $msg .= &generic_failure_msg($contact_name,$contact_email);
@@ -348,20 +376,31 @@ sub reset_passwd {
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);
             }
         } else {
-            $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
-                      ,'<a href="/adm/resetpw">','</a>');
+            $msg =
+                '<p class="LC_warning">'
+               .&mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
+                    ,'<a href="/adm/resetpw">','</a>')
+               .'</p>';
         }
     } else {
-        $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.'
-                   ,'<a href="/adm/resetpw">','</a>');
+        $msg .=
+            '<p class="LC_warning">'
+           .&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.'
+                ,'<a href="/adm/resetpw">','</a>')
+           .'</p>';
     }
     return $msg;
 }
 
 sub generic_failure_msg {
     my ($contact_name,$contact_email) = @_;
-    return &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.',
-              $contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
+    return
+        '<p class="LC_error">'
+       .&mt('A problem occurred when attempting to reset the password for your account.')
+       .'<br />'
+       .&mt('Please contact the [_1] - ([_2]) for assistance.',
+              $contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>')
+       .'</p>';
 }
 
 sub create_passwd {
@@ -384,4 +423,28 @@ sub create_passwd {
     return ($passwd);
 }
 
+sub display_actions {
+    my ($contact_email, $domdesc) = @_;
+    my @msg = (&mt('[_1]Go back[_2] and try again',
+                   '<a href="javascript:history.go(-1)">','</a>'));
+    my $msg2 = '';
+    if ($contact_email ne '') {
+        my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
+        push(@msg, &mt('Contact the [_1]LON-CAPA helpdesk[_2] for the institution: [_3]',
+                       '<a href="/adm/helpdesk?origurl='.$escuri.'">',
+                       '</a>','<i>'.$domdesc.'</i>'));
+    } else {
+        $msg2 =
+            '<p>'
+           .&mt('You may wish to send an e-mail to the'
+           .' server administrator: [_1] for the [_2] domain.',
+                '<i>'.$Apache::lonnet::perlvar{'AdmEMail'}.'</i>',
+                '<i>'.$domdesc.'</i>')
+           .'</p>';
+    }
+
+    return &Apache::lonhtmlcommon::actionbox(\@msg).$msg2;
+
+}
+
 1;