--- loncom/auth/lonlogin.pm	2009/04/01 14:43:19	1.117
+++ loncom/auth/lonlogin.pm	2009/04/08 10:13:13	1.118
@@ -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.118 2009/04/08 10:13:13 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,10 +302,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",
@@ -415,12 +412,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%">
@@ -441,14 +435,18 @@ HEADER
         $coursecatalog<br /><br />
         <a href="/adm/about.html"><b>$lt{'about'}</b></a>
 </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">