--- loncom/auth/lonlogin.pm	2010/03/17 14:37:43	1.135
+++ loncom/auth/lonlogin.pm	2010/05/21 15:54:34	1.138
@@ -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.138 2010/05/21 15:54:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -264,13 +264,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 $showbanner = 1;
 my $showmainlogo = 1;
 if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
@@ -282,7 +281,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;
@@ -367,7 +365,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?
@@ -395,13 +395,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.')
@@ -433,21 +432,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,6 +447,8 @@ HEADER
   $coursecatalog
 </div>
 </div>
+
+<div>
 ENDTOP
     if ($showmainlogo) {
         $r->print(' <img src="'.$logo.'" alt="" />'."\n");
@@ -462,7 +456,8 @@ ENDTOP
 $r->print(<<ENDTOP);
 $announcements
 $domainlogo
-<div class="LC_loginpage_space">&nbsp;</div>
+</div>
+<hr style="clear:both;" />
 ENDTOP
 
 $r->print(<<ENDDOCUMENT);
@@ -571,7 +566,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 +637,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
 }