Changeset 242 for trunk/web/addons/job_monarch/templates

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/templates/overview.tpl (modified) (3 diffs)

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

@@ -137 +137 @@
 <INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{f_order}">
 
-<TABLE WIDTH="100%" 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' )" ALT="Jobid" TITLE="Jobid">Id</A></B></TH>
@@ -145 +145 @@
 <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_req_mem -->
+<!-- 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_req_mem -->
+<!-- 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>
-<!-- START BLOCK : column_queued -->
+<!-- START BLOCK : column_header_queued -->
 <TH><B><A HREF="#" onClick="setSort( 'queued' )">Queued</A></B></TH>
-<!-- END BLOCK : column_queued -->
+<!-- END BLOCK : column_header_queued -->
 <TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'runningtime' )">Runningtime</A></B></TH>
@@ -176 +176 @@
 <!-- END BLOCK : column_req_mem -->
     <TD>{nodes}/{cpus}</TD>
+<!-- START BLOCK : column_queued -->
+    <TD>{queued}</TD>
+<!-- END BLOCK : column_queued -->
     <TD>{started}</TD>
     <TD>{runningtime}</TD>