Changeset 247


Ignore:
Timestamp:
04/11/06 14:18:27 (15 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:
3 edited

Legend:

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

    r246 r247  
    324324        global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
    325325        global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up;
    326         global $period_start, $period_stop, $sortby, $sortorder;
     326        global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
    327327
    328328        $metricname = $m;
     
    366366                }
    367367
     368                if( $COLUMN_REQUESTED_MEMORY ) {
     369                        $tpl->newBlock( "column_header_req_mem" );
     370                }
     371
    368372                //print_r( $nodes );
    369373                $sorted_search = sortJobs( $jobs, $nodes, $sortby, $sortorder );
     
    387391                        $tpl->assign( "name", $job[name] );
    388392                        $tpl->assign( "req_cpu", makeTime( TimeToEpoch( $job[requested_time] ) ) );
    389                         $tpl->assign( "req_memory", $job[requested_memory] );
     393
     394                        if( $COLUMN_REQUESTED_MEMORY ) {
     395                                $tpl->newBlock( "column_req_mem" );
     396                                $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
     397                                $tpl->gotoBlock( "node" );
     398                        }
    390399
    391400                        $nodes_nr = count( $nodes[$foundid] );
  • trunk/web/addons/job_monarch/templates/overview.tpl

    r242 r247  
    162162    <TD><A HREF="#" onClick="setFilter( 'user', '{user}' )">{user}</A></TD>
    163163    <TD><A HREF="#" onClick="setFilter( 'queue', '{queue}' )">{queue}</A></TD>
    164     <TD alt="{fulljobname}" title="{fulljobname}">
     164    <TD ALT="{fulljobname}" TITLE="{fulljobname}">
    165165<!-- START BLOCK : jobname_hint_start -->
    166166    <FONT CLASS="jobname_hint">
  • trunk/web/addons/job_monarch/templates/search.tpl

    r238 r247  
    202202<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{f_order}">
    203203
    204 <TABLE WIDTH="90%" CELLPADDING="8" CELLSPACING="3" BORDER=0>
     204<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="2" BORDER=0>
    205205<TR CLASS="monarch">
    206 <TH><B><A HREF="#" onClick="setSort( 'id' )">Id</A></B></TH>
    207 <TH><B><A HREF="#" onClick="setSort( 'state' )">State</A></B></TH>
     206<TH><B><A HREF="#" onClick="setSort( 'id' )" ALT="Jobid" TITLE="Jobid">Id</A></B></TH>
     207<TH><B><A HREF="#" onClick="setSort( 'state' )" ALT="State" TITLE="State">S</A></B></TH>
    208208<TH><B><A HREF="#" onClick="setSort( 'user' )">User</A></B></TH>
    209209<TH><B><A HREF="#" onClick="setSort( 'queue' )">Queue</A></B></TH>
    210 <TH><B><A HREF="#" onClick="setSort( 'name' )">Name</A></B></TH>
    211 <TH><B><A HREF="#" onClick="setSort( 'req_cpu' )">Req. CPU time</A></B></TH>
    212 <TH><B><A HREF="#" onClick="setSort( 'req_mem' )">Req. Memory</A></B></TH>
    213 <TH><B><A HREF="#" onClick="setSort( 'nodes' )">Nodes</A>/<A HREF="#" onClick="setSort( 'cpus' )">Cpus</A></B></TH>
     210<TH><B><A HREF="#" onClick="setSort( 'name' )" ALT="Jobname" TITLE="Jobname">Name</A></B></TH>
     211<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )" ALT="Requested CPU Time (walltime)" TITLE="Requested CPU Time (walltime)">Req. CPU time</A></B></TH>
     212<!-- START BLOCK : column_header_req_mem -->
     213<TH><B><A HREF="#" onClick="setSort( 'req_mem' )" ALT="Requested Memory" TITLE="Requested Memory">Req. Memory</A></B></TH>
     214<!-- END BLOCK : column_header_req_mem -->
     215<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>
    214216<TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
    215217<TH><B><A HREF="#" onClick="setSort( 'finished' )">Finished</A></B></TH>
     
    223225    <TD><A HREF="#" onClick="setFilter( 'user', '{user}' )">{user}</A></TD>
    224226    <TD><A HREF="#" onClick="setFilter( 'queue', '{queue}' )">{queue}</A></TD>
    225     <TD>{name}</TD>
     227    <TD ALT="{fulljobname}" TITLE="{fulljobname}">
     228<!-- START BLOCK : jobname_hint_start -->
     229    <FONT CLASS="jobname_hint">
     230<!-- END BLOCK : jobname_hint_start -->
     231    {name}
     232<!-- START BLOCK : jobname_hint_end -->
     233    </FONT>
     234<!-- END BLOCK : jobname_hint_end -->
     235    </TD>
    226236    <TD>{req_cpu}</TD>
     237<!-- START BLOCK : column_req_mem -->
    227238    <TD>{req_memory}</TD>
     239<!-- END BLOCK : column_req_mem -->
    228240    <TD>{nodes}/{cpus}</TD>
    229241    <TD>{started}</TD>
Note: See TracChangeset for help on using the changeset viewer.