--- loncom/auth/lonlogin.pm 2009/03/16 18:20:17 1.116
+++ 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.116 2009/03/16 18:20:17 bisitz Exp $
+# $Id: lonlogin.pm,v 1.119 2009/04/28 21:54:51 tempelho 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
@@ -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,10 +336,8 @@ $r->print(<$jsh>);
}
# ---------------------------------------------------------- Serve rest of page
-if ($fullgraph) {
$r->print(
'');
-}
$r->print(<
@@ -402,7 +389,6 @@ my $loginform=(<
LFORM
-if ($fullgraph) {
if ($showbanner) {
$r->print(<
@@ -415,12 +401,9 @@ if ($fullgraph) {
HEADER
}
- if ($showmainlogo) {
- $r->print('
'."\n".
- ' '."\n");
- }
$r->print(<$domainlogo
+
+
$logintitle
@@ -438,18 +421,19 @@ HEADER
$forgotpw
$contactblock
$newuserlink
- $coursecatalog
- $lt{'about'}
+ $coursecatalog
-
-
+
+ENDTOP
+ if ($showmainlogo) {
+ $r->print(' '."\n");
+ }
+$r->print(<
ENDTOP
-}
-
-if($announcements){$r->print('
');}
-if ($fullgraph) {
$r->print(<
@@ -494,7 +478,6 @@ if ( document.client.uname ) { document.
$helpdeskscript
ENDDOCUMENT
-}
my %endargs = ( 'noredirectlink' => 1, );
$r->print(&Apache::loncommon::end_page(\%endargs));
return OK;