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

Timestamp:

04/07/06 12:42:02 (18 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added option COLUMN_REQUESTED_MEMORY to enable/disable showing req. mem

web/addons/job_monarch/version.php:

• version increase to 0.1.1

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

• req. mem column is now a template block
• added template block for queued since column (not yet used)

web/addons/job_monarch/overview.php:

• req. mem column will now only be displayed if enabled in conf.php

web/addons/job_monarch/footer.php:

• removed some bogus

File:

• trunk/web/addons/job_monarch/overview.php (modified) (3 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;
+global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY;
 
 //$tpl->assign("_ROOT.summary", "" );
@@ -509 +509 @@
         $view_name_nodes = array();
 
+        if( $COLUMN_REQUESTED_MEMORY ) {
+                $tpl->newBlock( "column_req_mem" );
+                $tpl->gotoBlock( "node" );
+        }
+
         foreach( $sorted_jobs as $jobid => $sortdec ) {
 
@@ -598 +603 @@
                                 $domain = $jobs[$jobid][domain];
                                 $tpl->assign("req_cpu", makeTime( timeToEpoch( $jobs[$jobid][requested_time] ) ) );
-                                $tpl->assign("req_memory", $jobs[$jobid][requested_memory] );
-
+
+                                if( $COLUMN_REQUESTED_MEMORY ) {
+                                        $tpl->newBlock( "column_req_mem" );
+                                        $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                        $tpl->gotoBlock( "node" );
+                                }
 
                                 $ppn = (int) $jobs[$jobid][ppn] ? $jobs[$jobid][ppn] : 1;