--- loncom/auth/lonlogin.pm	2000/06/29 20:43:03	1.6
+++ loncom/auth/lonlogin.pm	2001/01/17 17:27:49	1.10
@@ -1,7 +1,8 @@
 # The LearningOnline Network
 # Login Screen
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29 Gerd Kortemeyer
+# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9,
+# 1/17/01 Gerd Kortemeyer
 #
 package Apache::lonlogin;
 
@@ -34,7 +35,7 @@ sub handler {
     $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;
 
-    my $otherserver='';
+    my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=$ENV{'request.firsturl'};
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') && ($loadpercent>100.0)) {
@@ -58,7 +59,7 @@ sub handler {
     my $lextkey=hex($lkey);
     my $uextkey=hex($ukey);
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.':'.$firsturl,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl,
        $lonhost);
 
 # --------------------------------------------------- Print login screen header
@@ -76,7 +77,8 @@ ENDHEADER
 # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDDOCUMENT);
 
-<body bgcolor="#FFFFFF" onLoad="init();">
+<body bgcolor="#FFFFFF" text="#000000" link="#999999" vlink="#999999"
+ onLoad="init();">
 
 <script language="JavaScript">
 
@@ -99,9 +101,13 @@ ENDHEADER
 
 </script>
 
+<a href="/adm/accessibility.html">Accessibility Options</a>
+&nbsp;&nbsp;
+<a href="/adm/about.html">About LON-CAPA</a><p>
 <table width=600>
-<tr><td><img src="$iconpath/lonlogo.gif"></td>
-<td bgcolor="#DDDDDD">
+<tr><td>
+<img src="$iconpath/lonlogo.gif"></td>
+<td colspan=2 bgcolor="#DDDDDD">
 <font size=+1><b>User Authentication</b></font><p>
 
  <form name="server" action="$otherserver/adm/authenticate" 
@@ -130,7 +136,7 @@ ENDHEADER
 <table border=1 bgcolor="#BBBBBB">
 <tr><td><font size="-1"><b>Domain:</b></font></td>
     <td><font size="-1"><tt>$domain</tt></font></td>
-    <td rowspan=3><font size="-1"><b>LON System Administration:</b><br>
+    <td rowspan=3><font size="-1"><b>System Administration:</b><br>
                   <tt>$sysadm</tt><br>
                   <b>Server Administration:</b><br>
                   <tt>$servadm</tt></font></td></tr>
@@ -140,12 +146,12 @@ ENDHEADER
     <td><font size="-1"><tt>$loadpercent</tt> percent</font></td></tr>
 </table>
 </td><td>
-<table align=right><tr><td><font size="+1">
+<font size="+1">
 <b>L</b>aboratory&nbsp;for<br>
 <b>I</b>nstructional<br>
 <b>T</b>echnology&nbsp;in<br>
 <b>E</b>ducation</td><td>
-<img src="$iconpath/liteani.gif"></font></td></tr></table></td></tr></table>
+<img src="$iconpath/liteani.gif"></font></td></tr></table>
 </body>
 </html>
 ENDDOCUMENT

	+
+	User Authentication
Domain:	`$domain`	LON System Administration: +	System Administration: `$sysadm` Server Administration: `$servadm`
`$loadpercent` percent