--- loncom/auth/lonlogin.pm	2003/09/17 02:24:14	1.51
+++ loncom/auth/lonlogin.pm	2003/09/21 20:06:36	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.51 2003/09/17 02:24:14 www Exp $
+# $Id: lonlogin.pm,v 1.54 2003/09/21 20:06:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,8 +45,9 @@ use Apache::lonlocal;
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
     &Apache::loncommon::no_cache($r);
+    &Apache::lonlocal::get_language_handle($r);
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -61,9 +62,6 @@ sub handler {
      ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
       ['interface','username','domain','firsturl','localpath','localres']);
  
-# -------------------------------------------------------------------- Language
-
-    &Apache::lonlocal::get_language_handle();
 
 # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;
@@ -224,8 +222,11 @@ my %lt=&Apache::lonlocal::texthash(
 		  'pw'  => 'Password',
 		  'dom' => 'Domain',
 		  'perc' => 'percent',
-		  'user' => 'User',
-		  'load' => 'load',
+		  'load' => 'Load',
+                  'userload' => 'User Load',
+                  'about'  => 'aboutlon.gif',
+                  'access' => 'accessbutton.gif',
+		  'auth' => 'userauthentication.gif',
 		  'log' => 'Log in',
 		  'help' => 'Help',
 		  'serv' => 'Server',
@@ -330,9 +331,9 @@ ENDSERVERFORM
    <!-- A cell that will hold the 'access' and 'about' buttons -->
    <!-- Row 3 Column 1 -->
    <td valign="top" height=60 align="center" bgcolor="$sidebg">
-    <a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 alt="Accessibility Options" /></a>
+    <a href="/adm/login?interface=textual"><img src="$iconpath/$lt{'access'}" border=0 alt="Accessibility Options" /></a>
     <br />
-    <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>
+    <a href="/adm/about.html"><img src="$iconpath/$lt{'about'}" border=0 alt="About LON-CAPA" /></a>
    </td>
 
    <!-- The shaded space between the two main columns -->
@@ -389,7 +390,7 @@ ENDNOOPT
 
      <!-- Start the sub-table for text and input alignment -->
      <table border=0 cellspacing=0 cellpadding=0>
-      <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
+      <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" alt="User Authentication" /></td></tr>
       <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'un'}:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
@@ -450,7 +451,7 @@ ENDLOGIN
       </tr>
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;Load:&nbsp;</b></small>
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
        </td>
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
@@ -458,7 +459,7 @@ ENDLOGIN
       </tr>
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'user'}&nbsp;$lt{'load'}:&nbsp;</b></small>
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
        </td>
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>