--- loncom/auth/lonlogin.pm 2010/03/17 14:37:43 1.135
+++ loncom/auth/lonlogin.pm 2010/05/06 16:15:59 1.137
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.135 2010/03/17 14:37:43 raeburn Exp $
+# $Id: lonlogin.pm,v 1.137 2010/05/06 16:15:59 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -264,6 +264,9 @@ my $link=&Apache::loncommon::designparm(
my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
my $alink=&Apache::loncommon::designparm('login.alink',$domain);
my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
+my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);
+my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain);
+my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);
my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img',$domain);
my $domainlogo='
');
+ '
'
+);
#
# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
@@ -395,13 +400,17 @@ my $newuserlink;
if ($shownewuserlink) {
$newuserlink = &newuser_link($lt{'newuser'}).'
';
}
-my $logintitle;
+my $logintitle =
+ '
';
if ($loginheader eq 'text') {
- $logintitle =''.$lt{'log'}.'
';
+ $logintitle .= $lt{'log'};
} else {
- $logintitle = '';
+ $logintitle .= '';
}
+$logintitle .= '
';
my $noscript_warning='
-
-
+
+
$logintitle
-
- $noscript_warning
+ $loginform
+ $noscript_warning
-
+
$loginhelp
$forgotpw
$contactblock
@@ -455,6 +457,8 @@ HEADER
$coursecatalog
+
+
ENDTOP
if ($showmainlogo) {
$r->print('
'."\n");
@@ -462,7 +466,8 @@ ENDTOP
$r->print(<
+
+
ENDTOP
$r->print(<
[0,$url],});
my $end_page = &Apache::loncommon::end_page();
return $start_page.$end_page;
@@ -642,7 +647,7 @@ sub loginhelpdisplay {
sub coursecatalog_link {
my ($linkname) = @_;
return <<"END";
- $linkname
+ $linkname
END
}