--- loncom/auth/lonlogin.pm	2011/02/11 10:41:59	1.146
+++ loncom/auth/lonlogin.pm	2011/03/03 06:37:30	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.146 2011/02/11 10:41:59 bisitz Exp $
+# $Id: lonlogin.pm,v 1.147 2011/03/03 06:37:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,10 +151,14 @@ sub handler {
 	$loadavg=<$loadfile>;
     }
     $loadavg =~ s/\s.*//g;
-    my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
-    unless ($loadlim) { $loadpercent='---'; }
-    my $userloadpercent=&Apache::lonnet::userload();
-    unless ($uloadlim) { $userloadpercent='---'; }
+
+    my ($loadpercent,$userloadpercent);
+    if ($loadlim) {
+        $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
+    }
+    if ($uloadlim) {
+        $userloadpercent=&Apache::lonnet::userload();
+    }
 
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
@@ -464,10 +468,8 @@ $announcements
 </div>
 <hr style="clear:both;" />
 ENDTOP
-
-$r->print(<<ENDDOCUMENT);
-    <div style="float: left;">
-     <table border="0" cellspacing="0" cellpadding="0">
+    my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow);
+    $domainrow = <<"END";
       <tr>
        <td  align="left" valign="top">
         <small><b>$lt{'dom'}:&nbsp;</b></small>
@@ -476,6 +478,8 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
+END
+    $serverrow = <<"END";
       <tr>
        <td  align="left" valign="top">
         <small><b>$lt{'serv'}:&nbsp;</b></small>
@@ -484,6 +488,9 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
       </tr>
+END
+    if ($loadlim) {
+        $loadrow = <<"END";
       <tr>
        <td align="left" valign="top">
         <small><b>$lt{'load'}:&nbsp;</b></small>
@@ -492,6 +499,10 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
+END
+    }
+    if ($uloadlim) {
+        $userloadrow = <<"END";
       <tr>
        <td align="left" valign="top">
         <small><b>$lt{'userload'}:&nbsp;</b></small>
@@ -500,11 +511,26 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
+END
+    }
+    if (($version ne '') && ($version ne '<!-- VERSION -->')) {
+        $versionrow = <<"END";
       <tr>
        <td colspan="2" align="left">
         <small>$version</small>
        </td>
       </tr>
+END
+    }
+
+$r->print(<<ENDDOCUMENT);
+    <div style="float: left;">
+     <table border="0" cellspacing="0" cellpadding="0">
+$domainrow
+$serverrow
+$loadrow    
+$userloadrow
+$versionrow
      </table>
     </div>
     <div style="float: right;">