--- loncom/auth/lonlogin.pm	2008/12/10 17:45:29	1.106.2.1
+++ loncom/auth/lonlogin.pm	2009/08/12 19:44:18	1.106.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.106.2.1 2008/12/10 17:45:29 raeburn Exp $
+# $Id: lonlogin.pm,v 1.106.4.2 2009/08/12 19:44:18 raeburn 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
@@ -283,7 +283,8 @@ sub handler {
     my $now=time;
     my $js = (<<ENDSCRIPT);
 
- <script language="JavaScript">
+ <script type="text/javascript">
+ // <![CDATA[
     function send()
     {
         this.document.server.elements.uname.value
@@ -327,6 +328,7 @@ sub handler {
         this.document.server.submit();
         return false;
     }
+ // ]]>
  </script>
 
 ENDSCRIPT
@@ -354,7 +356,6 @@ my %lt=&Apache::lonlocal::texthash(
 		  'un'  => 'Username',
 		  'pw'  => 'Password',
 		  'dom' => 'Domain',
-		  'perc' => 'percent',
 		  'load' => 'Server Load',
                   'userload' => 'User Load',
                   'about'  => 'About LON-CAPA',
@@ -387,7 +388,7 @@ my %lt=&Apache::lonlocal::texthash(
 
     if ($fullgraph) {
 	$r->print(
-		  '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
+		  '<table width="100%" cellpadding="0" cellspacing="0" border="0">');
     }
 
     $r->print(<<ENDSERVERFORM);
@@ -427,8 +428,8 @@ ENDSERVERFORM
    <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg">
 HEADER
         if ($showbanner) {
-            $r->print(<<ENDBANNER); 
-<img src="$img" border=0 alt="The Learning Online Network with CAPA" />
+            $r->print(<<ENDBANNER);
+<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
 ENDBANNER
         }
         $r->print(<<ENDSTART);
@@ -501,7 +502,7 @@ ENDTOP
                  .'<h2>'.&mt('Text-based Interface Login').'</h2>'
                  .$announcements);
     }
-    $r->print('<form name="client" onsubmit="return(send())">');
+    $r->print('<form name="client" action="" onsubmit="return(send())">');
     unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);
 <h3>$lt{'options_headline'}</h3>
@@ -535,11 +536,11 @@ ENDNOOPT
                         .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
                         .'</font></div></noscript></td>';
     $r->print(<<ENDLOGIN);
-     <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" />
 
      <!-- Start the sub-table for text and input alignment -->
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>$logintitle</tr>
       <tr>$noscript_warning</tr>
       <tr>
@@ -594,12 +595,12 @@ ENDLOGIN
    <!-- Row 5 Column 1 -->
    <td bgcolor="$sidebg" valign="middle" align="left">
      <br />
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td bgcolor="$sidebg" align="left" valign="middle">
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
@@ -607,24 +608,24 @@ ENDLOGIN
        <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td bgcolor="$sidebg" align="left" valign="middle">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
+       <td bgcolor="$sidebg" align="left" valign="top"><span class="LC_nobreak">
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small></span>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
+       <td bgcolor="$sidebg" align="left" valign="middle">
+        <small><tt>&nbsp;$loadpercent%</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
+       <td bgcolor="$sidebg" align="left" valign="top"><span class="LC_nobreak">
+        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small></span>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
+       <td bgcolor="$sidebg" align="left" valign="middle">
+        <small><tt>&nbsp;$userloadpercent%</tt></small>
        </td>
       </tr>
      </table>
@@ -660,8 +661,10 @@ $domainlogo
  </table>
 
 <script type="text/javascript">
+// <![CDATA[
 // the if prevents the script error if the browser can not handle this
 if ( document.client.uname ) { document.client.uname.focus(); }
+// ]]>
 </script>
 $helpdeskscript
 
@@ -689,6 +692,7 @@ sub contactdisplay {
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function helpdesk() {
     var codedom = document.client.udom.value;
     if (codedom == '') {
@@ -698,6 +702,7 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }