Changeset 242


Ignore:
Timestamp:
04/07/06 16:37:34 (16 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
Location:
trunk/web/addons/job_monarch
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/addons/job_monarch/conf.php

    r241 r242  
    77//
    88$COLUMN_REQUESTED_MEMORY = 0;
     9
     10// Show the column job attribute 'queued' (since)?
     11//
     12$COLUMN_QUEUED = 1;
    913
    1014// Path to Ganglia's web frontend root
  • trunk/web/addons/job_monarch/overview.php

    r241 r242  
    2424
    2525global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh;
    26 global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY;
     26global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED;
    2727
    2828//$tpl->assign("_ROOT.summary", "" );
     
    465465        global $cluster_url, $get_metric_string, $host_url, $metrics;
    466466        global $start, $end, $reports, $gnodes, $default_showhosts;
    467 
     467        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY;
    468468        $metricname = $m;
    469469
     
    510510
    511511        if( $COLUMN_REQUESTED_MEMORY ) {
    512                 $tpl->newBlock( "column_req_mem" );
    513                 $tpl->gotoBlock( "node" );
     512                $tpl->newBlock( "column_header_req_mem" );
     513        }
     514
     515        if( $COLUMN_QUEUED ) {
     516                $tpl->newBlock( "column_header_queued" );
    514517        }
    515518
     
    607610                                        $tpl->newBlock( "column_req_mem" );
    608611                                        $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
     612                                        $tpl->gotoBlock( "node" );
     613                                }
     614
     615                                if( $COLUMN_QUEUED ) {
     616                                        $tpl->newBlock( "column_queued" );
     617                                        $tpl->assign( "queued", $jobs[$jobid][queued] );
    609618                                        $tpl->gotoBlock( "node" );
    610619                                }
  • trunk/web/addons/job_monarch/templates/overview.tpl

    r241 r242  
    137137<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{f_order}">
    138138
    139 <TABLE WIDTH="100%" CELLPADDING="8" CELLSPACING="3" BORDER=0>
     139<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="2" BORDER=0>
    140140<TR CLASS="monarch">
    141141<TH><B><A HREF="#" onClick="setSort( 'id' )" ALT="Jobid" TITLE="Jobid">Id</A></B></TH>
     
    145145<TH><B><A HREF="#" onClick="setSort( 'name' )" ALT="Jobname" TITLE="Jobname">Name</A></B></TH>
    146146<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )" ALT="Requested CPU Time (walltime)" TITLE="Requested CPU Time (walltime)">Req. CPU time</A></B></TH>
    147 <!-- START BLOCK : column_req_mem -->
     147<!-- START BLOCK : column_header_req_mem -->
    148148<TH><B><A HREF="#" onClick="setSort( 'req_mem' )" ALT="Requested Memory" TITLE="Requested Memory">Req. Memory</A></B></TH>
    149 <!-- END BLOCK : column_req_mem -->
     149<!-- END BLOCK : column_header_req_mem -->
    150150<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>
    151 <!-- START BLOCK : column_queued -->
     151<!-- START BLOCK : column_header_queued -->
    152152<TH><B><A HREF="#" onClick="setSort( 'queued' )">Queued</A></B></TH>
    153 <!-- END BLOCK : column_queued -->
     153<!-- END BLOCK : column_header_queued -->
    154154<TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
    155155<TH><B><A HREF="#" onClick="setSort( 'runningtime' )">Runningtime</A></B></TH>
     
    176176<!-- END BLOCK : column_req_mem -->
    177177    <TD>{nodes}/{cpus}</TD>
     178<!-- START BLOCK : column_queued -->
     179    <TD>{queued}</TD>
     180<!-- END BLOCK : column_queued -->
    178181    <TD>{started}</TD>
    179182    <TD>{runningtime}</TD>
Note: See TracChangeset for help on using the changeset viewer.