--- modules/relate/lonlogin.pm 2012/02/07 14:49:47 1.1 +++ modules/relate/lonlogin.pm 2012/02/10 16:34:07 1.2 @@ -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.2 2012/02/10 16:34:07 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', @@ -387,7 +387,7 @@ ENDSCRIPT onload => 'javascript:enableInput();',); my $css_url = "/css/$domain/login.css"; - $js .= "\n".''."\n"; + $js .= "\n".''."\n"; $r->print(&Apache::loncommon::start_page($pagetitle,$js, {'redirect' => [$expire,'/adm/roles'], 'add_entries' => \%add_entries, @@ -396,18 +396,81 @@ ENDSCRIPT # ------------------------------------------------------------ Additional Texts $lt{'newto'} = &mt('New to the [_1]Learn Physics[_2] site?','',''); $lt{'runson'} = &mt('Learn Physics runs on [_1]LON-CAPA[_2] - an open source freeware distributed learning content management and assessment system.', - '',''); + '', + ' LC'); $lt{'newhere'} = &mt('New to [_1]Learn Physics[_2]:','',''); $lt{'exist'} = &mt('Existing [_1]Learn Physics[_2] user','',''); $lt{'browser'} = &mt('Your browser must allow [_1]cookies[_2]', - '',''); + '',''); + + my ($contactrow,$domainrow,$serverrow,$loadrow,$userloadrow,$versionrow); + $contactrow = <<"END"; + + + $contactblock + + +END + $domainrow = <<"END"; + + + $lt{'dom'}:  + + +  $domain + + +END + $serverrow = <<"END"; + + + $lt{'serv'}:  + + +  $lonhost ($role) + + +END + if ($loadlim) { + $loadrow = <<"END"; + + + $lt{'load'}:  + + +  $loadpercent $lt{'perc'} + + +END + } + if ($uloadlim) { + $userloadrow = <<"END"; + + + $lt{'userload'}:  + + +  $userloadpercent $lt{'perc'} + + +END + } + if (($version ne '') && ($version ne '')) { + $versionrow = <<"END"; + + + $version + + +END + } # -------------------------------------------- Static cid for prerequisite test - $prereqcid = 'relate_9615072b469884921relatel1'; + my $prereqcid = 'relate_9615072b469884921relatel1'; # ---------------------------------------------------- Warning if no Javascript my $noscript_warning = ''; # ---------------------------------------------------- Serve out DES JavaScript @@ -444,7 +507,7 @@ ENDSCRIPT  
- $lt{'newt'} + $lt{'newto'}
$lt{'learn'}

$lt{'runson'}

@@ -457,7 +520,7 @@ ENDSCRIPT   - $lt{'newhere'}: $lt{'click'} + $lt{'newhere'} $lt{'click'}   @@ -478,7 +541,7 @@ ENDSCRIPT -i + @@ -522,7 +585,7 @@ i $lt{'browser'}

- $lt{forgotpw'}
+ $lt{'forgotpw'}

@@ -536,18 +599,33 @@ i - - -
 
 
 $contactblock
- -
- $lt{'supp'} -
+ +
+
+ + + +   + +
+ +$contactrow +$domainrow +$serverrow +$loadrow +$userloadrow +$versionrow +
+
+
+ $lt{'supp'} +
+
@@ -581,6 +659,13 @@ if ( document.client.uname ) { document. // ]]> + + ENDLOGIN # -------------------------------------------------------- Standard page ending @@ -659,7 +744,7 @@ sub contactdisplay { ''.$servadm.'
'; } if ($showhelpdesk) { - $contactblock .= ''.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";