--- loncom/auth/lonlogin.pm	2008/02/24 23:18:37	1.101
+++ loncom/auth/lonlogin.pm	2008/10/02 11:28:49	1.106
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.101 2008/02/24 23:18:37 raeburn Exp $
+# $Id: lonlogin.pm,v 1.106 2008/10/02 11:28:49 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,6 +47,9 @@ sub handler {
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
 	  'token']);
+    if (!defined($env{'form.firsturl'})) {
+        &Apache::lonacc::get_posted_cgi($r,['firsturl']);
+    }
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -80,7 +83,7 @@ sub handler {
 	    &Apache::loncommon::end_page();
 	$r->print(
                   $start_page
-                 .'<h1>'.&mt('You are already logged in').'</h1>'
+                 .'<h1>'.&mt('You are already logged in!').'</h1>'
                  .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].',
                   '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
@@ -198,7 +201,7 @@ sub handler {
                 $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
                 $hostname.'</a>'.
-                ' (preferred)</font>'.$/;
+                ' '.&mt('(preferred)').'</font>'.$/;
 	    $last=$hostname;
         }
         $spares.= '<br />';
@@ -218,16 +221,20 @@ sub handler {
                 $hostname.'</a>';
 	    $last=$hostname;
         }
-	$r->print(<<ENDTROUBLE);
-<html>
-<head><title>The LearningOnline Network with CAPA</title></head>
-<body bgcolor="#FFFFFF">
-<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
-<h3>This LON-CAPA server is temporarily not available for login</h3>
-<p>Please attempt to login to one of the following servers:</p>$spares
-</body>
-</html>
-ENDTROUBLE
+	$r->print(
+           '<html>'
+          .'<head><title>'
+          .&mt('The LearningOnline Network with CAPA')
+          .'</title></head>'
+          .'<body bgcolor="#FFFFFF">'
+          .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
+          .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
+          .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'
+          .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>'
+          .$spares
+          .'</body>'
+          .'</html>'
+        );
         return OK;
     }
 
@@ -340,7 +347,7 @@ my %lt=&Apache::lonlocal::texthash(
 		  'pw'  => 'Password',
 		  'dom' => 'Domain',
 		  'perc' => 'percent',
-		  'load' => 'Load',
+		  'load' => 'Server Load',
                   'userload' => 'User Load',
                   'about'  => 'About LON-CAPA',
                   'access' => 'Accessibility Options',
@@ -500,6 +507,10 @@ ENDNOOPT
         $logintitle = '<td bgcolor="'.$sidebg.'" colspan="2"><img src="'.$login.'" alt="'.
                       &mt('User Authentication').'" /></td>';
     }
+    my $noscript_warning='<td colspan="2" bgcolor="'.$mainbg.'">'
+                        .'<noscript><div class="LC_warning"><font size="-1">'
+                        .&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">
@@ -507,6 +518,7 @@ ENDNOOPT
      <!-- Start the sub-table for text and input alignment -->
      <table border=0 cellspacing=0 cellpadding=0>
       <tr>$logintitle</tr>
+      <tr>$noscript_warning</tr>
       <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
