--- loncom/auth/lonlogin.pm	2003/04/03 21:53:51	1.40
+++ 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.40 2003/04/03 21:53:51 albertel Exp $
+# $Id: lonlogin.pm,v 1.45 2003/08/12 19:46:04 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;
@@ -81,6 +81,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
 
@@ -89,22 +90,26 @@ sub handler {
 
 # ---------------------------------------------------------- Determine own load
     my $loadavg;
-   {
-       my $loadfile=Apache::File->new('/proc/loadavg');
-       $loadavg=<$loadfile>;
-   }
+    {
+	my $loadfile=Apache::File->new('/proc/loadavg');
+	$loadavg=<$loadfile>;
+    }
     $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;
+    my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=
     ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?
-    if (($role eq 'access') && ($loadpercent>100.0)) {
-        $otherserver=Apache::lonnet::spareserver($loadpercent);
+    if (($role eq 'access') &&
+	(($userloadpercent>100.0)||($loadpercent>100.0))) {
+        $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',
@@ -261,6 +266,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);
@@ -302,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>
@@ -318,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) {
@@ -381,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>
@@ -414,13 +424,22 @@ ENDLOGIN
         <small><tt>&nbsp;$loadpercent percent</tt></small>
        </td>
       </tr>
+      <tr>
+       <td bgcolor="$sidebg" align="left" valign="top">
+        <small><b>&nbsp;&nbsp;&nbsp;User&nbsp;Load:&nbsp;</b></small>
+       </td>
+       <td bgcolor="$sidebg" align="left" valign="top">
+        <small><tt>&nbsp;$userloadpercent percent</tt></small>
+       </td>
+      </tr>
      </table>
      <br />
     <small>
      <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>