--- loncom/auth/lonlogin.pm	2004/11/02 23:20:17	1.59
+++ loncom/auth/lonlogin.pm	2004/11/11 22:18:23	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.59 2004/11/02 23:20:17 albertel Exp $
+# $Id: lonlogin.pm,v 1.60 2004/11/11 22:18:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -263,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);
@@ -447,6 +447,7 @@ ENDNOOPT
     </form>
 ENDLOGIN
     if ($fullgraph) {
+        my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version);
 	$r->print(<<ENDDOCUMENT);
    </td>
 
@@ -499,13 +500,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 -->
@@ -544,7 +539,31 @@ ENDDOCUMENT
 }
     $r->print('</body></html>');
     return OK;
-} 
+}
+
+sub contactdisplay {
+    my ($lt,$sysadm,$servadm,$version) = @_;
+    my $contactblock;
+    my $showsysadm = 1;
+    my $showservadm = 1;
+    my $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="/adm/helpdesk">'.$$lt{'helpdesk'}.'</a></b><br />';
+    }
+    $contactblock .= <<"ENDBLOCK";
+     &nbsp;&nbsp;&nbsp;$version
+ENDBLOCK
+    return $contactblock;
+}
+ 
 
 1;
 __END__