--- loncom/auth/lonlogin.pm	2003/05/08 22:23:19	1.42
+++ 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.42 2003/05/08 22:23:19 albertel Exp $
+# $Id: lonlogin.pm,v 1.46 2003/08/25 15:24:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ sub handler {
 
     &Apache::loncommon::get_unprocessed_cgi
      ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
-      ['interface','username','domain','firsturl']);
+      ['interface','username','domain','firsturl','localpath','localres']);
  
 # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;
@@ -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');
@@ -81,6 +85,7 @@ sub handler {
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
     my $expire  = $r->dir_config('lonExpire');
+    my $version = $r->dir_config('lonVersion');
 
 # --------------------------------------------- Default values for login fields
 
@@ -107,6 +112,8 @@ sub handler {
         $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',
@@ -182,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
@@ -263,6 +270,8 @@ ENDSCRIPT
    <input type="hidden" name="fontenhance"  value="" />
    <input type="hidden" name="blackwhite"  value="" />
    <input type="hidden" name="remember"  value="" />
+   <input type="hidden" name="localpath" value="$ENV{'form.localpath'}" />
+   <input type="hidden" name="localres" value="$ENV{'form.localres'}" />
   </form>
 ENDSERVERFORM
     if ($fullgraph) { $r->print(<<ENDTOP);
@@ -304,7 +313,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>
@@ -320,7 +329,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) {
@@ -383,6 +392,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>
@@ -430,7 +442,8 @@ ENDLOGIN
      <b>&nbsp;&nbsp;&nbsp;System Administration:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
      <b>&nbsp;&nbsp;&nbsp;Server Administration:</b><br />
-     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm<br />&nbsp;</tt>
+     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm</tt><br />&nbsp;<br />
+     &nbsp;&nbsp;&nbsp;$version
     </small>
    </td>