[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm

[raeburn]

raeburn		Wed Aug 25 17:47:21 2010 EDT

  Modified files:              
    /loncom/auth	lonlogin.pm 
  Log:
  - Domain Logo moved to right side of lower box.
  - Existing position: immediately below main logo looked odd if there 
    was no announcement (which is displayed between the two logos).   
  
  
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.140 loncom/auth/lonlogin.pm:1.141
--- loncom/auth/lonlogin.pm:1.140	Wed Aug 25 16:34:32 2010
+++ loncom/auth/lonlogin.pm	Wed Aug 25 17:47:21 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.140 2010/08/25 16:34:32 raeburn Exp $
+# $Id: lonlogin.pm,v 1.141 2010/08/25 17:47:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -154,6 +154,7 @@
 
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
+
 # ----------------------------------------------------------- Get announcements
     my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters
@@ -261,7 +262,7 @@
 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 $domainlogo=&Apache::loncommon::domainlogo($domain);
 my $showbanner = 1;
 my $showmainlogo = 1;
 if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
@@ -456,12 +457,12 @@
     }
 $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">
@@ -501,6 +502,11 @@
        </td>
       </tr>
      </table>
+    </div>
+    <div style="float: right;">
+    $domainlogo
+    </div>
+    <br style="clear:both;" />
  </div>
 
 <script type="text/javascript">