Changeset 242 for trunk/web/addons/job_monarch/overview.php

Timestamp:

04/07/06 16:37:34 (18 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added COLUMN_QUEUED option

web/addons/job_monarch/templates/overview.tpl:

• changed table spacing to more compact
• added Queued column template blocks

web/addons/job_monarch/overview.php:

• added queued column blocks

File:

• trunk/web/addons/job_monarch/overview.php (modified) (4 diffs)

trunk/web/addons/job_monarch/overview.php

@@ -24 +24 @@
 
 global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh;
-global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY;
+global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED;
 
 //$tpl->assign("_ROOT.summary", "" );
@@ -465 +465 @@
         global $cluster_url, $get_metric_string, $host_url, $metrics;
         global $start, $end, $reports, $gnodes, $default_showhosts;
-
+        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY;
         $metricname = $m;
 
@@ -510 +510 @@
 
         if( $COLUMN_REQUESTED_MEMORY ) {
-                $tpl->newBlock( "column_req_mem" );
-                $tpl->gotoBlock( "node" );
+                $tpl->newBlock( "column_header_req_mem" );
+        }
+
+        if( $COLUMN_QUEUED ) {
+                $tpl->newBlock( "column_header_queued" );
         }
 
@@ -607 +610 @@
                                         $tpl->newBlock( "column_req_mem" );
                                         $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                        $tpl->gotoBlock( "node" );
+                                }
+
+                                if( $COLUMN_QUEUED ) {
+                                        $tpl->newBlock( "column_queued" );
+                                        $tpl->assign( "queued", $jobs[$jobid][queued] );
                                         $tpl->gotoBlock( "node" );
                                 }