--- loncom/auth/lonlogin.pm 2009/04/08 10:13:13 1.118 +++ loncom/auth/lonlogin.pm 2009/04/28 21:54:51 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.118 2009/04/08 10:13:13 tempelho Exp $ +# $Id: lonlogin.pm,v 1.119 2009/04/28 21:54:51 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -103,8 +103,6 @@ sub handler { $env{'form.interface'}=~s/\W//g; my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); @@ -235,17 +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 $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); @@ -323,7 +316,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', @@ -344,10 +336,8 @@ $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page -if ($fullgraph) { $r->print( '
'); -} $r->print(< @@ -399,7 +389,6 @@ my $loginform=(< LFORM -if ($fullgraph) { if ($showbanner) { $r->print(< @@ -432,8 +421,7 @@ HEADER $forgotpw
$contactblock
$newuserlink - $coursecatalog

- $lt{'about'} + $coursecatalog
ENDTOP @@ -445,9 +433,7 @@ $announcements $domainlogo
 
ENDTOP -} -if ($fullgraph) { $r->print(< @@ -492,7 +478,6 @@ if ( document.client.uname ) { document. $helpdeskscript ENDDOCUMENT -} my %endargs = ( 'noredirectlink' => 1, ); $r->print(&Apache::loncommon::end_page(\%endargs)); return OK;