--- loncom/interface/domainstatus.pm	2008/12/22 21:13:25	1.1
+++ loncom/interface/domainstatus.pm	2010/05/18 16:13:31	1.3
@@ -2,7 +2,7 @@
 # Generate a menu page containing links to server status pages accessible
 # to user. 
 #
-# $Id: domainstatus.pm,v 1.1 2008/12/22 21:13:25 raeburn Exp $
+# $Id: domainstatus.pm,v 1.3 2010/05/18 16:13:31 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,7 @@ use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
-use LONCAPA::loncgi;
+use LONCAPA::lonauthcgi;
 
 sub handler {
     my $r = shift;
@@ -57,12 +57,12 @@ sub handler {
     my $domdesc = &Apache::lonnet::domain($dom,'description');
 
     my %candisplay;
-    my $titles = &LONCAPA::loncgi::serverstatus_titles();
+    my $titles = &LONCAPA::lonauthcgi::serverstatus_titles();
     if (ref($titles) eq 'HASH') {
         foreach my $page (keys(%{$titles})) {
-            if (&LONCAPA::loncgi::can_view($page)) {
+            if (&LONCAPA::lonauthcgi::can_view($page)) {
                 $candisplay{$page} = 'F';       
-            } elsif (&LONCAPA::loncgi::check_ipbased_access($page)) {
+            } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
                 $candisplay{$page} = 'F';
             }
         }
@@ -74,15 +74,19 @@ sub handler {
       text=>"Server Status Information"});
 
     $r->print(&Apache::loncommon::start_page('Server Status').
-              &Apache::lonhtmlcommon::breadcrumbs('Server Status Information').
-              '<div class="LC_clear_float_header"></div>');
+              &Apache::lonhtmlcommon::breadcrumbs('Server Status Information'));
 
     if (keys(%candisplay) > 0) {
         $r->print('<h2>'.&mt('Server Utilities for Domain: [_1]','<i>'.$domdesc.'</i>').
                   '</h2>'.&print_status_menu(\%candisplay));
     } else {
-        $r->print('<h2>'.&mt('No information available').'</h2>'.
-                  '<span class="LC_error">'.&mt('Your current role and/or IP address does not have permission to display information about server status for servers in the domain: [_1].','<b>'.$domdesc.'</b> ('.$dom.')').'</span>'); 
+        $r->print(
+            '<h2>'.&mt('No information available').'</h2>'
+           .'<p class="LC_warning">'
+           .&mt('Your current role and/or IP address does not have permission to display information about server status for servers in the domain: [_1].',
+                '<b>'.$domdesc.'</b> ('.$dom.')')
+           .'</p>'
+        ); 
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -91,44 +95,13 @@ sub handler {
 sub print_status_menu {
     my ($candisplay) = @_;
     return '' if (ref($candisplay) ne 'HASH');
-    my $menu_html;
-    my @menu = &servermenu_items($candisplay);
-    foreach my $item (@menu) {
-        if (ref($item) eq 'HASH') {
-            my $display;
-            if (ref($item->{'items'}) eq 'ARRAY') {
-                foreach my $page (@{$item->{'items'}}) {
-                    if (ref($page) eq 'HASH') {
-                        if ($page->{'permission'} eq 'F') {
-                            $display .= '<span class="LC_parm_menu_item">';
-                            if ($page->{'help'} ne '') {
-                                $display .= 
-                                    &Apache::loncommon::help_open_topic($page->{'help'});
-                            }
-                            $display .= '<a href="'.$page->{'url'}.'" title="'.
-                                        &mt($page->{'linktitle'}).'">'.
-                                        &mt($page->{'linktext'}).
-                                        '</a></span><br /><br />'; 
-                        }
-                    }
-                }
-            }
-            if ($display) {
-                $menu_html .= '<div class="LC_left_float">'.
-                              '<h3>'.&mt($item->{'categorytitle'}).'</h3>'.
-                              $display.'</div>';
-            }
-        }
-    }
-    if ($menu_html) {
-        $menu_html .= '<div class="LC_clear_float_footer"></div>'; 
-    }
-    return $menu_html;
+    return &Apache::lonhtmlcommon::generate_menu(
+               &servermenu_items($candisplay));
 }
 
 sub servermenu_items {
     my ($candisplay) = @_;
-    my $titles = &LONCAPA::loncgi::serverstatus_titles();
+    my $titles = &LONCAPA::lonauthcgi::serverstatus_titles();
     my $linknames = &serverstatus_links();
     my @menu;
     if ((ref($candisplay) eq 'HASH') && (ref($titles) eq 'HASH') && 
@@ -137,7 +110,7 @@ sub servermenu_items {
                   items =>
                  [{
                  linktext => $linknames->{'userstatus'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Userstatus',
                  url => '/cgi-bin/userstatus.pl',
                  permission => $candisplay->{'userstatus'},
@@ -145,7 +118,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'lonstatus'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Connection_Status',
                  url => '/lon-status/',
                  permission => $candisplay->{'lonstatus'},
@@ -153,7 +126,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'server-status'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Apache_Status',
                  url => '/server-status',
                  permission => $candisplay->{'server-status'},
@@ -161,7 +134,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'clusterstatus'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Apache_Status',
                  url => '/cgi-bin/clusterstatus.pl',
                  permission => $candisplay->{'clusterstatus'},
@@ -169,7 +142,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'codeversions'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Code_Versions',
                  url => '/cgi-bin/lonversions.pl',
                  permission => $candisplay->{'codeversions'},
@@ -177,7 +150,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'showenv'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_User_Environment',
                  url => '/adm/test',
                  permission => $candisplay->{'showenv'},
@@ -187,7 +160,7 @@ sub servermenu_items {
              items =>
              [{
                  linktext => $linknames->{'loncron'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Connection_Reload',
                  url => '/cgi-bin/loncron.pl',
                  permission => $candisplay->{'loncron'},
@@ -195,7 +168,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'takeoffline'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Server_Offline',
                  url => '/cgi-bin/takeoffline.pl',
                  permission => $candisplay->{'takeoffline'},
@@ -203,7 +176,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'takeonline'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Server_Online',
                  url => '/cgi-bin/takeonline.pl',
                  permission => $candisplay->{'takeonline'},
@@ -213,7 +186,7 @@ sub servermenu_items {
              items =>
              [{
                  linktext => $linknames->{'metadata_keywords'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Metadata_Keywords',
                  url => '/cgi-bin/metadata_keywords.pl',
                  permission => $candisplay->{'metadata_keywords'},
@@ -221,7 +194,7 @@ sub servermenu_items {
              },
              {
                  linktext => $linknames->{'metadata_harvest'},
-                 #icon => '',
+                 icon => 'srvr.png',
                  #help => 'Domain_Coordination_Metadata_Harvest',
                  url => '/cgi-bin/metadata_harvest.pl',
                  permission => $candisplay->{'metadata_harvest'},