Changeset 735


Ignore:
Timestamp:
03/24/13 18:19:41 (9 years ago)
Author:
ramonb
Message:

templates/overview.tpl:

  • removed notice about tasks/array jobs

host_view.php:

  • cleanup graphargs

index.php:

  • setup range to job by default

overview.php:

  • pass correct settings to host_view: range, job_start, overview
Location:
branches/0.4/web/addons/job_monarch
Files:
4 edited

Legend:

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

    r734 r735  
    120120    $cluster_url=rawurlencode($clustername);
    121121    $tpl->assign("cluster_url", $cluster_url);
    122     $tpl->assign("graphargs", "h=$hostname&$get_metric_string&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
     122    $tpl->assign("graphargs", "h=$hostname&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
    123123
    124124    # For the node view link.
  • branches/0.4/web/addons/job_monarch/index.php

    r734 r735  
    5252if( !isset($sortorder) ) $sortorder = "desc";
    5353if( !isset($sortby) ) $sortby = "id";
     54if( !isset($range) or $range == '') $range= "job";
    5455
    5556if( isset( $filterorder ) && ($filterorder!='') )
  • branches/0.4/web/addons/job_monarch/overview.php

    r733 r735  
    11011101                    $graphargs     = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
    11021102                    $graphargs     .= "z=overview-medium&c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&job_start=$job_start&period_start=$period_start&period_stop=$period_end";
    1103                     $host_link   = "\"?j_view=host&c=$cluster_url&h=$host_url&job&jr=$jobrange&js=$jobstart&period_start=$period_start&period_stop=$period_end\"";
     1103                    $host_link   = "\"?j_view=overview-host&c=$cluster_url&r=$range&h=$host_url&job_start=$jobstart&period_start=$period_start&period_stop=$period_end\"";
    11041104                    if( $max > 0 )
    11051105                    {
  • branches/0.4/web/addons/job_monarch/templates/overview.tpl

    r730 r735  
    1 <P>
    2 All tasks of parallel and array jobs appear as a single &lsquo;job&rsquo;.
    3 <BR></P>
    4 
    51<CENTER>
    62<TABLE cellpadding="15">
Note: See TracChangeset for help on using the changeset viewer.