--- loncom/auth/lonlogin.pm 2009/04/01 14:43:19 1.117
+++ loncom/auth/lonlogin.pm 2009/05/14 10:21:10 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.117 2009/04/01 14:43:19 hauer Exp $
+# $Id: lonlogin.pm,v 1.120 2009/05/14 10:21:10 foxr 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);
@@ -302,10 +295,7 @@ 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",
@@ -326,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',
@@ -347,9 +336,16 @@ $r->print(<$jsh>);
}
# ---------------------------------------------------------- Serve rest of page
-if ($fullgraph) {
$r->print(
'