--- loncom/auth/lonlogin.pm	2008/01/24 14:30:28	1.99
+++ loncom/auth/lonlogin.pm	2008/02/24 23:18:37	1.101
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.99 2008/01/24 14:30:28 bisitz Exp $
+# $Id: lonlogin.pm,v 1.101 2008/02/24 23:18:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,15 +78,14 @@ sub handler {
 	    &Apache::loncommon::start_page('Already logged in');
 	my $end_page = 
 	    &Apache::loncommon::end_page();
-	$r->print(<<ENDFAILED);
-$start_page
-<h1>You are already logged in</h1>
-<p>Please either <a href="/adm/roles">continue the current session</a> or
-<a href="/adm/logout">logout</a>.</p>
-<p>
-<a href="/adm/loginproblems.html">Problems?</a></p>
-$end_page
-ENDFAILED
+	$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].',
+                  '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
+                 .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
+                 .$end_page
+                 );
         return OK;
     }
 
@@ -264,6 +263,8 @@ ENDTROUBLE
     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;
     my $js = (<<ENDSCRIPT);
 
@@ -350,6 +351,7 @@ my %lt=&Apache::lonlocal::texthash(
                   'servadm' => 'Server Administration',
                   'helpdesk' => 'Contact Helpdesk',
                   'forgotpw' => 'Forgot password?',
+                  'newuser'  => 'New User?',
                   'options_headline' => 'Select Accessibility Options',
                   'sprs_img' => 'Suppress rendering of images',
                   'sprs_applet' => 'Suppress Java applets',
@@ -397,6 +399,10 @@ ENDSERVERFORM
     if (($showcoursecat eq '') || ($showcoursecat)) {
         $coursecatalog = &coursecatalog_link($lt{'catalog'});
     }
+    my $newuserlink;
+    if ($shownewuserlink) {
+        $newuserlink = &newuser_link($lt{'newuser'});
+    }
     if ($fullgraph) { $r->print(<<ENDTOP);
   <!-- The LON-CAPA Header -->
   <tr>
@@ -524,6 +530,8 @@ ENDNOOPT
        <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">
         $loginhelp
         $forgotpw
+        $newuserlink
+        <br />
        </td>
       </tr>
      </table>
@@ -668,7 +676,7 @@ sub forgotpwdisplay {
     my (%lt) = @_;
     my $prompt_for_resetpw = 1; 
     if ($prompt_for_resetpw) {
-        return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br /><br />';
+        return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br />';
     }
     return;
 }
@@ -692,5 +700,10 @@ sub coursecatalog_link {
 END
 }
 
+sub newuser_link {
+    my ($linkname) = @_;
+    return '&nbsp;&nbsp;&nbsp;<a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />';
+}
+
 1;
 __END__