--- loncom/auth/lonlogin.pm	2003/11/12 16:55:40	1.55
+++ loncom/auth/lonlogin.pm	2004/12/30 16:04:37	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.55 2003/11/12 16:55:40 www Exp $
+# $Id: lonlogin.pm,v 1.62 2004/12/30 16:04:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,6 @@ sub handler {
 <head>
 <title>Already logged in</title>
 </head>
-<html>
 $bodytag
 <h1>You are already logged in</h1>
 <p>Please either <a href="/adm/roles">continue the current session</a> or
@@ -135,7 +134,7 @@ ENDFAILED
 	$loadavg=<$loadfile>;
     }
     $loadavg =~ s/\s.*//g;
-    my $loadpercent=100*$loadavg/$loadlim;
+    my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
     my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
@@ -180,15 +179,22 @@ ENDFAILED
 
     if ($logtoken eq 'con_lost') {
         my $spares='';
-        foreach (keys %Apache::lonnet::hostname) {
-            if ($_ ne $lonhost) {
-               $spares.='<br /><a href="http://'.$Apache::lonnet::hostname{$_}.
-		 '/adm/login?domain='.$authdomain.'">'.
-                 $Apache::lonnet::hostname{$_}.'</a>';
-               if ($Apache::lonnet::spareid{$_}) {
-		   $spares.=' (preferred)';
-               }
-	   }
+
+        foreach my $hostid (keys(%Apache::lonnet::spareid)) {
+            next if ($hostid eq $lonhost);
+            $spares.='<br /><font size="+1"><a href="http://'.
+                $Apache::lonnet::hostname{$hostid}.
+                '/adm/login?domain='.$authdomain.'">'.
+                $Apache::lonnet::hostname{$hostid}.'</a>'.
+                ' (preferred)</font>'.$/;
+        }
+        $spares.= '<br />';
+        foreach my $hostid (keys(%Apache::lonnet::hostname)) {
+            next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+            $spares.='<br /><a href="http://'.
+                $Apache::lonnet::hostname{$hostid}.
+                '/adm/login?domain='.$authdomain.'">'.
+                $Apache::lonnet::hostname{$hostid}.'</a>';
         }
 	$r->print(<<ENDTROUBLE);
 <html>
@@ -257,8 +263,8 @@ my %lt=&Apache::lonlocal::texthash(
 		  'help' => 'Help',
 		  'serv' => 'Server',
                   'servadm' => 'Server Administration',
-                  'sysadm' => 'System Administration');
-
+                  'sysadm' => 'System Administration',
+                  'helpdesk' => 'Contact Helpdesk');
 
 # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDSCRIPT);
@@ -441,6 +447,8 @@ ENDNOOPT
     </form>
 ENDLOGIN
     if ($fullgraph) {
+        my $helpdeskscript;
+        my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
 	$r->print(<<ENDDOCUMENT);
    </td>
 
@@ -493,13 +501,7 @@ ENDLOGIN
       </tr>
      </table>
      <br />
-    <small>
-     <b>&nbsp;&nbsp;&nbsp;$lt{'sysadm'}:</b><br />
-     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
-     <b>&nbsp;&nbsp;&nbsp;$lt{'servadm'}:</b><br />
-     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm</tt><br />&nbsp;<br />
-     &nbsp;&nbsp;&nbsp;$version
-    </small>
+    $contactblock
    </td>
 
    <!-- Row 5 Column 2 -->
@@ -529,16 +531,59 @@ $domainlogo
   </tr>
  </table>
 
-<script>
-// the if prevents the script error if the browser can't handle this
+<script type="text/javascript">
+// the if prevents the script error if the browser can not handle this
 if ( document.client.uname ) { document.client.uname.focus(); }
 </script>
+$helpdeskscript
 
 ENDDOCUMENT
 }
     $r->print('</body></html>');
     return OK;
-} 
+}
+
+sub contactdisplay {
+    my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
+    my $contactblock;
+    my $showsysadm = 1;
+    my $showservadm = 1;
+    my $showhelpdesk = 0;
+    my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+    if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
+        $showhelpdesk = 1;
+    }
+    if ($showsysadm) {
+        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.
+                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';
+    }
+    if ($showservadm) {
+        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
+                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
+    }
+    if ($showhelpdesk) {
+        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
+        my $thisurl = &Apache::lonnet::escape('/adm/login');
+        $$helpdeskscript = <<"ENDSCRIPT";
+<script type="text/javascript">
+function helpdesk() {
+    var codedom = document.client.udom.value;
+    if (codedom == '') {
+        codedom = "$authdomain";
+    }
+    var querystr = "origurl=$thisurl&codedom="+codedom;
+    document.location.href = "/adm/helpdesk?"+querystr;
+    return;
+}
+</script>
+ENDSCRIPT
+    }
+    $contactblock .= <<"ENDBLOCK";
+     &nbsp;&nbsp;&nbsp;$version
+ENDBLOCK
+    return $contactblock;
+}
+ 
 
 1;
 __END__
