Changeset 129 for trunk/web/addons/toga/overview.php

Timestamp:

06/07/05 15:31:15 (19 years ago)

Author:

bastiaans

Message:

web/templates/toga/cluster_extra.tpl:

• Renamed link to joblist

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

• Inclusion to archivelink template

web/addons/toga/index.php:

• Misc cleanup
• Setup skeleton for search

web/addons/toga/overview.php:

• Fixed showhosts bugs

web/addons/toga/conf.php:

• Cleanup
• Added TARCHD option for if a archive is present

web/addons/toga/libtoga.php:

• Don't use Ganglia's get_context, it messes stuff up

File:

• trunk/web/addons/toga/overview.php (modified) (4 diffs)

trunk/web/addons/toga/overview.php

@@ -7 +7 @@
 //$tpl->assign( "self", "./index.php" );
 $tpl->assign( "clustername", $clustername );
+
+if( $TARCHD )
+        $tpl->assign( "cluster_url", rawurlencode($clustername) );
 
 $data_gatherer->parseXML();
@@ -426 +429 @@
         global $sortorder, $sortby, $filter, $sh, $hc, $m;
         global $cluster_url, $get_metric_string, $host_url, $metrics;
-        global $start, $end, $reports, $gnodes;
+        global $start, $end, $reports, $gnodes, $default_showhosts;
 
         $metricname = $m;
@@ -523 +526 @@
         $tpl->assignGlobal("f_jobs_nr", $f_jobs );
 
-        if( array_key_exists( "id", $filter ) ) {
+        if( array_key_exists( "id", $filter ) and $start_time ) {
                 $tpl->newBlock( "showhosts" );
 
@@ -545 +548 @@
                 $tpl->assign("cols_menu", $cols_menu);
 
-                if( $sh) $showhosts = $sh;
-                if( !$showhosts) $showhosts = 0;
+                $showhosts = isset($sh) ? $sh : $default_showhosts;
+                //if( !$showhosts) $showhosts = $default_showhosts;
                 $tpl->assign("checked$showhosts", "checked");