Index: /branches/0.4/web/addons/job_monarch/graph.php
===================================================================
--- /branches/0.4/web/addons/job_monarch/graph.php (revision 757)
+++ /branches/0.4/web/addons/job_monarch/graph.php (revision 758)
@@ -58,4 +58,5 @@
$load_color = escapeshellcmd( rawurldecode( $_GET["l"] ));
$vlabel = escapeshellcmd( rawurldecode( $_GET["vl"] ));
+$j_title = escapeshellcmd( rawurldecode( $_GET["t"] ));
$cluster = $c;
@@ -440,5 +441,12 @@
}
-$title = "$hostname";
+if ($graph == "job_report")
+{
+ $title = "Last: $j_title";
+}
+else
+{
+ $title = "$hostname";
+}
function determineXGrid( $p_start, $p_stop )
Index: /branches/0.4/web/addons/job_monarch/index.php
===================================================================
--- /branches/0.4/web/addons/job_monarch/index.php (revision 757)
+++ /branches/0.4/web/addons/job_monarch/index.php (revision 758)
@@ -120,5 +120,5 @@
global $JOB_ARCHIVE, $period_start, $period_stop, $h, $id;
global $job_start, $job_stop, $range, $r, $metricname;
- global $conf;
+ global $conf, $show_hosts;
try
{
@@ -182,11 +182,5 @@
$tpl = new Dwoo_Template_File("templates/header.tpl");
- echo $tpl;
$tpl_data = new Dwoo_Data();
-
- if( $view != "search" )
- {
- $tpl_data->assign( "refresh", $default_refresh );
- }
$tpl_data->assign( "date", date("r") );
@@ -375,25 +369,33 @@
}
- if( $view != "search" )
- {
- $context_ranges[]="hour";
- $context_ranges[]="day";
- $context_ranges[]="week";
- $context_ranges[]="month";
- $context_ranges[]="year";
- $context_ranges[]="job";
-
- $range_menu = "Last " ."