--- loncom/auth/lonlogin.pm	2008/12/10 15:45:38	1.112
+++ 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.112 2008/12/10 15:45:38 muellerd Exp $
+# $Id: lonlogin.pm,v 1.118 2009/04/08 10:13:13 tempelho 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
@@ -270,7 +270,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
@@ -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",
@@ -371,11 +368,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 ='<h1>'.$lt{'log'}.'</h1>';
+    $logintitle ='<h2>'.$lt{'log'}.'</h2>';
 } else {
     $logintitle = '<img src="'.$login.'" alt="'.
                   &mt('User Authentication').'" />';
@@ -390,14 +387,14 @@ 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="20" 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="20" /><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="20" value="$authdomain" /><br />
+  <input type="text" name="udom" size="15" value="$authdomain" /><br />
   <input type="submit" value="$lt{'log'}" />
 </form>
 LFORM
@@ -409,18 +406,15 @@ if ($fullgraph) {
 <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_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%">
@@ -435,23 +429,27 @@ HEADER
   
 <div class="LC_loginpage_loginInfo">
         $loginhelp<br />
-        $forgotpw<br /><br />
-        $newuserlink<br />
+        $forgotpw<br />
+	$contactblock<br />
+        $newuserlink
         $coursecatalog<br /><br />
-        <a href="/adm/about.html"><b>$lt{'about'}</b></a><br/>
-	$contactblock
+        <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>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
@@ -513,7 +511,7 @@ sub contactdisplay {
                          '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
     }
     if ($showhelpdesk) {
-        $contactblock .= '<b><a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a></b><br />';
+        $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">