--- loncom/interface/resetpw.pm	2008/11/28 18:28:52	1.11
+++ loncom/interface/resetpw.pm	2009/09/14 14:48:20	1.11.2.1
@@ -1,6 +1,8 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
+# $Id: resetpw.pm,v 1.11.2.1 2009/09/14 14:48:20 raeburn Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -118,12 +120,12 @@ sub get_uname {
     my %lt = &Apache::lonlocal::texthash(
                                          unam => 'username',
                                          udom => 'domain',
-                                         uemail => 'Email address in LON-CAPA',
+                                         uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');
 
     my $msg = &mt('If you use the same account for other campus services besides LON-CAPA, (e.g., e-mail, course registration, etc.), a separate centrally managed mechanism likely exists to reset a password.  However, if your account is used for just LON-CAPA access you will probably be able to reset a password from this page.');
-    $msg .= '<br /><br />'.&mt('Three conditions must be met:')
-           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'
+    $msg .= &mt('Three conditions must be met:')
+           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your GCI WebCenter username.').'</li>'
            .'<li>'.&mt('You must be able to access e-mail sent to that address.').'</li>'
            .'<li>'.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.')
            .'</ul>';
@@ -131,9 +133,9 @@ sub get_uname {
 <form name="forgotpw" method="post">
 <table>
 <tr><td>
-<tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>
+<tr><td align="left">GCI WebCenter $lt{'unam'}:                      </td>
     <td><input type="text" name="uname" size="15"  /> </td></tr>
-<tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>
+<tr><td align="left">GCI WebCenter $lt{'udom'}:                      </td>
     <td>|;
     $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');
     $msg .= qq|</td></tr>
@@ -164,10 +166,9 @@ sub send_token {
     my $token = &Apache::lonnet::tmpput(\%info,$server,'resetpw');
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
-        my $mailmsg = "A request was submitted on ".&Apache::lonlocal::locallocaltime(time)." for a reset of the ".
-             "password for your LON-CAPA account.".
-             "To complete this process please open a web browser and enter the following ".
-             "URL in the address/location box: ".&Apache::lonnet::absolute_url()."/adm/resetpw?token=$esc_token";
+        my $showtime = &Apache::lonlocal::locallocaltime(time);
+        my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;
+        my $mailmsg = &mt('A request was submitted on [_1] for a reset of the password for your LON-CAPA account.',$showtime).' '.&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',$reseturl);
         my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,
                                 $contact_email);
         if ($result eq 'ok') {