--- loncom/auth/lonlogin.pm	2009/04/01 14:43:19	1.117
+++ loncom/auth/lonlogin.pm	2009/05/16 01:19:29	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.117 2009/04/01 14:43:19 hauer Exp $
+# $Id: lonlogin.pm,v 1.121 2009/05/16 01:19:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,8 +103,6 @@ sub handler {
     $env{'form.interface'}=~s/\W//g;
 
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
-    
-    my $fullgraph=($env{'form.interface'} ne 'textual');
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -235,17 +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 $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);
@@ -302,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",
@@ -326,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',
@@ -347,10 +336,13 @@ $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:
+#
 
 $r->print(<<ENDSERVERFORM);
 <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
@@ -402,7 +394,6 @@ my $loginform=(<<LFORM);
 </form>
 LFORM
 
-if ($fullgraph) {
     if ($showbanner) {
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
@@ -415,12 +406,9 @@ if ($fullgraph) {
 </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_loginDomain">$domainlogo</div>
+<div class="LC_loginpage_space">&nbsp;</div>
+<div class="LC_loginpage_floatLeft">
 <div class="LC_loginpage_loginContainer">
   $logintitle
    <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
@@ -438,18 +426,19 @@ HEADER
         $forgotpw<br />
 	$contactblock<br />
         $newuserlink
-        $coursecatalog<br /><br />
-        <a href="/adm/about.html"><b>$lt{'about'}</b></a>
+        $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">
       <tr>
@@ -494,7 +483,6 @@ if ( document.client.uname ) { document.
 $helpdeskscript
 
 ENDDOCUMENT
-}
     my %endargs = ( 'noredirectlink' => 1, );
     $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;