--- loncom/auth/lonlogin.pm	2003/08/12 19:46:04	1.45
+++ loncom/auth/lonlogin.pm	2003/08/25 15:24:43	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.45 2003/08/12 19:46:04 www Exp $
+# $Id: lonlogin.pm,v 1.46 2003/08/25 15:24:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,10 @@ sub handler {
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
+    if (($ENV{'form.domain'}) && 
+	 ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
+	$domain=$ENV{'form.domain'};
+    }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
@@ -185,20 +189,20 @@ ENDHEADER
 
 # ----------------------------------------------------------- Front page design
     my $pgbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
     my $font=
-      ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');
+      ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
     my $link=
-      ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');
+      ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
     my $vlink=
-      ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');
-    my $alink=&Apache::loncommon::designparm('login.alink');
+      ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+    my $alink=&Apache::loncommon::designparm('login.alink',$domain);
     my $mainbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
     my $sidebg=
-      ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
-    my $logo=&Apache::loncommon::designparm('login.logo');
-    my $img=&Apache::loncommon::designparm('login.img');
+      ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
+    my $logo=&Apache::loncommon::designparm('login.logo',$domain);
+    my $img=&Apache::loncommon::designparm('login.img',$domain);
 
 
 # ---------------------------------------------------------- Serve rest of page