';
diff --git a/codepot/src/codepot/views/graph_main.php b/codepot/src/codepot/views/graph_main.php
index f6170917..c21243ef 100644
--- a/codepot/src/codepot/views/graph_main.php
+++ b/codepot/src/codepot/views/graph_main.php
@@ -413,7 +413,7 @@ function show_all_graphs (response)
function render_graphs()
{
var ajax_req = $.ajax ({
- url: '/graph/history_json/id?>/',
+ url: '/graph/enjson_code_history/id?>/',
context: document.body,
success: show_all_graphs
});
diff --git a/codepot/src/js/CodeFlower.js b/codepot/src/js/CodeFlower.js
new file mode 100644
index 00000000..73d3f5d6
--- /dev/null
+++ b/codepot/src/js/CodeFlower.js
@@ -0,0 +1,150 @@
+var CodeFlower = function(selector, w, h) {
+ this.w = w;
+ this.h = h;
+
+ d3.select(selector).selectAll("svg").remove();
+
+ this.svg = d3.select(selector).append("svg:svg")
+ .attr('width', w)
+ .attr('height', h);
+
+ this.svg.append("svg:rect")
+// .style("stroke", "#999999")
+ .style("fill", "#FFFFFF")
+ .attr('width', w)
+ .attr('height', h);
+
+ this.force = d3.layout.force()
+ .on("tick", this.tick.bind(this))
+ .charge(function(d) { return d._children ? -d.size / 100 : -40; })
+ .linkDistance(function(d) { return d.target._children ? 80 : 25; })
+ .size([h, w]);
+};
+
+CodeFlower.prototype.update = function(json) {
+ if (json) this.json = json;
+
+ this.json.fixed = true;
+ this.json.x = this.w / 2;
+ this.json.y = this.h / 2;
+
+ var nodes = this.flatten(this.json);
+ var links = d3.layout.tree().links(nodes);
+ var total = nodes.length || 1;
+
+ // remove existing text (will readd it afterwards to be sure it's on top)
+ this.svg.selectAll("text").remove();
+
+ // Restart the force layout
+ this.force
+ .gravity(Math.atan(total / 50) / Math.PI * 0.4)
+ .nodes(nodes)
+ .links(links)
+ .start();
+
+ // Update the links
+ this.link = this.svg.selectAll("line.link")
+ .data(links, function(d) { return d.target.name; });
+
+ // Enter any new links
+ this.link.enter().insert("svg:line", ".node")
+ .attr("class", "link")
+ .attr("x1", function(d) { return d.source.x; })
+ .attr("y1", function(d) { return d.source.y; })
+ .attr("x2", function(d) { return d.target.x; })
+ .attr("y2", function(d) { return d.target.y; });
+
+ // Exit any old links.
+ this.link.exit().remove();
+
+ // Update the nodes
+ this.node = this.svg.selectAll("circle.node")
+ .data(nodes, function(d) { return d.name; })
+ .classed("collapsed", function(d) { return d._children ? 1 : 0; });
+
+ this.node.transition()
+ .attr("r", function(d) { return d.children ? 3.5 : Math.pow(d.size, 2/5) || 1; });
+
+ // Enter any new nodes
+ this.node.enter().append('svg:circle')
+ .attr("class", "node")
+ .classed('directory', function(d) { return (d._children || d.children) ? 1 : 0; })
+ .attr("r", function(d) { return d.children ? 3.5 : Math.pow(d.size, 2/5) || 1; })
+ .style("fill", function color(d) {
+ return "hsl(" + parseInt(360 / total * d.id, 10) + ",90%,70%)";
+ })
+ .call(this.force.drag)
+ .on("click", this.click.bind(this))
+ .on("mouseover", this.mouseover.bind(this))
+ .on("mouseout", this.mouseout.bind(this));
+
+ // Exit any old nodes
+ this.node.exit().remove();
+
+ this.text = this.svg.append('svg:text')
+ .attr('class', 'nodetext')
+ .attr('dy', 0)
+ .attr('dx', 0)
+ .attr('text-anchor', 'middle');
+
+ return this;
+};
+
+CodeFlower.prototype.flatten = function(root) {
+ var nodes = [], i = 0;
+
+ function recurse(node) {
+ if (node.children) {
+ node.size = node.children.reduce(function(p, v) {
+ return p + recurse(v);
+ }, 0);
+ }
+ if (!node.id) node.id = ++i;
+ nodes.push(node);
+ return node.size;
+ }
+
+ root.size = recurse(root);
+ return nodes;
+};
+
+CodeFlower.prototype.click = function(d) {
+ // Toggle children on click.
+ if (d.children) {
+ d._children = d.children;
+ d.children = null;
+ } else {
+ d.children = d._children;
+ d._children = null;
+ }
+ this.update();
+};
+
+CodeFlower.prototype.mouseover = function(d) {
+ this.text.attr('transform', 'translate(' + d.x + ',' + (d.y - 5 - (d.children ? 3.5 : Math.sqrt(d.size) / 2)) + ')')
+ .text(d.name + ": " + d.size)
+ .style('display', null)
+ .style('font-size', '0.9em');
+};
+
+CodeFlower.prototype.mouseout = function(d) {
+ this.text.style('display', 'none');
+};
+
+CodeFlower.prototype.tick = function() {
+ var h = this.h;
+ var w = this.w;
+ this.link.attr("x1", function(d) { return d.source.x; })
+ .attr("y1", function(d) { return d.source.y; })
+ .attr("x2", function(d) { return d.target.x; })
+ .attr("y2", function(d) { return d.target.y; });
+
+ this.node.attr("transform", function(d) {
+ return "translate(" + Math.max(5, Math.min(w - 5, d.x)) + "," + Math.max(5, Math.min(h - 5, d.y)) + ")";
+ });
+};
+
+CodeFlower.prototype.cleanup = function() {
+ this.update([]);
+ this.force.stop();
+};
diff --git a/codepot/src/js/Makefile.am b/codepot/src/js/Makefile.am
index 05db3fec..3d8a975e 100644
--- a/codepot/src/js/Makefile.am
+++ b/codepot/src/js/Makefile.am
@@ -22,7 +22,9 @@ www_DATA = \
jquery.flot.threshold.min.js \
jquery.flot.time.min.js \
excanvas.min.js \
- jquery.flot.tickrotor.js
+ jquery.flot.tickrotor.js \
+ d3.min.js \
+ CodeFlower.js
EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/js/Makefile.in b/codepot/src/js/Makefile.in
index 548953e8..13927046 100644
--- a/codepot/src/js/Makefile.in
+++ b/codepot/src/js/Makefile.in
@@ -260,7 +260,9 @@ www_DATA = \
jquery.flot.threshold.min.js \
jquery.flot.time.min.js \
excanvas.min.js \
- jquery.flot.tickrotor.js
+ jquery.flot.tickrotor.js \
+ d3.min.js \
+ CodeFlower.js
EXTRA_DIST = $(www_DATA)
all: all-recursive
diff --git a/codepot/src/js/d3.min.js b/codepot/src/js/d3.min.js
new file mode 100644
index 00000000..34d5513e
--- /dev/null
+++ b/codepot/src/js/d3.min.js
@@ -0,0 +1,5 @@
+!function(){function n(n){return n&&(n.ownerDocument||n.document||n).documentElement}function t(n){return n&&(n.ownerDocument&&n.ownerDocument.defaultView||n.document&&n||n.defaultView)}function e(n,t){return t>n?-1:n>t?1:n>=t?0:0/0}function r(n){return null===n?0/0:+n}function u(n){return!isNaN(n)}function i(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)<0?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)>0?u=i:r=i+1}return r}}}function o(n){return n.length}function a(n){for(var t=1;n*t%1;)t*=10;return t}function c(n,t){for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}function l(){this._=Object.create(null)}function s(n){return(n+="")===pa||n[0]===va?va+n:n}function f(n){return(n+="")[0]===va?n.slice(1):n}function h(n){return s(n)in this._}function g(n){return(n=s(n))in this._&&delete this._[n]}function p(){var n=[];for(var t in this._)n.push(f(t));return n}function v(){var n=0;for(var t in this._)++n;return n}function d(){for(var n in this._)return!1;return!0}function m(){this._=Object.create(null)}function y(n){return n}function M(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function x(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(var e=0,r=da.length;r>e;++e){var u=da[e]+t;if(u in n)return u}}function b(){}function _(){}function w(n){function t(){for(var t,r=e,u=-1,i=r.length;++u