--- loncom/auth/lonlogin.pm	2008/12/03 13:07:15	1.110
+++ loncom/auth/lonlogin.pm	2009/05/14 10:21:10	1.120
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.110 2008/12/03 13:07:15 muellerd Exp $
+# $Id: lonlogin.pm,v 1.120 2009/05/14 10:21:10 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,7 +84,7 @@ sub handler {
 	$r->print(
                   $start_page
                  .'<h1>'.&mt('You are already logged in!').'</h1>'
-                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].',
+                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
                   '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page
@@ -102,16 +102,7 @@ sub handler {
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
 
-   # my $textbrowsers=$r->dir_config('lonTextBrowsers');
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
-    
-   # foreach (split(/\:/,$textbrowsers)) {
-#	if ($httpbrowser=~/$_/i) {
-#	    $env{'form.interface'}='textual';
-#        }
-#    }
-
-    my $fullgraph=($env{'form.interface'} ne 'textual');
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -242,21 +233,12 @@ return OK;
 $servadm=~s/\,/\<br \/\>/g;
 
 # ----------------------------------------------------------- Front page design
-my $pgbg=
-($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
-my $font=
-($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
-my $link=
-($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
-my $vlink=
-($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
+my $font=&Apache::loncommon::designparm('login.font',$domain);
+my $link=&Apache::loncommon::designparm('login.link',$domain);
+my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);
-my $mainbg=
-($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
-my $textcol = 
-($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
-my $bgcol =
-($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF');
+my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
 my $logo=&Apache::loncommon::designparm('login.logo',$domain);
 my $img=&Apache::loncommon::designparm('login.img',$domain);
 my $domainlogo=&Apache::loncommon::domainlogo($domain);
@@ -281,7 +263,7 @@ my $shownewuserlink =
 my $now=time;
 my $js = (<<ENDSCRIPT);
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
 function send()
 {
 this.document.server.elements.uname.value
@@ -313,10 +295,7 @@ ENDSCRIPT
 
 # --------------------------------------------------- Print login screen header
 
-my %add_entries = (topmargin    => "0",
-	       leftmargin   => "0",
-	       marginheight => "0",
-	       marginwidth  => "0",
+my %add_entries = (
 	       bgcolor      => "$mainbg",
 	       text         => "$font",
 	       link         => "$link",
@@ -337,7 +316,6 @@ my %lt=&Apache::lonlocal::texthash(
 	  'perc' => 'percent',
 	  'load' => 'Server Load',
 	  'userload' => 'User Load',
-	  'about'  => 'About LON-CAPA',
 	  'catalog' => 'Course Catalog',
 	  'log' => 'Log in',
 	  'help' => 'Log-in Help',
@@ -346,13 +324,7 @@ my %lt=&Apache::lonlocal::texthash(
 	  'helpdesk' => 'Contact Helpdesk',
 	  'forgotpw' => 'Forgot password?',
 	  'newuser'  => 'New User?',
-	  'options_headline' => 'Select Accessibility Options',
-	  'sprs_img' => 'Suppress rendering of images',
-	  'sprs_applet' => 'Suppress Java applets',
-	  'sprs_embed' => 'Suppress rendering of embedded multimedia',
-	  'sprs_font' => 'Increase font size',
-	  'sprs_blackwhite' => 'Switch to black and white mode',
-	  'remember' => 'Remember these settings for next login');
+	  );
 # -------------------------------------------------- Change password field name
 my $forgotpw = &forgotpwdisplay(%lt);
 my $loginhelp = &loginhelpdisplay(%lt);
@@ -364,9 +336,16 @@ $r->print(<$jsh>);
 }
 # ---------------------------------------------------------- Serve rest of page
 
-if ($fullgraph) {
 $r->print(
 	  '<div class="LC_loginpage_container">');
+
+#
+#  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
+#  then just us a relative link to authenticate:
+#
+
+if ($otherserver eq "http://") {
+    $otherserver="";
 }
 
 $r->print(<<ENDSERVERFORM);
@@ -388,11 +367,11 @@ if (($showcoursecat eq '') || ($showcour
 }
 my $newuserlink;
 if ($shownewuserlink) {
-    $newuserlink = &newuser_link($lt{'newuser'});
+    $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }
 my $logintitle;
 if ($loginheader eq 'text') {
-    $logintitle = $lt{'log'};
+    $logintitle ='<h2>'.$lt{'log'}.'</h2>';
 } else {
     $logintitle = '<img src="'.$login.'" alt="'.
                   &mt('User Authentication').'" />';
@@ -407,72 +386,65 @@ my $contactblock = &contactdisplay(\%lt,
 
 my $loginform=(<<LFORM);
 <form name="client" onsubmit="return(send())">
-  <input type="hidden" name="lextkey" value="$lextkey">
-  <input type="hidden" name="uextkey" value="$uextkey">
+  <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" size="10" value="$authusername" /><br />
+  <input type="text" name="uname" size="15" value="$authusername" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
-  <input type="password" name="upass$now" size="10" /><br />
+  <input type="password" name="upass$now" size="15" /><br />
   <b><label for="udom">$lt{'dom'}</label>:</b><br />
-  <input type="text" name="udom" size="10" value="$authdomain" /><br />
+  <input type="text" name="udom" size="15" value="$authdomain" /><br />
   <input type="submit" value="$lt{'log'}" />
 </form>
 LFORM
 
-if ($fullgraph) {
     if ($showbanner) {
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
 <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
  <tr>
   <td align="left" valign="top" bgcolor="$pgbg">
-      <img src="$img" border=0 alt="The Learning Online Network with CAPA" />
+      <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
   </td>
  </tr>
 </table>
 HEADER
     }
-    if ($showmainlogo) {
-        $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".
-                  '    <img src="'.$logo.'" alt="" />'."\n");
-    }
     $r->print(<<ENDTOP);
+<div class="LC_loginpage_space">&nbsp;</div>
+<div class="LC_loginpage_floatLeft">
 <div class="LC_loginpage_loginContainer">
- <fieldset class="LC_loginpage_fieldset">
-  <legend class="LC_loginpage_legend">$logintitle</legend>
-   <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">
+  $logintitle
+   <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
       <tr>
-   	   <td width="50%" align="center" valign="top">
-		$domainlogo
-	   </td>
 	   <td>
 		$loginform
            </td>
       </tr>
    </table>   	
    $noscript_warning
- </fieldset>
 </div>
   
 <div class="LC_loginpage_loginInfo">
         $loginhelp<br />
-        $forgotpw<br /><br />
-        $newuserlink<br />
-        $coursecatalog<br /><br />
-        <a href="/adm/about.html"><b>$lt{'about'}</b></a><br />
-        $helpdeskscript
+        $forgotpw<br />
+	$contactblock<br />
+        $newuserlink
+        $coursecatalog
 </div>
-
-<div class="LC_loginpage_space">&nbsp;</div>
+</div>
+ENDTOP
+    if ($showmainlogo) {
+        $r->print(' <img src="'.$logo.'" alt="" />'."\n");
+    }
+$r->print(<<ENDTOP);
 $announcements
+$domainlogo
+<div class="LC_loginpage_space">&nbsp;</div>
 ENDTOP
-}
-
-if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
 
-if ($fullgraph) {
 $r->print(<<ENDDOCUMENT);
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
@@ -506,9 +478,6 @@ $r->print(<<ENDDOCUMENT);
        </td>
       </tr>
      </table>
-     
-    $contactblock
-
  </div>
 
 <script type="text/javascript">
@@ -518,7 +487,6 @@ if ( document.client.uname ) { document.
 $helpdeskscript
 
 ENDDOCUMENT
-}
     my %endargs = ( 'noredirectlink' => 1, );
     $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;
@@ -537,7 +505,7 @@ sub contactdisplay {
                          '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
     }
     if ($showhelpdesk) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';
+        $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">