--- modules/relate/lonlogin.pm	2012/02/07 14:49:47	1.1
+++ modules/relate/lonlogin.pm	2012/02/11 18:19:26	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.1 2012/02/07 14:49:47 raeburn Exp $
+# $Id: lonlogin.pm,v 1.4 2012/02/11 18:19:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -295,7 +295,7 @@ sub handler {
           'helpdesk' => 'Contact Helpdesk',
           'forgotpw' => 'Forgot your password?',
           'newuser'  => 'New User?',
-          'learn'    => 'Learn Physics includes an online physics course, to which you may receive admission after successfully completing a pre-course test.',
+          'learn'    => 'Learn Physics includes an online mechanics course, to which you may receive admission after successfully completing a pre-course test.',
            'click'   => 'Click here to sign up',
            'plea'    => 'Please log-in',
            'supp'    => 'Support from NSF, NIH, Google',
@@ -386,8 +386,8 @@ ENDSCRIPT
                alink        => "$alink",
                onload       => 'javascript:enableInput();',);
 
-    my $css_url = "/css/$domain/login.css";
-    $js .= "\n".'<link type="text/css" rel="stylesheet" href="'.$css_url.'">'."\n";
+    my $css_url = "/css/relate/login.css";
+    $js .= "\n".'<link type="text/css" rel="stylesheet" href="'.$css_url.'" />'."\n";
     $r->print(&Apache::loncommon::start_page($pagetitle,$js,
                                        {'redirect'   => [$expire,'/adm/roles'], 
                                         'add_entries' => \%add_entries,
@@ -395,19 +395,82 @@ ENDSCRIPT
 
 # ------------------------------------------------------------ Additional Texts
     $lt{'newto'} = &mt('New to the [_1]Learn Physics[_2] site?','<i>','</i>');
-    $lt{'runson'} = &mt('Learn Physics runs on [_1]LON-CAPA[_2] - an open source freeware distributed learning content management and assessment system.',
-                        '<a href="http://loncapa.org/">','</a>');
+    $lt{'runson'} = &mt('Learn Physics runs on [_1]LON-CAPA[_2] - an open source, freeware, distributed learning content management and assessment system.',
+                        '<a href="http://loncapa.org/" style="text-decoration: underline;">',
+                        '&nbsp;<img src="/images/login/lclogosm.gif" width="16" height="14" alt="LC" border="0" /></a>');
     $lt{'newhere'} = &mt('New to [_1]Learn Physics[_2]:','<i>','</i>');
     $lt{'exist'} = &mt('Existing [_1]Learn Physics[_2] user','<i>','</i>');
     $lt{'browser'} = &mt('Your browser must allow [_1]cookies[_2]',
-                         '<a href="http://loncapa.msu.edu/cookies.html" style="color: #ffffff">','</a>');
+                         '<a href="http://loncapa.msu.edu/cookies.html" style="color: #ffffff; text-decoration:underline;">','</a>');
+
+    my ($contactrow,$domainrow,$serverrow,$loadrow,$userloadrow,$versionrow);
+    $contactrow = <<"END";
+      <tr>
+       <td colspan="2">
+       $contactblock
+       </td>
+      </tr>
+END
+    $domainrow = <<"END";
+      <tr>
+       <td align="left" valign="top">
+        <small><b>$lt{'dom'}:&nbsp;</b></small>
+       </td>
+       <td align="left" valign="top">
+        <small><tt>&nbsp;$domain</tt></small>
+       </td>
+      </tr>
+END
+    $serverrow = <<"END";
+      <tr>
+       <td align="left" valign="top">
+        <small><b>$lt{'serv'}:&nbsp;</b></small>
+       </td>
+       <td align="left" valign="top">
+        <small><tt>&nbsp;$lonhost ($role)</tt></small>
+       </td>
+      </tr>
+END
+    if ($loadlim) {
+        $loadrow = <<"END";
+      <tr>
+       <td align="left" valign="top">
+        <small><b>$lt{'load'}:&nbsp;</b></small>
+       </td>
+       <td align="left" valign="top">
+        <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
+       </td>
+      </tr>
+END
+    }
+    if ($uloadlim) {
+        $userloadrow = <<"END";
+      <tr>
+       <td align="left" valign="top">
+        <small><b>$lt{'userload'}:&nbsp;</b></small>
+       </td>
+       <td align="left" valign="top">
+        <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
+       </td>
+      </tr>
+END
+    }
+    if (($version ne '') && ($version ne '<!-- VERSION -->')) {
+        $versionrow = <<"END";
+      <tr>
+       <td colspan="2" align="left">
+        <small>$version</small>
+       </td>
+      </tr>
+END
+    }
 
 # -------------------------------------------- Static cid for prerequisite test
-    $prereqcid = 'relate_9615072b469884921relatel1';
+    my $prereqcid = 'relate_3H121116c19344ff3relatel1';
 
 # ---------------------------------------------------- Warning if no Javascript 
-    my $noscript_warning = '<noscript><span class="LC_warning">'.
-                           '<b>'.$lt{'note'}.'</b>'.$lt{'jscr'}.' 
+    my $noscript_warning = '<noscript><br /><span class="LC_warning">'.
+                           '<b>'.$lt{'note'}.'</b>'.$lt{'jscr'}.
                            '</span></noscript>';
 
 # ---------------------------------------------------- Serve out DES JavaScript
@@ -423,13 +486,13 @@ ENDSCRIPT
 <table class="LC_loginbox">
   <tr>
     <td align="left" valign="top" width="11">
-     <img src="/images/login/tlc_11_ffffff_e2e2e2.gif" width="10" height="10" border="0" alt="">
+     <img src="/images/login/tlc_11_ffffff_e2e2e2.gif" width="10" height="10" border="0" alt="" />
     </td>
     <td width="450" valign="top">
       <table class="LC_loginbox_left">
         <tr>
-          <td width="411" align="left"><br />
-           <img src="/images/login/LCrelateheader_sm.png" width="411" height="100" alt="Relate @ MIT" align="left"></td>
+          <td width="441" align="left"><br />
+           <img src="/images/login/LCrelateheader_sm.png" width="441" height="100" alt="Relate @ MIT" align="left" /></td>
         </tr>
         <tr>
          <td>
@@ -444,27 +507,27 @@ ENDSCRIPT
        <tr>
         <td width="10">&nbsp;</td>
         <td valign="top" class="bodyred" width="430" align="left"><br />
-         <span style="font-size: 18px; line-height: 22px; ">$lt{'newt'}</span>
+         <span style="font-size: 18px; line-height: 22px; ">$lt{'newto'}</span>
          <br />
-         <span class="bodyred">$lt{'learn'}<br /><br />$lt{'runson'}
+         <span class="bodyred">$lt{'learn'}<br /><br />$lt{'runson'}</span>
          <br /><br />
-         <form name="signup" method="post" action="/adm/createaccount?courseid=$prereqcid"><input type="hidden" name="process" value="signup"/>
+         <form name="signup" method="post" action="/adm/createaccount?courseid=$prereqcid"><input type="hidden" name="process" value="signup" />
          <table class="LC_signup">
            <tr>
-             <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt=""></td>
+             <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt="" /></td>
              <td>&nbsp;</td>
-             <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
+             <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
            </tr>
            <tr>
              <td>&nbsp;</td>
-             <td align="center" valign="middle"><span style="white-space: nowrap;"><b>$lt{'newhere'}</b>:&nbsp;<a href="javascript:send('newaccount')" style="color: #ffffff">$lt{'click'}</a></span></td>
+             <td align="center" valign="middle"><span style="white-space: nowrap;"><b>$lt{'newhere'}</b>&nbsp;<a href="javascript:send('newaccount')" style="color: #ffffff; text-decoration:underline;">$lt{'click'}</a></span></td>
              <td>&nbsp;</td>
            </tr>
            <tr>
-             <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
+             <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
 
              <td>&nbsp;</td>
-             <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
+             <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
            </tr>
          </table>
          </form>
@@ -474,42 +537,41 @@ ENDSCRIPT
      </td>
      <td width="10">&nbsp;</td>
      <td valign="top">
-      <form name="client" method="post" onsubmit="return(send());">
+      <form name="client" method="post" onsubmit="return(send());" action="">
       <table class="LC_loginbox_right">
        <tr>
         <td colspan="3" height="23" class="LC_loginbox_strip">&nbsp;</td>
-i       </tr>
+       </tr>
        <tr>
-        <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt=""></td>
+        <td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt="" /></td>
         <td>&nbsp;</td>
-        <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
+        <td align="right" valign="top" width="11" height="11"><img src="/images/login/tr_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
        </tr>
        <tr>
         <td width="10">&nbsp;</td>
         <td>
          <table border="0" cellspacing="0" cellpadding="0">
           <tr>
-           <td align="right" class="bodywhite" heighta"=50"><br>
+           <td align="right" class="bodywhite" height="50"><br />
             <span style="font-size: 15px; line-height: 17px; font-weight: bold;">
              $lt{'exist'}</span>
              <br />$lt{'plea'}<br />
-             <hr class="login"><br /><br />
+             <hr class="login" /><br /><br />
             </td>
            </tr>
            <tr>
             <td>
              <table border="0" cellpadding="2" cellspacing="0">
               <tr>
-               <td align="right" class="bodywhite"><label for="uname">$lt{'un'}</label>:</td>
+               <td align="right" class="bodywhite"><label>$lt{'un'}</label>:</td>
                <td align="right"><input type="text" name="uname" size="17" value="" /></td>
                </tr>
                <tr>
-                <td align="right" class="bodywhite"><label for="upass$now">$lt{'pw'}</label>:</td>
-                <td align="right"><input name="upass$now" size="17" value="" type="password"><input type="hidden" name="udom" value="relate" /></td>
+                <td align="right" class="bodywhite"><label>$lt{'pw'}</label>:</td>
+                <td align="right"><input name="upass$now" size="17" value="" type="password" /><input type="hidden" name="udom" value="relate" /></td>
                </tr>
                <tr><td>&nbsp;</td></tr>
                <tr>
-               <tr>
                 <td colspan="2" align="right"><input name="signin" type="submit" value="$lt{'log'}" class="buttonwhite" /></td>
                </tr>
               </table>
@@ -522,7 +584,7 @@ i       </tr>
               <span style="font-size: smaller;">$lt{'browser'}</span><br />
               <hr class="login" />
               <br />
-              <a href="/adm/resetpw" style="color: #ffffff">$lt{forgotpw'}</a><br>
+              <a href="/adm/resetpw" style="color: #ffffff; text-decoration:underline;">$lt{'forgotpw'}</a><br />
               <br />
              </td>
             </tr>
@@ -531,37 +593,53 @@ i       </tr>
           <td width="9">&nbsp;</td>
         </tr>
         <tr>
-          <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
+          <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/bl_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
           <td>&nbsp;</td>
-
-          <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
-        </tr>
-        <tr>
-          <td colspan="3" height="10" class="LC_loginbox_strip">&nbsp;$contactblock</td>
+          <td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt="" /></td>
         </tr>
       </table>
+      <input type="hidden" name="lextkey" value="$lextkey" />
+      <input type="hidden" name="uextkey" value="$uextkey" />
+      </form>
     </td>
-    <td align="right" valign="top" width="11"><img src="/images/login/tr_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>
+    <td align="right" valign="top" width="11"><img src="/images/login/tr_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt="" /></td>
   </tr>
   <tr>
+   <td width="10">&nbsp;</td>
+   <td colspan="3">
+    <br />
+    $noscript_warning
+    <hr style="clear:both;" />
+   </td>
+   <td width="10">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="10">&nbsp;</td>
     <td colspan="4">
-      <div align="right">
-          <img src="/images/login/sponsors.png" alt="$lt{'supp'}" align="right" />
-     </div>
+    <div style="float: left;">
+     <table border="0" cellspacing="0" cellpadding="0">
+$contactrow
+$domainrow
+$serverrow
+$loadrow
+$userloadrow
+$versionrow
+     </table>
+    </div>
+    <div style="float: right;">
+     <img src="/images/login/sponsors.png" alt="$lt{'supp'}" align="right" />
+    <br style="clear:both;" />
+    </div>
    </td>
   </tr>
   <tr>
-    <td align="left" valign="bottom" width="11"><img src="/images/login/bl_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>
+    <td align="left" valign="bottom" width="11"><img src="/images/login/bl_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt="" /></td>
     <td colspan="3" width="698">&nbsp;</td>
-    <td align="right" valign="bottom" width="11"><img src="/images/login/br_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>
+    <td align="right" valign="bottom" width="11"><img src="/images/login/br_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt="" /></td>
   </tr>
 </table>
 </div>
 <p>&nbsp;</p>
-$noscript_warning
-     <input type="hidden" name="lextkey" value="$lextkey" />
-     <input type="hidden" name="uextkey" value="$uextkey" />
-  </form>
   <form name="server" action="/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
@@ -581,6 +659,13 @@ if ( document.client.uname ) { document.
 // ]]>
 </script>
 
+<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>
+
 ENDLOGIN
 
 # -------------------------------------------------------- Standard page ending 
@@ -659,7 +744,7 @@ sub contactdisplay {
                          '<tt>'.$servadm.'</tt><br />';
     }
     if ($showhelpdesk) {
-        $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
+        $contactblock .= '<a href="javascript:helpdesk()" style="text-decoration:underline;">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">