Changeset 247 for trunk/web/addons/job_monarch/search.php

Timestamp:

04/11/06 14:18:27 (17 years ago)

Author:

bastiaans

Message:

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

• changed to reflect same style as overview (optional memory column)

web/addons/job_monarch/search.php:

• changed to new style with optional memory column

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

• corrected small typo

File:

• trunk/web/addons/job_monarch/search.php (modified) (3 diffs)

trunk/web/addons/job_monarch/search.php

@@ -324 +324 @@
         global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
         global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up;
-        global $period_start, $period_stop, $sortby, $sortorder;
+        global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
 
         $metricname = $m;
@@ -366 +366 @@
                 }
 
+                if( $COLUMN_REQUESTED_MEMORY ) {
+                        $tpl->newBlock( "column_header_req_mem" );
+                }
+
                 //print_r( $nodes );
                 $sorted_search = sortJobs( $jobs, $nodes, $sortby, $sortorder );
@@ -387 +391 @@
                         $tpl->assign( "name", $job[name] );
                         $tpl->assign( "req_cpu", makeTime( TimeToEpoch( $job[requested_time] ) ) );
-                        $tpl->assign( "req_memory", $job[requested_memory] );
+
+                        if( $COLUMN_REQUESTED_MEMORY ) {
+                                $tpl->newBlock( "column_req_mem" );
+                                $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                $tpl->gotoBlock( "node" );
+                        }
 
                         $nodes_nr = count( $nodes[$foundid] );