--- loncom/auth/lonlogin.pm 2025/02/09 22:42:12 1.209 +++ loncom/auth/lonlogin.pm 2025/02/25 16:33:37 1.213 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.209 2025/02/09 22:42:12 raeburn Exp $ +# $Id: lonlogin.pm,v 1.213 2025/02/25 16:33:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -387,11 +387,11 @@ sub handler { } $r->print( $start_page - .'
' + .'
' .'

'.&mt('You are already logged in!').'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'

' - .'
' + .'
' .$end_page ); return OK; @@ -638,13 +638,18 @@ h2 { margin-right: 0; font-weight: bold; } +.LC_landmark { + margin: 0; + padding: 0; + border: none; +} ' .'' - .'
' + .'' - .'
' + .'
' .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

'); if ($spares) { $r->print('

'.&mt('Please attempt to login to one of the following servers:') @@ -864,14 +869,19 @@ ENDSAMLJS 'forgotpw' => 'Forgot password?', 'newuser' => 'New User?', 'change' => 'Change?', + 'nojs' => 'Use of LON-CAPA requires Javascript to be enabled in your web browser.', ); # -------------------------------------------------- Change password field name my $forgotpw = &forgotpwdisplay(%lt); - $forgotpw .= '
' if $forgotpw; + if ($forgotpw) { + $forgotpw = '

'; + } my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain); if ($loginhelp) { - $loginhelp = ''.$lt{'help'}.'
'; + $loginhelp = ''; } # ---------------------------------------------------- Serve out DES JavaScript @@ -908,11 +918,13 @@ ENDSAMLJS ENDSERVERFORM my $coursecatalog; if (($showcoursecat eq '') || ($showcoursecat)) { - $coursecatalog = &coursecatalog_link($lt{'catalog'}).'
'; + $coursecatalog = ''; } my $newuserlink; if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}).'
'; + $newuserlink = ''; } my $logintitle = '

'; - my $noscript_warning=''; + my $noscript_warning = <<"ENDNOJS"; + +
+ +
+ENDNOJS my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, $authdomain,\$helpdeskscript, @@ -1144,7 +1165,7 @@ ENDTOP $lt{'dom'}:  - +  $domain @@ -1188,7 +1209,7 @@ END } $r->print(< +