Changeset 129 for trunk/web/addons/toga/index.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/index.php (modified) (9 diffs)

trunk/web/addons/toga/index.php

@@ -37 +37 @@
         global $self, $filter, $cluster_url, $get_metric_string;
         global $metrics, $reports, $m, $default_metric;
+        global $default_refresh;
 
         if( isset($default_metric) and !isset($m) )
@@ -46 +47 @@
                         $metricname = "load_one";
 
-        //$metricname = ($m) ? $m : $default_metric;
-        //printf( "m = %s, metricname = %s, default_metric = %s\n", $m, $metricname, $default_metric );
-        if ( $context == "control" && $controlroom < 0 )
-                $header = "header-nobanner";
-        else
-                $header = "header";
+        $header = "header";
 
         # Maintain our path through the grid tree.
         $me = $self . "@" . $grid[$self][AUTHORITY];
 
-        if ($initgrid) {
-                $gridstack = array();
-                $gridstack[] = $me;
-        } else if ($gridwalk=="fwd") {
+        $gridstack = array();
+        $gridstack[] = $me;
+
+        if ($gridwalk=="fwd") {
                 # push our info on gridstack, format is "name@url>name2@url".
                 if (end($gridstack) != $me) {
@@ -99 +95 @@
 
         # The page to go to when "Get Fresh Data" is pressed.
-        if (isset($page))
-                $tpl->assign("page",$page);
-        else
-                $tpl->assign("page","./");
+        $tpl->assign("page","./");
 
         # Templated Logo image
@@ -169 +162 @@
 
         if( array_key_exists( "id", $filter ) ) {
-                //$context_ranges[]="hour";
-                //$context_ranges[]="day";
-                //$context_ranges[]="week";
-                //$context_ranges[]="month";
-                //$context_ranges[]="year";
-                //if ($jobrange)
-                //      $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->assign("range_menu", $range_menu);
-
-                //$metricname = $m;
 
                 if (is_array($context_metrics) ) {
@@ -237 +208 @@
 }
 
-function includeJobview() {
+function includeSearchpage() {
         global $tpl;
 
-        $tpl->assignInclude( "main", "templates/jobview.tpl" );
+        $tpl->assignInclude( "main", "templates/search.tpl" );
+
+}
+
+function includeSearchThumb() {
+        global $tpl;
+
+        $tpl->assignInclude( "archive", "templates/inc_search.tpl" );
+
 }
 
@@ -249 +228 @@
 }
 
-function makeJobview() {
-
-}
-
 $tpl = new TemplatePower( "templates/index.tpl" );
 
@@ -262 +237 @@
 
                 includeOverview();
-                break;
-
-        //case "jobview":
-
-        //      includeJobview();
-        //      break;
+                if( $TARCHD )
+                        includeSearchThumb();
+                break;
+
+        case "search":
+
+                includeSearchPage();
+                break;
 
         default:
@@ -280 +257 @@
 $title = "Torque Report";
 makeHeader();
+$tpl->assign("cluster_url", rawurlencode($clustername) );
+$tpl->assign("cluster", $clustername );
 
 switch( $view ) {
@@ -289 +268 @@
                 break;
 
-        //case "jobview":
-
-        //      makeJobview();
-        //      break;
+        case "search":
+
+                include "./search.php";
+                makeSearchPage();
+                break;
 
         default: