--- loncom/auth/lonlogin.pm 2008/12/10 10:14:55 1.111 +++ loncom/auth/lonlogin.pm 2009/03/16 18:10:05 1.115 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.111 2008/12/10 10:14:55 muellerd Exp $ +# $Id: lonlogin.pm,v 1.115 2009/03/16 18:10:05 bisitz 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); @@ -382,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').''; @@ -401,14 +390,14 @@ my $contactblock = &contactdisplay(\%lt, my $loginform=(< - - + + :
-
+
:
-
+
:
-
+
LFORM @@ -420,7 +409,7 @@ if ($fullgraph) {
- The Learning Online Network with CAPA + The Learning Online Network with CAPA
@@ -431,30 +420,26 @@ HEADER ' '."\n"); } $r->print(<$domainlogo
-
- $logintitle - + $logintitle +
-
- $domainlogo - $loginform
$noscript_warning -
$loginhelp
- $forgotpw

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

- $lt{'about'}
- $contactblock + $lt{'about'}
 
@@ -466,7 +451,7 @@ if($announcements){$r->print('
print(< +
   $lt{'dom'}:  @@ -528,7 +513,7 @@ sub contactdisplay { '      '.$servadm.'
 
'; } if ($showhelpdesk) { - $contactblock .= ''.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";