try to fix bubletree
--- a/displayBubbletree.php
+++ b/displayBubbletree.php
@@ -1,4 +1,6 @@
-
+<?php
+include_once ("lib/common.inc.php");
+?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -17,9 +19,7 @@
<script type="text/javascript">
$(function() {
- <?php
-include_once ("lib/common.inc.php");
-
+<?php
include("lib/Color.php");
$color = new Lux_Color();
@@ -60,29 +60,29 @@
$nodes = Array();
foreach ($cats as $catNum) {
$catColor = $color->hsv2hex(Array($catNum/10, .7, abs(($catNum*(1/10))-.5) + .5));
- $catName = substr($unspsc[$catNum . "000000"],0,18) . $catNum;
+ $catName = substr($unspsc[$catNum . "000000"],0,18);
$subnodes = Array();
$catValue = 0;
foreach ($cattwos[$catNum] as $twoCatNum) {
- $subcatName = $unspsc[$twoCatNum. "0000"] .$twoCatNum;
+ $subcatName = $unspsc[$twoCatNum. "0000"];
$subsubnodes = Array();
- $subCatValue = 1;
+ $subCatValue = 1;
$subCatColor = $color->hsv2hex(Array($catNum/10, rand(1,10)/10, abs(($catNum*(1/10))-.5) + .5));
foreach ($catthrees[$twoCatNum] as $threerow) {
- $subsubcatName = $unspsc[$threerow['cat'] . "00"] . $threerow['cat'];
+ /*$subsubcatName = $unspsc[$threerow['cat'] . "00"];
$subsubnodes[] = Array(
"label" => $subsubcatName,
"amount" => $threerow['value'],
"color" => "#".$subCatColor
- );
+ );*/
$subCatValue += $threerow['value'];
}
- $subnodes[] = Array(
+ /*$subnodes[] = Array(
"label" => $subcatName,
"amount" => $subCatValue,
"color" => "#".$subCatColor,
"children" => $subsubnodes
- );
+ );*/
$catValue += $subCatValue;
}
$nodes[] = Array(
@@ -99,7 +99,7 @@
"color" => "#000000",
"children" => $nodes
);
-echo "var data =eval('('+'" . json_encode($data) . "'+')');";
+echo "var data = JSON.parse('" . str_replace(",",",",json_encode($data)) . "');";
?>
new BubbleTree({
--- a/index.php
+++ b/index.php
@@ -1,11 +1,14 @@
<?php
include_once ("./lib/common.inc.php");
include_header("Home");
-echo ' <div class="hero-unit">
+?>
+ <div class="hero-unit">
<h1>Contract Dashboard</h1>
<iframe width='700' height='400' src='http://openspending.org/australian_federal_government_contract_spending/embed?widget=treemap&state=%7B%22drilldown%22%3A%22from%22%2C%22year%22%3A%222011%22%2C%22cuts%22%3A%7B%7D%2C%22drilldowns%22%3A%5B%22from%22%5D%7D&width=700&height=400' frameborder='0'></iframe>
+<br>
<a href="http://openspending.org/australian_federal_government_contract_spending">Explore further on OpenSpending.org!</a>
- </div>';
+ </div>
+<?php
include_footer();
?>
--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -14,11 +14,13 @@
if (strstr($_SERVER['PHP_SELF'], "labs/") || strstr($_SERVER['PHP_SELF'], "admin/") || strstr($_SERVER['PHP_SELF'], "heuristics/")) {
$basePath = "../";
}
+if ($_SERVER['HTTP_HOST'] != "localhost") {
require $basePath."lib/amon-php/amon.php";
Amon::config(array('address'=> 'http://127.0.0.1:2464',
'protocol' => 'http',
'secret_key' => "JBcSUdFOi5lK0vCjLjbHDpQamcBnRA4iV7QLaTADeDQ"));
Amon::setup_exception_handler();
+}
require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
$openid = new LightOpenID($_SERVER['HTTP_HOST']);
@@ -55,7 +57,7 @@
function databaseError($errMsg) {
if ($errMsg[2] != "") {
echo '<div class="alert-message error">';
- Amon::log(print_r($errMsg, true).print_r($_REQUEST, true).print_r($_SERVER, true), array('error'));
+ if ($_SERVER['HTTP_HOST'] != "localhost") Amon::log(print_r($errMsg, true).print_r($_REQUEST, true).print_r($_SERVER, true), array('error'));
die(print_r($errMsg, true));
echo "</div>";
}