Changeset 247

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

Location:

trunk/web/addons/job_monarch

Files:

• search.php (modified) (3 diffs)
• templates/overview.tpl (modified) (1 diff)
• templates/search.tpl (modified) (2 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] );

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

@@ -162 +162 @@
     <TD><A HREF="#" onClick="setFilter( 'user', '{user}' )">{user}</A></TD>
     <TD><A HREF="#" onClick="setFilter( 'queue', '{queue}' )">{queue}</A></TD>
-    <TD alt="{fulljobname}" title="{fulljobname}">
+    <TD ALT="{fulljobname}" TITLE="{fulljobname}">
 <!-- START BLOCK : jobname_hint_start -->
     <FONT CLASS="jobname_hint">

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

@@ -202 +202 @@
 <INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{f_order}">
 
-<TABLE WIDTH="90%" CELLPADDING="8" CELLSPACING="3" BORDER=0>
+<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="2" BORDER=0>
 <TR CLASS="monarch">
-<TH><B><A HREF="#" onClick="setSort( 'id' )">Id</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'state' )">State</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'id' )" ALT="Jobid" TITLE="Jobid">Id</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'state' )" ALT="State" TITLE="State">S</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'user' )">User</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'queue' )">Queue</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'name' )">Name</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )">Req. CPU time</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'req_mem' )">Req. Memory</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'nodes' )">Nodes</A>/<A HREF="#" onClick="setSort( 'cpus' )">Cpus</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'name' )" ALT="Jobname" TITLE="Jobname">Name</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )" ALT="Requested CPU Time (walltime)" TITLE="Requested CPU Time (walltime)">Req. CPU time</A></B></TH>
+<!-- START BLOCK : column_header_req_mem -->
+<TH><B><A HREF="#" onClick="setSort( 'req_mem' )" ALT="Requested Memory" TITLE="Requested Memory">Req. Memory</A></B></TH>
+<!-- END BLOCK : column_header_req_mem -->
+<TH><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">N</A>/<A HREF="#" onClick="setSort( 'cpus' )" ALT="Processors" TITLE="Processors">P</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'finished' )">Finished</A></B></TH>
@@ -223 +225 @@
     <TD><A HREF="#" onClick="setFilter( 'user', '{user}' )">{user}</A></TD>
     <TD><A HREF="#" onClick="setFilter( 'queue', '{queue}' )">{queue}</A></TD>
-    <TD>{name}</TD>
+    <TD ALT="{fulljobname}" TITLE="{fulljobname}">
+<!-- START BLOCK : jobname_hint_start -->
+    <FONT CLASS="jobname_hint">
+<!-- END BLOCK : jobname_hint_start -->
+    {name}
+<!-- START BLOCK : jobname_hint_end -->
+    </FONT>
+<!-- END BLOCK : jobname_hint_end -->
+    </TD>
     <TD>{req_cpu}</TD>
+<!-- START BLOCK : column_req_mem -->
     <TD>{req_memory}</TD>
+<!-- END BLOCK : column_req_mem -->
     <TD>{nodes}/{cpus}</TD>
     <TD>{started}</TD>