Repository: incubator-edgent Updated Branches: refs/heads/master 89933b1b4 -> a30ed5aea
EDGENT_243 console legend wider Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/a30ed5ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/a30ed5ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/a30ed5ae Branch: refs/heads/master Commit: a30ed5aea9553d6f54ecaed27b943f1e5a6c4853 Parents: 89933b1 Author: Susan L. Cline <[email protected]> Authored: Mon Aug 29 13:49:44 2016 -0700 Committer: Susan L. Cline <[email protected]> Committed: Mon Aug 29 13:49:44 2016 -0700 ---------------------------------------------------------------------- console/servlets/webapp_content/html/index.html | 4 ++-- console/servlets/webapp_content/js/ext/d3.legend.js | 2 +- console/servlets/webapp_content/js/index.js | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a30ed5ae/console/servlets/webapp_content/html/index.html ---------------------------------------------------------------------- diff --git a/console/servlets/webapp_content/html/index.html b/console/servlets/webapp_content/html/index.html index 5eab263..a66cddf 100644 --- a/console/servlets/webapp_content/html/index.html +++ b/console/servlets/webapp_content/html/index.html @@ -58,12 +58,12 @@ <button id="toggleTimer" title='Pause graph' type="button">Pause graph</button> </div> -<div style='width: 300px; margin-left: 30px; clear:both;'> +<div style='width: 370px; margin-left: 30px; clear:both;'> <div id="showAll" tabindex=0 > <div>View all oplet properties</div> <div style='font-size: 0.95em'>(opens a new window)</div> </div> - <div id="graphLegend" style='height: 600px;'></div> + <div id="graphLegend" style='height: 600px; width: 340px;'></div> </div> <div id="chart" style="float:right; margin-right: 100px; margin-top: -600px;"><div id="loading">Loading graph ...</div></div> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a30ed5ae/console/servlets/webapp_content/js/ext/d3.legend.js ---------------------------------------------------------------------- diff --git a/console/servlets/webapp_content/js/ext/d3.legend.js b/console/servlets/webapp_content/js/ext/d3.legend.js index e7dc26a..114546c 100755 --- a/console/servlets/webapp_content/js/ext/d3.legend.js +++ b/console/servlets/webapp_content/js/ext/d3.legend.js @@ -165,7 +165,7 @@ d3.legend = function(g, chartSvg, pItems, legendTitle) { lb.attr("x",(lbbox.x-legendPadding)) .attr("y",(lbbox.y-legendPadding)) .attr("height",(lbbox.height+2*legendPadding)) - .attr("width",(lbbox.width+2*legendPadding)); + .attr("width",((lbbox.width+12) + 2*legendPadding)); lTitleItems.attr("x", 0) .attr("y", (lbbox.y - legendPadding - 15)) http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a30ed5ae/console/servlets/webapp_content/js/index.js ---------------------------------------------------------------------- diff --git a/console/servlets/webapp_content/js/index.js b/console/servlets/webapp_content/js/index.js index 33ebac7..acd5a09 100644 --- a/console/servlets/webapp_content/js/index.js +++ b/console/servlets/webapp_content/js/index.js @@ -164,8 +164,10 @@ var margin = {top: 30, right: 5, bottom: 6, left: 30}, var svgLegend = d3.select("#graphLegend") .append("svg") .attr("height", 600) + .attr("width", 340) + .attr("transform", "translate(0," + 30 + ")") .append("g") - .attr("width", 300) + .attr("width", 340) .attr("height", 600) .attr("id", "legendG") .attr("transform", "translate(0," + 30 + ")");
