--- loncom/auth/lonlogin.pm 2010/08/25 16:34:32 1.140 +++ loncom/auth/lonlogin.pm 2010/08/25 17:47:21 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.140 2010/08/25 16:34:32 raeburn Exp $ +# $Id: lonlogin.pm,v 1.141 2010/08/25 17:47:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -154,6 +154,7 @@ sub handler { my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); + # ----------------------------------------------------------- Get announcements my $announcements=&Apache::lonnet::getannounce(); # -------------------------------------------------------- Set login parameters @@ -261,7 +262,7 @@ my $loginbox_header_bgcol=&Apache::lonco 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='
'.&Apache::loncommon::domainlogo($domain).'
'; +my $domainlogo=&Apache::loncommon::domainlogo($domain); my $showbanner = 1; my $showmainlogo = 1; if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { @@ -456,12 +457,12 @@ ENDTOP } $r->print(<
ENDTOP $r->print(<
@@ -501,6 +502,11 @@ $r->print(<
+ +
+ $domainlogo +
+