--- loncom/auth/lonlogin.pm 2008/12/01 15:03:43 1.109 +++ loncom/auth/lonlogin.pm 2009/05/22 17:01:28 1.122 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.109 2008/12/01 15:03:43 raeburn Exp $ +# $Id: lonlogin.pm,v 1.122 2009/05/22 17:01:28 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -84,7 +84,7 @@ sub handler { $r->print( $start_page .'

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

' - .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].', + .'

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

' .'

'.&mt('Login problems?').'

' .$end_page @@ -102,16 +102,7 @@ sub handler { # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - # my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - # foreach (split(/\:/,$textbrowsers)) { -# if ($httpbrowser=~/$_/i) { -# $env{'form.interface'}='textual'; -# } -# } - - my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); @@ -242,23 +233,12 @@ return OK; $servadm=~s/\,/\
/g; # ----------------------------------------------------------- Front page design -my $pgbg= -($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); -my $font= -($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); -my $link= -($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); -my $vlink= -($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); +my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); +my $font=&Apache::loncommon::designparm('login.font',$domain); +my $link=&Apache::loncommon::designparm('login.link',$domain); +my $vlink=&Apache::loncommon::designparm('login.vlink',$domain); my $alink=&Apache::loncommon::designparm('login.alink',$domain); -my $mainbg= -($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); -my $sidebg= -($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); -my $textcol = -($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000'); -my $bgcol = -($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF'); +my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); my $domainlogo=&Apache::loncommon::domainlogo($domain); @@ -283,7 +263,8 @@ my $shownewuserlink = my $now=time; my $js = (< + ENDSCRIPT # --------------------------------------------------- Print login screen header -my %add_entries = (topmargin => "0", - leftmargin => "0", - marginheight => "0", - marginwidth => "0", +my %add_entries = ( bgcolor => "$mainbg", text => "$font", link => "$link", @@ -339,7 +318,6 @@ my %lt=&Apache::lonlocal::texthash( 'perc' => 'percent', 'load' => 'Server Load', 'userload' => 'User Load', - 'about' => 'About LON-CAPA', 'catalog' => 'Course Catalog', 'log' => 'Log in', 'help' => 'Log-in Help', @@ -348,13 +326,7 @@ my %lt=&Apache::lonlocal::texthash( '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', - 'sprs_embed' => 'Suppress rendering of embedded multimedia', - 'sprs_font' => 'Increase font size', - 'sprs_blackwhite' => 'Switch to black and white mode', - 'remember' => 'Remember these settings for next login'); + ); # -------------------------------------------------- Change password field name my $forgotpw = &forgotpwdisplay(%lt); my $loginhelp = &loginhelpdisplay(%lt); @@ -366,10 +338,13 @@ $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page -if ($fullgraph) { $r->print( '
'); -} + +# +# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? +# then just us a relative link to authenticate: +# $r->print(< @@ -390,11 +365,11 @@ if (($showcoursecat eq '') || ($showcour } my $newuserlink; if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); + $newuserlink = &newuser_link($lt{'newuser'}).'
'; } my $logintitle; if ($loginheader eq 'text') { - $logintitle = $lt{'log'}; + $logintitle ='

'.$lt{'log'}.'

'; } else { $logintitle = ''. &mt('User Authentication').''; @@ -408,119 +383,110 @@ my $contactblock = &contactdisplay(\%lt, $version,$authdomain,\$helpdeskscript); my $loginform=(< - - +
+ + :
-
+
:
-
+
:
-
+
LFORM -if ($fullgraph) { if ($showbanner) { $r->print(<
- The Learning Online Network with CAPA + The Learning Online Network with CAPA
HEADER } - if ($showmainlogo) { - $r->print('
 
'."\n". - ' '."\n"); - } $r->print(< 
+
-
- $logintitle - + $logintitle +
-
- $domainlogo - $loginform
$noscript_warning -
$loginhelp
- $forgotpw

- $newuserlink
- $coursecatalog

- $lt{'about'}
- $helpdeskscript + $forgotpw
+ $contactblock
+ $newuserlink + $coursecatalog
- -
 
+
+ENDTOP + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(<  ENDTOP -} - -if($announcements){$r->print('
 
');} -if ($fullgraph) { $r->print(< + - - - - - - - -
+    $lt{'dom'}:  +  $domain
+    $lt{'serv'}:  +  $lonhost ($role)
+    $lt{'load'}:  +  $loadpercent $lt{'perc'}
+    $lt{'userload'}:  +  $userloadpercent $lt{'perc'}
- - $contactblock - $helpdeskscript ENDDOCUMENT -} my %endargs = ( 'noredirectlink' => 1, ); $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; @@ -539,10 +505,11 @@ sub contactdisplay { '      '.$servadm.'
 
'; } if ($showhelpdesk) { - $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT }