--- loncom/auth/lonlogin.pm	2003/08/26 19:48:41	1.44.2.2
+++ loncom/auth/lonlogin.pm	2003/08/12 19:46:04	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.44.2.2 2003/08/26 19:48:41 albertel Exp $
+# $Id: lonlogin.pm,v 1.45 2003/08/12 19:46:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,10 +73,6 @@ 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');
@@ -109,10 +105,11 @@ sub handler {
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') &&
 	(($userloadpercent>100.0)||($loadpercent>100.0))) {
-        my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
-	if ($unloaded) { $otherserver=$unloaded; }
+        $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
     }
 
+# ----------------------------------------------------------- Get announcements
+    my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters
 
     my @hexstr=('0','1','2','3','4','5','6','7',
@@ -188,20 +185,20 @@ ENDHEADER
 
 # ----------------------------------------------------------- Front page design
     my $pgbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
     my $font=
-      ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
+      ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');
     my $link=
-      ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
+      ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');
     my $vlink=
-      ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
-    my $alink=&Apache::loncommon::designparm('login.alink',$domain);
+      ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');
+    my $alink=&Apache::loncommon::designparm('login.alink');
     my $mainbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
     my $sidebg=
-      ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
-    my $logo=&Apache::loncommon::designparm('login.logo',$domain);
-    my $img=&Apache::loncommon::designparm('login.img',$domain);
+      ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
+    my $logo=&Apache::loncommon::designparm('login.logo');
+    my $img=&Apache::loncommon::designparm('login.img');
 
 
 # ---------------------------------------------------------- Serve rest of page
@@ -312,7 +309,7 @@ ENDSERVERFORM
 
    <!-- The right main column holding the large LON-CAPA logo-->
    <!-- Rows 3-4 Column 3 -->
-   <td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="$mainbg">
+   <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
     <center>
      <img src="$logo" alt="" />
     </center>
@@ -328,7 +325,7 @@ ENDSERVERFORM
    <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP
 } else {
-    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>');
+    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>'.$announcements);
 }
     $r->print('<form name="client" onsubmit="return(send())">');
     unless ($fullgraph) {
@@ -391,6 +388,9 @@ ENDLOGIN
    <!-- Row 4 Column 2 -->
    <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
 
+   <!-- Row 4 Column 3 -->
+<td bgcolor="$mainbg">$announcements</td>
+
    <!-- Row 4 Column 4 -->
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>