--- loncom/auth/lonlogin.pm 2008/12/03 13:07:15 1.110 +++ loncom/auth/lonlogin.pm 2009/03/10 18:18:31 1.114 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.110 2008/12/03 13:07:15 muellerd Exp $ +# $Id: lonlogin.pm,v 1.114 2009/03/10 18:18:31 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -102,15 +102,8 @@ 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= @@ -253,10 +246,6 @@ my $vlink= my $alink=&Apache::loncommon::designparm('login.alink',$domain); my $mainbg= ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); -my $textcol = -($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000'); -my $bgcol = -($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF'); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); my $domainlogo=&Apache::loncommon::domainlogo($domain); @@ -346,13 +335,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); @@ -388,11 +371,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').''; @@ -410,11 +393,11 @@ my $loginform=(< :
-
+
:
-
+
:
-
+
LFORM @@ -437,30 +420,26 @@ HEADER ' '."\n"); } $r->print(<$domainlogo
-
- $logintitle - + $logintitle +
-
- $domainlogo - $loginform
$noscript_warning -
$loginhelp
- $forgotpw

- $newuserlink
+ $forgotpw
+ $contactblock
+ $newuserlink $coursecatalog

- $lt{'about'}
- $helpdeskscript + $lt{'about'}
 
@@ -506,9 +485,6 @@ $r->print(< - - $contactblock -