From 543de63180213c6a9fdedbe8df57f1d66f6b3211 Mon Sep 17 00:00:00 2001 From: david raistrick Date: Thu, 31 Jan 2013 16:07:01 -0500 Subject: [PATCH] merged PR #12 and #11 for easier merge into master - make all hrefs relative instead of absolute paths so this doesn't have to live in / - fix php tags to all be -
-{$cluster["name"]} pgBouncer pool status (" . Dashboard::displayTime($time) . ")"; diff --git a/htdocs/index.php b/htdocs/index.php index 93498fd..b348d4f 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -24,38 +24,38 @@ - $dashboard_groups) : ?> + $dashboard_groups) : ?>

- - $dashboards) : ?> + + $dashboards) : ?> - + - - - - + + + + - +
- + diff --git a/htdocs/phplib/Dashboard.php b/htdocs/phplib/Dashboard.php index b3e05e2..dec198e 100644 --- a/htdocs/phplib/Dashboard.php +++ b/htdocs/phplib/Dashboard.php @@ -57,31 +57,31 @@ class Dashboard { */ public static $DB_TABS = array( - 'PGBouncer' => '/example_pgbouncer.php', - 'PostgreSQL Queries' => '/example_postgresql_queries.php', + 'PGBouncer' => 'example_pgbouncer.php', + 'PostgreSQL Queries' => 'example_postgresql_queries.php', ); public static $DEPLOY_TABS = array( - 'FITB' => '/example_fitb.php', - 'New Relic' => '/example_newrelic.php', + 'FITB' => 'example_fitb.php', + 'New Relic' => 'example_newrelic.php', ); public static $HADOOP_TABS = array( - 'Overview' => '/example_hadoop/overview.php', - 'DFS' => '/example_hadoop/dfs.php', - 'Jobs' => '/example_hadoop/jobs.php', - 'Java Process Metrics' => '/example_hadoop/java_process.php', - 'HBase' => '/example_hadoop/hbase.php', + 'Overview' => 'example_hadoop/overview.php', + 'DFS' => 'example_hadoop/dfs.php', + 'Jobs' => 'example_hadoop/jobs.php', + 'Java Process Metrics' => 'example_hadoop/java_process.php', + 'HBase' => 'example_hadoop/hbase.php', ); public static $NETWORK_TABS = array( - 'FITB' => '/example_fitb.php', - 'Netstat' => '/example_netstat.php', - 'Mem info' => '/example_meminfo.php', + 'FITB' => 'example_fitb.php', + 'Netstat' => 'example_netstat.php', + 'Mem info' => 'example_meminfo.php', ); public static $TIME_TABS = array( - 'Time' => '/example_time.php', + 'Time' => 'example_time.php', ); /** diff --git a/htdocs/phplib/Tabs.php b/htdocs/phplib/Tabs.php index 2f13279..ee44d76 100644 --- a/htdocs/phplib/Tabs.php +++ b/htdocs/phplib/Tabs.php @@ -45,7 +45,7 @@ public static function getLinkTarget($url) { * @return string */ public static function getLinkIcon($url) { - return self::isAbsoluteLink($url) ? '' : ''; + return self::isAbsoluteLink($url) ? '' : ''; } /** @@ -60,4 +60,4 @@ public static function buildDefaultTabTitle($url) { $title = ucwords($title); return $title; } -} \ No newline at end of file +} diff --git a/htdocs/phplib/flot_funnel_tpl.php b/htdocs/phplib/flot_funnel_tpl.php index 90396f6..c81930e 100644 --- a/htdocs/phplib/flot_funnel_tpl.php +++ b/htdocs/phplib/flot_funnel_tpl.php @@ -1,4 +1,4 @@ -">
- $funnel) { + $funnel) { $steps = array(); $i++; $j = 0; @@ -43,15 +43,15 @@ var e = $(" .graph"); o.legend.container = " .legend"; - + o = $.extend(true, {}, o, ); - + e.bind("plothover", showFunnelTip); $.plot(e, , o); - +
- + diff --git a/htdocs/phplib/flot_tpl.php b/htdocs/phplib/flot_tpl.php index c17f3f5..445dea5 100644 --- a/htdocs/phplib/flot_tpl.php +++ b/htdocs/phplib/flot_tpl.php @@ -13,15 +13,15 @@ function slugify($str) { - Dashboard <?echo (!empty($page_title) ? ": $page_title" :"");?> - - - - - - - - + Dashboard <?php echo (!empty($page_title) ? ": $page_title" :"");?> + + + + + + + + - + @@ -49,7 +49,7 @@ function slugify($str) { - ">
- $graph) { + $graph) { if (empty($graph)) { print '
'; continue; @@ -89,9 +89,9 @@ function slugify($str) { $data = $g->getData(true); $slug = slugify($title) . '_' . slugify($graph['title']); ?> -
+ @@ -107,9 +107,9 @@ function slugify($str) { var e = $(" .graph"); o.legend.container = " .legend"; o = $.extend(true, {}, o, ); - + o.trendline.show = true; - + e.bind("plothover", showTip); var data = ; if (typeof(dataCallback) === 'function'){ @@ -117,15 +117,15 @@ function slugify($str) { } $.plot(e, data, o); - +
- + - diff --git a/htdocs/phplib/template.php b/htdocs/phplib/template.php index 0506595..f050ca9 100644 --- a/htdocs/phplib/template.php +++ b/htdocs/phplib/template.php @@ -5,30 +5,37 @@ <?= $title ?> - + - - - + + + - - + + - - + + - +<<<<<<< HEAD + + + + +======= + - + +>>>>>>> p/makeerehomeable - - + + - - - + + - +
diff --git a/htdocs/phplib/template_content.php b/htdocs/phplib/template_content.php index 1fd6cd2..5117de3 100644 --- a/htdocs/phplib/template_content.php +++ b/htdocs/phplib/template_content.php @@ -24,8 +24,8 @@
- - + + diff --git a/htdocs/phplib/template_controls.php b/htdocs/phplib/template_controls.php index 2a899c7..248ad2c 100644 --- a/htdocs/phplib/template_controls.php +++ b/htdocs/phplib/template_controls.php @@ -10,7 +10,7 @@
-
- +
- - - - - + + + + +
diff --git a/htdocs/phplib/template_init.inc.php b/htdocs/phplib/template_init.inc.php index fc6b36c..6b23109 100644 --- a/htdocs/phplib/template_init.inc.php +++ b/htdocs/phplib/template_init.inc.php @@ -19,10 +19,10 @@ $page_js_imports = array_merge( isset($page_js_imports) ? $page_js_imports : array(), array( - "/assets/js/flot/jquery.flot.js", - "/assets/js/flot/jquery.flot.pie.js", - "/assets/js/flot.js", - "/assets/js/graphite_percentage.js", + "assets/js/flot/jquery.flot.js", + "assets/js/flot/jquery.flot.pie.js", + "assets/js/flot.js", + "assets/js/graphite_percentage.js", )); } @@ -30,9 +30,9 @@ $page_js_imports = array_merge( isset($page_js_imports) ? $page_js_imports : array(), array( - "/assets/js/d3-2.9.1.min.js", - "/assets/js/graphite_percentage.js", - "/assets/js/graphite_bar_percentage.js", + "assets/js/d3-2.9.1.min.js", + "assets/js/graphite_percentage.js", + "assets/js/graphite_bar_percentage.js", )); } @@ -52,13 +52,13 @@ $page_js_imports = array_merge( isset($page_js_imports) ? $page_js_imports : array(), array( - "/assets/js/zeroclipboard-0.7/ZeroClipboard.js", - "/assets/js/copyurl.js", + "assets/js/zeroclipboard-0.7/ZeroClipboard.js", + "assets/js/copyurl.js", )); $page_css_imports = array_merge( isset($page_css_imports) ? $page_css_imports : array(), array( - "/assets/css/copyurl.css", + "assets/css/copyurl.css", )); } } diff --git a/htdocs/phplib/template_tabs.php b/htdocs/phplib/template_tabs.php index 0e337b5..8ff609e 100644 --- a/htdocs/phplib/template_tabs.php +++ b/htdocs/phplib/template_tabs.php @@ -1,9 +1,9 @@ - -
+ +
- +