Ignore:
Timestamp:
06/02/05 15:12:32 (19 years ago)
Author:
bastiaans
Message:

web/addons/toga/templates/overview.tpl:

  • Setup javascript for multiple filters
  • Cosmetic updates

web/addons/toga/index.php:

  • Rearranged filter order

web/addons/toga/overview.php:

  • Changed for multiple filters
  • Cosmetic updates

web/addons/toga/image.php:

  • Changed for multiple filters

web/addons/toga/libtoga.php:

  • Changed filterNodes() for multiple filters
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/addons/toga/templates/overview.tpl

    r122 r124  
    66  <TD ALIGN="CENTER">
    77    <IMG SRC="{clusterimage}"><BR>
    8     reported: {heartbeat}
     8    {nodes_nr} nodes total: {jobs_nr} jobs with {cpus_nr} CPU's (at {report_time}).<BR>
     9    current view: {f_jobs_nr} jobs with {f_cpus_nr} CPU's{lag_msg}.
    910  </TD>
    1011  <TD ALIGN="CENTER">
     
    3738        function setFilter( filtername, filterval ) {
    3839
    39                 document.toga_form.id.value = '';
    40                 document.toga_form.queue.value = '';
    41                 document.toga_form.state.value = '';
    42                 document.toga_form.user.value = '';
     40                //document.toga_form.id.value = '';
     41                //document.toga_form.queue.value = '';
     42                //document.toga_form.state.value = '';
     43                //document.toga_form.user.value = '';
    4344
    4445                if( document.toga_form.elements[filtername] ) {
     
    5556<INPUT TYPE="HIDDEN" NAME="sortorder" VALUE="{sortorder}">
    5657<INPUT TYPE="HIDDEN" NAME="c" VALUE="{clustername}">
    57 <INPUT TYPE="HIDDEN" NAME="id" VALUE="{f_id}">
    5858<INPUT TYPE="HIDDEN" NAME="queue" VALUE="{f_queue}">
    5959<INPUT TYPE="HIDDEN" NAME="state" VALUE="{f_state}">
    6060<INPUT TYPE="HIDDEN" NAME="user" VALUE="{f_user}">
     61<INPUT TYPE="HIDDEN" NAME="id" VALUE="{f_id}">
    6162
    6263</FORM>
     
    6970<TH><B><A HREF="#" onClick="setSort( 'queue' )">Queue</A></B></TH>
    7071<TH><B><A HREF="#" onClick="setSort( 'name' )">Name</A></B></TH>
    71 <TH><B><A HREF="#" onClick="setSort( 'req_cpu' )">Requested CPU</A></B></TH>
    72 <TH><B><A HREF="#" onClick="setSort( 'req_mem' )">Requested Memory</A></B></TH>
     72<TH><B><A HREF="#" onClick="setSort( 'req_cpu' )">Req. CPU time</A></B></TH>
     73<TH><B><A HREF="#" onClick="setSort( 'req_mem' )">Req. Memory</A></B></TH>
    7374<TH><B><A HREF="#" onClick="setSort( 'nodes' )">Nodes</A>/<A HREF="#" onClick="setSort( 'cpus' )">Cpus</A></B></TH>
    7475<TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
Note: See TracChangeset for help on using the changeset viewer.