--- loncom/auth/lonlogin.pm	2010/03/17 14:37:43	1.135
+++ loncom/auth/lonlogin.pm	2010/09/02 09:24:42	1.145
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.135 2010/03/17 14:37:43 raeburn Exp $
+# $Id: lonlogin.pm,v 1.145 2010/09/02 09:24:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,6 +69,7 @@ sub handler {
 	return OK;
     }
 
+    $env{'form.firsturl'} =~ s/(`)/'/g;
 
 # -------------------------------- Prevent users from attempting to login twice
     my $handle = &Apache::lonnet::check_for_valid_session($r);
@@ -130,6 +131,7 @@ sub handler {
     }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
+    my $uloadlim= $r->dir_config('lonUserLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
@@ -150,17 +152,12 @@ sub handler {
     }
     $loadavg =~ s/\s.*//g;
     my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
+    unless ($loadlim) { $loadpercent='---'; }
     my $userloadpercent=&Apache::lonnet::userload();
+    unless ($uloadlim) { $userloadpercent='---'; }
 
-# ------------------------------------------------------- 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();
@@ -264,13 +261,12 @@ my $link=&Apache::loncommon::designparm(
 my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);
 my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
+my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);
+my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain);
+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))) {
@@ -282,7 +278,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;
@@ -315,6 +310,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>
 
@@ -327,7 +330,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'], 
@@ -367,7 +371,9 @@ $r->print(<$jsh>);
 # ---------------------------------------------------------- Serve rest of page
 
 $r->print(
-	  '<div class="LC_loginpage_container">');
+    '<div class="LC_Box"'
+   .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'
+);
 
 #
 #  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
@@ -375,7 +381,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="" />
@@ -395,13 +401,12 @@ my $newuserlink;
 if ($shownewuserlink) {
     $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }
-my $logintitle;
-if ($loginheader eq 'text') {
-    $logintitle ='<h2>'.$lt{'log'}.'</h2>';
-} else {
-    $logintitle = '<img src="'.$login.'" alt="'.
-                  &mt('User Authentication').'" />';
-}
+my $logintitle =
+    '<h2 class="LC_hcell"'
+   .' style="background:'.$loginbox_header_bgcol.';'
+   .' 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.')
@@ -415,11 +420,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
@@ -433,21 +438,14 @@ LFORM
 HEADER
     }
     $r->print(<<ENDTOP);
-<div class="LC_loginpage_space">&nbsp;</div>
-<div class="LC_loginpage_floatLeft">
-<div class="LC_loginpage_loginContainer">
+<div style="float:left;">
+<div class="LC_Box" style="background:$loginbox_bg;">
   $logintitle
-   <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
-      <tr>
-	   <td>
-		$loginform
-           </td>
-      </tr>
-   </table>   	
-   $noscript_warning
+  $loginform
+  $noscript_warning
 </div>
   
-<div class="LC_loginpage_loginInfo">
+<div class="LC_Box" style="padding-top: 10px;">
   $loginhelp
   $forgotpw
   $contactblock
@@ -455,17 +453,20 @@ HEADER
   $coursecatalog
 </div>
 </div>
+
+<div>
 ENDTOP
     if ($showmainlogo) {
         $r->print(' <img src="'.$logo.'" alt="" />'."\n");
     }
 $r->print(<<ENDTOP);
 $announcements
-$domainlogo
-<div class="LC_loginpage_space">&nbsp;</div>
+</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">
@@ -505,6 +506,11 @@ $r->print(<<ENDDOCUMENT);
        </td>
       </tr>
      </table>
+    </div>
+    <div style="float: right;">
+    $domainlogo
+    </div>
+    <br style="clear:both;" />
  </div>
 
 <script type="text/javascript">
@@ -571,7 +577,7 @@ sub redirect_page {
     if ($env{'form.firsturl'} ne '') {
         $url .='?firsturl='.$env{'form.firsturl'};
     }
-    my $start_page = &Apache::loncommon::start_page('Switching Server',undef,
+    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
                                                     {'redirect' => [0,$url],});
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
@@ -642,7 +648,7 @@ sub loginhelpdisplay {
 sub coursecatalog_link {
     my ($linkname) = @_;
     return <<"END";
-      <span class="LC_nobreak"><a href="/adm/coursecatalog">$linkname</a></span>
+      <a href="/adm/coursecatalog">$linkname</a>
 END
 }