Changeset 805


Ignore:
Timestamp:
04/08/13 20:49:18 (9 years ago)
Author:
ramonb
Message:

search.php,
templates/search.tpl:

  • pass self to search pages

overview.php:

  • set sourcetime as period end
Location:
branches/0.4/web/addons/job_monarch
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/overview.php

    r798 r805  
    11181118                {
    11191119                    $job_start     = $jobs[$last_displayed_job]['start_timestamp'];
    1120                     $period_end    = time();
    1121                     $runningtime   = time() - intval( $job_start );
     1120                    $period_end    = $cluster['LOCALTIME'];
     1121                    $runningtime   = intval( $period_end ) - intval( $job_start );
    11221122                    $load_color    = load_color($host_load[$host]);
    11231123                    $period_start  = intval( $job_start - (intval( $runningtime * 0.10 ) ) );
  • branches/0.4/web/addons/job_monarch/search.php

    r780 r805  
    226226    global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up, $hc;
    227227    global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
    228     global $SEARCH_RESULT_LIMIT, $COLUMN_NODES, $metricname;
     228    global $SEARCH_RESULT_LIMIT, $COLUMN_NODES, $metricname, $self;
    229229
    230230    $longtitle = "Batch Archive Search :: Powered by Job Monarch!";
     
    236236    $tpl_data = new Dwoo_Data();
    237237
     238    $tpl_data->assign( "self", $self );
    238239    $tpl_data->assign( "cluster", $clustername );
    239240    $tpl_data->assign( "id_value", $id );
     
    434435                    $val = $metrics[$host][$metricname];
    435436                    $class = "metric";
    436                     $host_link="\"?j_view=host&c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop\"";
     437                    $host_link="\"?j_view=host&self=$self&c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop\"";
    437438
    438439                    if ($val['TYPE']=="timestamp" or $always_timestamp[$metricname]) {
  • branches/0.4/web/addons/job_monarch/templates/search.tpl

    r780 r805  
    6565</TR>
    6666
     67<INPUT TYPE="HIDDEN" NAME="self" VALUE="{$self}">
    6768</TABLE>
    6869
     
    294295<div id="monarchimage">
    295296{loop $sorted_list}
    296 {$metric_image}{$br}
     297{$metric_image}
    297298{/loop}
    298299</div>
Note: See TracChangeset for help on using the changeset viewer.