Menu
▾
▴
[Ganglia-svn] SF.net SVN: ganglia:[1662] branches/monitor-core-3.1
|
From: <ca...@us...> - 2008-08-13 05:18:23
|
Revision: 1662
http://ganglia.svn.sourceforge.net/ganglia/?rev=1662&view=rev
Author: carenas
Date: 2008-08-13 05:18:31 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
web: remove redirect hack for grid pulldown navigation
svn merge -c 1253 trunk
Reviewed-by: Bernard Li <be...@va...>
Modified Paths:
--------------
branches/monitor-core-3.1/STATUS
branches/monitor-core-3.1/web/header.php
branches/monitor-core-3.1/web/templates/default/header.tpl
Modified: branches/monitor-core-3.1/STATUS
===================================================================
--- branches/monitor-core-3.1/STATUS 2008-08-13 01:01:39 UTC (rev 1661)
+++ branches/monitor-core-3.1/STATUS 2008-08-13 05:18:31 UTC (rev 1662)
@@ -19,6 +19,7 @@
CURRENT RELEASE NOTES:
+ * Fix segfault when aggregating 3.1 gmetad
* Module directory configurable at build and run time
* Autodetect libdir/moduledir for bi-arch Linux architectures
* Include contrib directory with user provided goodies
@@ -42,11 +43,6 @@
-1: <userid>
<Optional comments prefixed with user id of comment author>
- * web: remove redirect hack for grid pulldown navigation
- http://www.mail-archive.com/gan...@li.../msg04052.html
- http://ganglia.svn.sourceforge.net/viewvc/ganglia?view=rev&revision=1253
- +1: carenas, bernardli
-
* libmetrics: linux cleanup leftovers from r740
http://ganglia.svn.sourceforge.net/viewvc/ganglia?view=rev&revision=1254
+1: carenas, bnicholes
Modified: branches/monitor-core-3.1/web/header.php
===================================================================
--- branches/monitor-core-3.1/web/header.php 2008-08-13 01:01:39 UTC (rev 1661)
+++ branches/monitor-core-3.1/web/header.php 2008-08-13 05:18:31 UTC (rev 1662)
@@ -17,16 +17,6 @@
else
$header = "header";
-$tpl = new TemplatePower( template("$header.tpl") );
-$tpl->prepare();
-$tpl->assign( "page_title", $title );
-$tpl->assign("refresh", $default_refresh);
-
-# Skip the "ganglia_header" block (Logo + "Grid Report for ...") when redirecting
-if ( !strstr($clustername, "http://") && $header == "header" ) {
- $tpl->newBlock("ganglia_header");
-}
-
#
# sacerdoti: beginning of Grid tree state handling
#
@@ -56,6 +46,10 @@
$gridstack_str = join(">", $gridstack);
$gridstack_url = rawurlencode($gridstack_str);
+if (strstr($clustername, "http://")) {
+ header("Location: $clustername?gw=fwd&gs=$gridstack_url");
+}
+
if ($initgrid or $gridwalk)
{
# Use cookie so we dont have to pass gridstack around within this site.
@@ -73,23 +67,16 @@
list($parentgrid, $parentlink) = explode("@", $gridstack[count($gridstack)-2]);
}
+$tpl = new TemplatePower( template("$header.tpl") );
+$tpl->prepare();
+$tpl->assign("page_title", $title);
+$tpl->assign("refresh", $default_refresh);
+
# Templated Logo image
$tpl->assign("images","./templates/$template_name/images");
$tpl->assign( "date", date("r"));
-$tpl->assign( "page_title", $title );
-# Setup a redirect to a remote server if you choose a grid from pulldown menu.
-# Tell destination server that we're walking foward in the grid tree.
-if (strstr($clustername, "http://"))
- {
- $tpl->assign("refresh", "0");
- $tpl->assign("redirect", ";URL=$clustername?gw=fwd&gs=$gridstack_url");
- echo "<h2>Redirecting, please wait...</h2>";
- $tpl->printToScreen();
- exit;
- }
-
# The page to go to when "Get Fresh Data" is pressed.
if (isset($page))
$tpl->assign("page",$page);
Modified: branches/monitor-core-3.1/web/templates/default/header.tpl
===================================================================
--- branches/monitor-core-3.1/web/templates/default/header.tpl 2008-08-13 01:01:39 UTC (rev 1661)
+++ branches/monitor-core-3.1/web/templates/default/header.tpl 2008-08-13 05:18:31 UTC (rev 1662)
@@ -3,12 +3,11 @@
<HEAD>
<TITLE>Ganglia:: {page_title}</TITLE>
<META http-equiv="Content-type" content="text/html; charset=utf-8">
-<META http-equiv="refresh" content="{refresh}{redirect}">
+<META http-equiv="refresh" content="{refresh}">
<LINK rel="stylesheet" href="./styles.css" type="text/css">
</HEAD>
<BODY BGCOLOR="#FFFFFF">
-<!-- START BLOCK : ganglia_header -->
<FORM ACTION="{page}" METHOD="GET" NAME="ganglia_form">
<TABLE WIDTH="100%">
<TR>
@@ -50,4 +49,3 @@
{node_menu}
</FONT>
<HR SIZE="1" NOSHADE>
-<!-- END BLOCK : ganglia_header -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|