--- loncom/auth/lonlogin.pm	2006/09/28 00:59:02	1.81
+++ loncom/auth/lonlogin.pm	2006/11/10 02:02:57	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.81 2006/09/28 00:59:02 albertel Exp $
+# $Id: lonlogin.pm,v 1.83 2006/11/10 02:02:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,8 +150,6 @@ ENDFAILED
     }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my $sysadm  = $r->dir_config('lonSysEMail');
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
@@ -254,7 +252,6 @@ ENDFAILED
 <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
 <h3>This LON-CAPA server is temporarily not available for login</h3>
 <p>Please attempt to login to one of the following servers:</p>$spares
-<p>If the problem persists, please contact <tt>$servadm</tt>.</p>
 </body>
 </html>
 ENDTROUBLE
@@ -264,8 +261,6 @@ ENDTROUBLE
 # ----------------------------------------------- Apparently we are in business
 
     my $domainlogo=&Apache::loncommon::domainlogo($domain);
-    $servadm=~s/\,/\<br \/\>/g;
-    $sysadm=~s/\,/\<br \/\>/g;
 
 # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);
@@ -313,11 +308,11 @@ my %lt=&Apache::lonlocal::texthash(
 		  'log' => 'Log in',
 		  'help' => 'Help',
 		  'serv' => 'Server',
-                  'servadm' => 'Server Administration',
-                  'sysadm' => 'System Administration',
-                  'helpdesk' => 'Contact Helpdesk');
+                  'helpdesk' => 'Contact Helpdesk',
+                  'forgotpw' => 'Forgot password?');
 # -------------------------------------------------- Change password field name
     my $now=time;
+    my $forgotpw = &forgotpwdisplay(\%lt);
 # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDSCRIPT);
 
@@ -462,9 +457,6 @@ ENDTOP
 <label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />
 <label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />
 <label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />
-<p>If you have accessibility needs that are not addressed by this interface, 
-please
-contact the system administrator at <tt>$sysadm</tt>.</p><br />
 <input type="checkbox" name="remember" /> Remember these settings for next login<hr />
 ENDACCESSOPTIONS
 } else {
@@ -503,13 +495,18 @@ ENDNOOPT
         <input type="submit" value="$lt{'log'}" />
        </td>
       </tr>
+      <tr>
+       <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">
+        $forgotpw
+       </td>
+      </tr>
      </table>
      <!-- End sub-table -->
     </form>
 ENDLOGIN
     if ($fullgraph) {
         my $helpdeskscript;
-        my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
+        my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);
 	$r->print(<<ENDDOCUMENT);
    </td>
 
@@ -605,23 +602,13 @@ ENDDOCUMENT
 }
 
 sub contactdisplay {
-    my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
+    my ($lt,$version,$authdomain,$helpdeskscript) = @_;
     my $contactblock;
-    my $showsysadm = 1;
-    my $showservadm = 1;
     my $showhelpdesk = 0;
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $showhelpdesk = 1;
     }
-    if ($showsysadm) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';
-    }
-    if ($showservadm) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
-    }
     if ($showhelpdesk) {
         $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
         my $thisurl = &escape('/adm/login');
@@ -644,6 +631,15 @@ ENDSCRIPT
 ENDBLOCK
     return $contactblock;
 }
+
+sub forgotpwdisplay {
+    my ($lt) = @_;
+    my $prompt_for_resetpw = 1; 
+    if ($prompt_for_resetpw) {
+        return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt->{'forgotpw'}.'</a></b><br /><br />';
+    }
+    return;
+}
  
 
 1;