--- loncom/auth/lonlogin.pm	2010/05/06 16:15:59	1.137
+++ loncom/auth/lonlogin.pm	2010/08/25 17:47:21	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.137 2010/05/06 16:15:59 bisitz Exp $
+# $Id: lonlogin.pm,v 1.141 2010/08/25 17:47:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -152,15 +152,8 @@ sub handler {
     my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
     my $userloadpercent=&Apache::lonnet::userload();
 
-# ------------------------------------------------------- Do the load balancing
-    my $otherserver= &Apache::lonnet::absolute_url($host_name);
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
-# ---------------------------------------------------------- Are we overloaded?
-    if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
-        my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
-	if ($unloaded) { $otherserver=$unloaded; }
-    }
 
 # ----------------------------------------------------------- Get announcements
     my $announcements=&Apache::lonnet::getannounce();
@@ -269,11 +262,7 @@ my $loginbox_header_bgcol=&Apache::lonco
 my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);
 my $logo=&Apache::loncommon::designparm('login.logo',$domain);
 my $img=&Apache::loncommon::designparm('login.img',$domain);
-my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
-my $login=&Apache::loncommon::designparm('login.login',$domain);
-if ($login eq '') {
-$login = $iconpath.'/'.&mt('userauthentication.gif');
-}
+my $domainlogo=&Apache::loncommon::domainlogo($domain);
 my $showbanner = 1;
 my $showmainlogo = 1;
 if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
@@ -285,7 +274,6 @@ if (defined(&Apache::loncommon::designpa
 my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
 my $showcoursecat =
 &Apache::loncommon::designparm('login.coursecatalog',$domain);
-my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
 my $shownewuserlink = 
 &Apache::loncommon::designparm('login.newuser',$domain);
 my $now=time;
@@ -318,6 +306,14 @@ this.document.client.elements.upass$now.
 this.document.server.submit();
 return false;
 }
+
+function enableInput() {
+    this.document.client.elements.upass$now.removeAttribute("readonly");
+    this.document.client.elements.uname.removeAttribute("readonly");
+    this.document.client.elements.udom.removeAttribute("readonly");
+    return;
+}
+
 // ]]>
 </script>
 
@@ -330,7 +326,8 @@ my %add_entries = (
 	       text         => "$font",
 	       link         => "$link",
 	       vlink        => "$vlink",
-	       alink        => "$alink",);
+	       alink        => "$alink",
+               onload       => 'javascript:enableInput();',);
 
 $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
 			       { 'redirect'       => [$expire,'/adm/roles'], 
@@ -380,7 +377,7 @@ $r->print(
 #
 
 $r->print(<<ENDSERVERFORM);
-<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
+<form name="server" action="/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
@@ -403,14 +400,9 @@ if ($shownewuserlink) {
 my $logintitle =
     '<h2 class="LC_hcell"'
    .' style="background:'.$loginbox_header_bgcol.';'
-   .' color:'.$loginbox_header_textcol.'">';
-if ($loginheader eq 'text') {
-    $logintitle .= $lt{'log'};
-} else {
-    $logintitle .= '<img src="'.$login.'"'.
-                   ' alt="'.&mt('User Authentication').'" />';
-}
-$logintitle .= '</h2>';
+   .' color:'.$loginbox_header_textcol.'">'
+   .$lt{'log'}
+   .'</h2>';
 
 my $noscript_warning='<noscript><span class="LC_warning"><b>'
                      .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
@@ -424,11 +416,11 @@ my $loginform=(<<LFORM);
   <input type="hidden" name="lextkey" value="$lextkey" />
   <input type="hidden" name="uextkey" value="$uextkey" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />
-  <input type="text" name="uname" id="uname" size="15" value="$authusername" /><br />
+  <input type="text" name="uname" id="uname" size="15" value="$authusername" readonly="readonly" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
-  <input type="password" name="upass$now" id="upass$now" size="15" /><br />
+  <input type="password" name="upass$now" id="upass$now" size="15" readonly="readonly" /><br />
   <b><label for="udom">$lt{'dom'}</label>:</b><br />
-  <input type="text" name="udom" id="udom" size="15" value="$authdomain" /><br />
+  <input type="text" name="udom" id="udom" size="15" value="$authdomain" readonly="readonly" /><br />
   <input type="submit" value="$lt{'log'}" />
 </form>
 LFORM
@@ -465,12 +457,12 @@ ENDTOP
     }
 $r->print(<<ENDTOP);
 $announcements
-$domainlogo
 </div>
 <hr style="clear:both;" />
 ENDTOP
 
 $r->print(<<ENDDOCUMENT);
+    <div style="float: left;">
      <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td  align="left" valign="top">
@@ -510,6 +502,11 @@ $r->print(<<ENDDOCUMENT);
        </td>
       </tr>
      </table>
+    </div>
+    <div style="float: right;">
+    $domainlogo
+    </div>
+    <br style="clear:both;" />
  </div>
 
 <script type="text/javascript">