Changeset 758 for branches/0.4/web/addons

Timestamp:

03/27/13 18:47:17 (10 years ago)

Author:

ramonb

Message:

graph.php,
overview.php:

• display range in title
• removed RRDs column count: now done via css

templates/overview.tpl:

• removed RRDs column count: now done via css

index.php:

• dont show range selector if no show hosts

Location:

branches/0.4/web/addons/job_monarch

Files:

• graph.php (modified) (2 diffs)
• index.php (modified) (3 diffs)
• overview.php (modified) (2 diffs)
• templates/overview.tpl (modified) (1 diff)

branches/0.4/web/addons/job_monarch/graph.php

@@ -58 +58 @@
 $load_color = escapeshellcmd( rawurldecode( $_GET["l"] ));
 $vlabel = escapeshellcmd( rawurldecode( $_GET["vl"] ));
+$j_title = escapeshellcmd( rawurldecode( $_GET["t"] ));
 
 $cluster = $c;
@@ -440 +441 @@
 }
 
-$title = "$hostname";
+if ($graph == "job_report")
+{
+    $title = "Last: $j_title";
+}
+else
+{
+    $title = "$hostname";
+}
 
 function determineXGrid( $p_start, $p_stop ) 

branches/0.4/web/addons/job_monarch/index.php

@@ -120 +120 @@
     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 +182 @@
 
     $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 +369 @@
     }
 
-    if( $view != "search" )
-    {
-        $context_ranges[]="hour";
-        $context_ranges[]="day";
-        $context_ranges[]="week";
-        $context_ranges[]="month";
-        $context_ranges[]="year";
-        $context_ranges[]="job";
-
-        $range_menu = "<B>Last</B>&nbsp;&nbsp;" ."<SELECT NAME=\"r\" OnChange=\"toga_form.submit();\">\n";
-        foreach ($context_ranges as $v) 
-        {
-            $url=rawurlencode($v);
-            $range_menu .= "<OPTION VALUE=\"$url\" ";
-            if ($v == $range)
-                $range_menu .= "SELECTED";
-            $range_menu .= ">$v\n";
+    if( array_key_exists( "id", $filter ) or isset($hostname) ) 
+    {
+
+        #$range = "job";
+
+        if( ( $page_call != "host_view" ) && ( $view != "search" ) )
+        {
+            $context_ranges[]="hour";
+            $context_ranges[]="day";
+            $context_ranges[]="week";
+            $context_ranges[]="month";
+            $context_ranges[]="year";
+            $context_ranges[]="job";
+
+            $range_menu = "<B>Last</B>&nbsp;&nbsp;" ."<SELECT NAME=\"r\" OnChange=\"toga_form.submit();\">\n";
+            foreach ($context_ranges as $v) 
+            {
+                $url=rawurlencode($v);
+                $range_menu .= "<OPTION VALUE=\"$url\" ";
+                if ($v == $range)
+                {
+                    $range_menu .= "SELECTED";
+                }
+                $range_menu .= ">$v\n";
+            }
+            $range_menu .= "</SELECT>\n";
+
+            $tpl_data->assign("range_menu", $range_menu);
         }
-        $range_menu .= "</SELECT>\n";
-
-        $tpl_data->assign("range_menu", $range_menu);
 
     }

branches/0.4/web/addons/job_monarch/overview.php

@@ -894 +894 @@
         {
             $rjqj_end = time();
-            $rjqj_graphargs .= "&period_start=$rjqj_start&period_stop=$rjqj_end";
+            $rjqj_title = rawurlencode( makeTime( ($rjqj_end - $rjqj_start) ) );
+            $rjqj_graphargs .= "&period_start=$rjqj_start&period_stop=$rjqj_end&t=$rjqj_title";
         }
         else
@@ -983 +984 @@
     {
         $tpl_data->assign( "showhosts", "yes" );
-
-        # Present a width list
-        $cols_menu     = "<SELECT NAME=\"hc\" OnChange=\"toga_form.submit();\">\n";
-
-        $hostcols     = ($hc) ? $hc : 4;
-
-        foreach( range( 1, 25 ) as $cols ) 
-        {
-            $cols_menu    .= "<OPTION VALUE=$cols ";
-
-            if ($cols == $hostcols)
-            {
-                $cols_menu    .= "SELECTED";
-            }
-            $cols_menu    .= ">$cols\n";
-        }
-        $cols_menu     .= "</SELECT>\n";
-
-        $tpl_data->assign( "metric","$metricname $units" );
-        $tpl_data->assign( "id", $filter['id'] );
-
-        # Host columns menu defined in header.php
-        $tpl_data->assign( "cols_menu", $cols_menu );
 
         $showhosts     = isset($sh) ? $sh : $default_showhosts;

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

@@ -234 +234 @@
   no<INPUT type=radio name="sh" value="0" OnClick="toga_form.submit();" {$checked0}>
   </FONT>
-  |
-  job <strong>{$id}</strong> metric <strong>{$metric}</strong>
-  |
-   <FONT SIZE="-1">
-   Columns&nbsp;&nbsp;{$cols_menu}
-   </FONT>
   </TD>
 </TR>