Ignore:
Timestamp:
03/26/13 21:38:02 (11 years ago)
Author:
ramonb
Message:

index.php, overview.php:

header.php:

  • removed: was not used
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/0.4/web/addons/job_monarch/templates/overview.tpl

    r741 r753  
    2020</TR>
    2121
    22 <!-- START BLOCK : na_nodes -->
     22{if "$na_nodes" == "yes"}
    2323<TR class="overview">
    2424<TD class="gray">
    … …  
    2626</TD>
    2727<TD class="gray">
    28 {na_jobs}
    29 </TD>
    30 <TD class="gray">
    31 {na_nodes}
    32 </TD>
    33 <TD class="gray">
    34 {na_cpus}
    35 </TD>
    36 </TR>
    37 <!-- END BLOCK : na_nodes -->
    38 
     28{$na_jobs}
     29</TD>
     30<TD class="gray">
     31{$na_nodes}
     32</TD>
     33<TD class="gray">
     34{$na_cpus}
     35</TD>
     36</TR>
     37{/if}
    3938
    4039<TR class="overview_line">
    … …  
    4544</TD>
    4645<TD class="blue">
    47 {avail_nodes}
    48 </TD>
    49 <TD class="blue">
    50 {avail_cpus}
     46{$avail_nodes}
     47</TD>
     48<TD class="blue">
     49{$avail_cpus}
    5150</TD>
    5251</TR>
    … …  
    5958</TD>
    6059<TD class="red">
    61 {running_jobs}
    62 </TD>
    63 <TD class="red">
    64 {running_nodes}
    65 </TD>
    66 <TD class="red">
    67 {running_cpus}
     60{$running_jobs}
     61</TD>
     62<TD class="red">
     63{$running_nodes}
     64</TD>
     65<TD class="red">
     66{$running_cpus}
    6867</TD>
    6968</TR>
    … …  
    7473</TD>
    7574<TD class="gray">
    76 {queued_jobs}
    77 </TD>
    78 <TD class="gray">
    79 {queued_nodes}
    80 </TD>
    81 <TD class="gray">
    82 {queued_cpus}
     75{$queued_jobs}
     76</TD>
     77<TD class="gray">
     78{$queued_nodes}
     79</TD>
     80<TD class="gray">
     81{$queued_cpus}
    8382</TD>
    8483</TR>
    … …  
    8988</TD>
    9089<TD class="brown">
    91 {total_jobs}
    92 </TD>
    93 <TD class="brown">
    94 {total_nodes}
    95 </TD>
    96 <TD class="brown">
    97 {total_cpus}
     90{$total_jobs}
     91</TD>
     92<TD class="brown">
     93{$total_nodes}
     94</TD>
     95<TD class="brown">
     96{$total_cpus}
    9897</TD>
    9998</TR>
    … …  
    107106</TD>
    108107<TD class="green">
    109 {free_nodes}
    110 </TD>
    111 <TD class="green">
    112 {free_cpus}
     108{$free_nodes}
     109</TD>
     110<TD class="green">
     111{$free_cpus}
    113112</TD>
    114113</TR>
    … …  
    119118</TD>
    120119<TD>
    121 {view_jobs}
    122 </TD>
    123 <TD>
    124 {view_nodes}
    125 </TD>
    126 <TD>
    127 {view_cpus}
     120{$view_jobs}
     121</TD>
     122<TD>
     123{$view_nodes}
     124</TD>
     125<TD>
     126{$view_cpus}
    128127</TD>
    129128</TR>
    … …  
    133132<BR>
    134133<div id="monarchimage">
    135 {rjqj_graph}
     134{$rjqj_graph}
    136135</div>
    137136
    … …  
    139138<!-- INCLUDESCRIPT BLOCK : ci_script -->
    140139    <div id="monarchimage">
    141     <IMG SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">
     140    <IMG SRC="{$clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">
    142141    </div>
    143142    <MAP NAME="MONARCH_CLUSTER_BIG">
    144 <!-- START BLOCK : node_clustermap -->
    145 {node_area_map}
    146 <!-- END BLOCK : node_clustermap -->
     143{if "$nodes_clustermap" == "yes"}
     144{$node_area_map}
     145{/if}
    147146    </MAP>
    148147    <BR>
    149 <FONT class="footer">Last updated: {report_time}</FONT></CENTER>
     148<FONT class="footer">Last updated: {$report_time}</FONT></CENTER>
    150149  </TD>
    151150
    152151  </TD>
    153152  <TD ALIGN="CENTER">
    154     <IMG SRC="{pie}">
     153    <IMG SRC="{$pie}">
    155154  </TD>
    156155</TR>
    … …  
    162161<NOSCRIPT><P>[Sorting by column header requires JavaScript]<BR><BR></P></NOSCRIPT>
    163162
    164 <INPUT TYPE="HIDDEN" NAME="sortby" VALUE="{sortby}">
    165 <INPUT TYPE="HIDDEN" NAME="sortorder" VALUE="{sortorder}">
    166 <INPUT TYPE="HIDDEN" NAME="c" VALUE="{clustername}">
    167 <INPUT TYPE="HIDDEN" NAME="queue" VALUE="{queue}">
    168 <INPUT TYPE="HIDDEN" NAME="state" VALUE="{state}">
    169 <INPUT TYPE="HIDDEN" NAME="owner" VALUE="{owner}">
    170 <INPUT TYPE="HIDDEN" NAME="id" VALUE="{id}">
    171 <INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{order}">
     163<INPUT TYPE="HIDDEN" NAME="sortby" VALUE="{$sortby}">
     164<INPUT TYPE="HIDDEN" NAME="sortorder" VALUE="{$sortorder}">
     165<INPUT TYPE="HIDDEN" NAME="c" VALUE="{$clustername}">
     166<INPUT TYPE="HIDDEN" NAME="queue" VALUE="{$queue}">
     167<INPUT TYPE="HIDDEN" NAME="state" VALUE="{$state}">
     168<INPUT TYPE="HIDDEN" NAME="owner" VALUE="{$owner}">
     169<INPUT TYPE="HIDDEN" NAME="id" VALUE="{$id}">
     170<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{$order}">
    172171
    173172<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="2" BORDER=0>
    … …  
    179178<TH><B><A HREF="#" onClick="setSort( 'name' )" ALT="Jobname" TITLE="Jobname">Name</A></B></TH>
    180179<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )" ALT="Requested CPU Time (walltime)" TITLE="Requested CPU Time (walltime)">Req. CPU time</A></B></TH>
    181 <!-- START BLOCK : column_header_req_mem -->
     180{if "$column_header_req_mem" == "yes"}
    182181<TH><B><A HREF="#" onClick="setSort( 'req_mem' )" ALT="Requested Memory" TITLE="Requested Memory">Req. Memory</A></B></TH>
    183 <!-- END BLOCK : column_header_req_mem -->
     182{/if}
    184183<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>
    185 <!-- START BLOCK : column_header_queued -->
     184{if "$column_header_queued" == "yes"}
    186185<TH><B><A HREF="#" onClick="setSort( 'queued' )">Queued</A></B></TH>
    187 <!-- END BLOCK : column_header_queued -->
    188 <!-- START BLOCK : column_header_nodes -->
     186{/if}
     187{if "$column_header_nodes" == "yes"}
    189188<TH WIDTH="11%"><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">Nodes</A></B></TH>
    190 <!-- END BLOCK : column_header_nodes -->
     189{/if}
    191190<TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
    192191<TH><B><A HREF="#" onClick="setSort( 'runningtime' )">Runningtime</A></B></TH>
    193192</TR>
    194193
    195 <!-- START BLOCK : node -->
    196   <TR CLASS="{nodeclass}">
    197     <TD><A HREF="#" onClick="setFilter( 'id', '{id}' )">{id}</A></TD>
    198     <TD><A HREF="#" onClick="setFilter( 'state', '{state}' )" ALT="{fullstate}" TITLE="{fullstate}">{state}</A></TD>
    199     <TD><A HREF="#" onClick="setFilter( 'owner', '{owner}' )">{owner}</A></TD>
    200     <TD><A HREF="#" onClick="setFilter( 'queue', '{queue}' )">{queue}</A></TD>
    201     <TD ALT="{fulljobname}" TITLE="{fulljobname}">
    202 <!-- START BLOCK : jobname_hint_start -->
     194{loop $node_list}
     195  <TR CLASS="{$nodeclass}">
     196    <TD><A HREF="#" onClick="setFilter( 'id', '{$id}' )">{$id}</A></TD>
     197    <TD><A HREF="#" onClick="setFilter( 'state', '{$state}' )" ALT="{$fullstate}" TITLE="{$fullstate}">{$state}</A></TD>
     198    <TD><A HREF="#" onClick="setFilter( 'owner', '{$owner}' )">{$owner}</A></TD>
     199    <TD><A HREF="#" onClick="setFilter( 'queue', '{$queue}' )">{$queue}</A></TD>
     200    <TD ALT="{$fulljobname}" TITLE="{$fulljobname}">
     201{if "$jobname_hint_start" == "yes"}
    203202    <FONT CLASS="jobname_hint">
    204 <!-- END BLOCK : jobname_hint_start -->
    205     {name}
    206 <!-- START BLOCK : jobname_hint_end -->
     203{/if}
     204    {$name}
     205{if "$jobname_hint_end" == "yes"}
    207206    </FONT>
    208 <!-- END BLOCK : jobname_hint_end -->
     207{/if}
    209208    </TD>
    210     <TD>{req_cpu}</TD>
    211 <!-- START BLOCK : column_req_mem -->
    212     <TD>{req_memory}</TD>
    213 <!-- END BLOCK : column_req_mem -->
    214     <TD>{nodes}/{cpus}</TD>
    215 <!-- START BLOCK : column_queued -->
    216     <TD>{queued}</TD>
    217 <!-- END BLOCK : column_queued -->
    218 <!-- START BLOCK : column_nodes -->
    219     <TD>{nodes_hostnames}</TD>
    220 <!-- END BLOCK : column_nodes -->
    221     <TD>{started}</TD>
    222     <TD>{runningtime}</TD>
     209    <TD>{$req_cpu}</TD>
     210{if "$column_req_mem" == "yes"}
     211    <TD>{$req_memory}</TD>
     212{/if}
     213    <TD>{$nodes}/{$cpus}</TD>
     214{if "$column_queued" == "yes"}
     215    <TD>{$queued}</TD>
     216{/if}
     217{if "$column_nodes" == "yes"}
     218    <TD>{$nodes_hostnames}</TD>
     219{/if}
     220    <TD>{$started}</TD>
     221    <TD>{$runningtime}</TD>
    223222  </TR>
    224 <!-- END BLOCK : node -->
     223{/loop}
    225224</TABLE>
    226225</CENTER>
    227226
    228 <!-- START BLOCK : showhosts -->
     227{if "$showhosts" == "yes"}
    229228<TABLE BORDER="0" WIDTH="100%">
    230229<TR>
    … …  
    232231  <FONT SIZE="-1">
    233232  Show Hosts:
    234   yes<INPUT type=radio name="sh" value="1" OnClick="toga_form.submit();" {checked1}>
    235   no<INPUT type=radio name="sh" value="0" OnClick="toga_form.submit();" {checked0}>
     233  yes<INPUT type=radio name="sh" value="1" OnClick="toga_form.submit();" {$checked1}>
     234  no<INPUT type=radio name="sh" value="0" OnClick="toga_form.submit();" {$checked0}>
    236235  </FONT>
    237236  |
    238   job <strong>{id}</strong> metric <strong>{metric}</strong>
     237  job <strong>{$id}</strong> metric <strong>{$metric}</strong>
    239238  |
    240239   <FONT SIZE="-1">
    241    Columns&nbsp;&nbsp;{cols_menu}
     240   Columns&nbsp;&nbsp;{$cols_menu}
    242241   </FONT>
    243242  </TD>
    … …  
    249248<TABLE>
    250249<TR>
    251 <!-- START BLOCK : sorted_list -->
    252 {metric_image}{br}
    253 <!-- END BLOCK : sorted_list -->
     250{loop $sorted_list}
     251{$metric_image}{$br}
     252{/loop}
    254253</TR>
    255254</TABLE>
    … …  
    260259</CENTER>
    261260
    262 <!-- END BLOCK : showhosts -->
     261{/if}
Note: See TracChangeset for help on using the changeset viewer.