diff --git a/datalets/datasetexplorer-datalet/js/buildtreemap.js b/datalets/datasetexplorer-datalet/js/buildtreemap.js index 5f27e22..75004aa 100755 --- a/datalets/datasetexplorer-datalet/js/buildtreemap.js +++ b/datalets/datasetexplorer-datalet/js/buildtreemap.js @@ -131,33 +131,27 @@ function build(root, meta, place_holder, select_listener, width, height) { .call(rect) .attr("onmousemove", function(d) { //var data = ["lvl", "name", "color", "description", "logoUrl", "datasets", "datasetUrl"]; - var data = ["", d.name, d.color, "", "", d.value, ""] + var data = ["", d.name, d.color, "", "", d.value, ""]; + data[2] = ["#000000"]; var id = d.name.split(':')[1]; if (d.depth == 1) { // FIRST LVL data[0] = "first"; data[1] = meta[id]['title']; data[3] = meta[id]['description']; - data[4] = meta[id]['logo_url']; - data[4] = ODE.THEME_IMAGES_URL + "/logos/"+id+".png"; - console.log(data[4]); + data[4] = ((ODE.THEME_IMAGES_URL == undefined) ? parent.ODE.THEME_IMAGES_URL : ODE.THEME_IMAGES_URL) + "/logos/"+id+".png";//meta[id]['logo_url']; //data[5] = d.value; } else if (d._children && !d._children[0]._children) { // LAST LVL data[0] = "last"; - //data[6] = "datasert url";//??? + //data[6] = "datasert url"; } else { // MIDDLE LVL data[0] = "middle"; - //data[5] = "1111";//meta??? } - //console.log(data); - //console.log(data.toString()); return "showTooltip(event, '" + data + "')"; }) .attr("onmouseout", function() {return "hideTooltip()";}) - //.append("title") - //.text(function(d) { return d.name; /*formatNumber(d.value);*/ }); g.append("text") .attr("dy", ".75em") diff --git a/datalets/datasetexplorer-datalet/treemap_tooltip.html b/datalets/datasetexplorer-datalet/treemap_tooltip.html index 1c119ab..aa4a538 100644 --- a/datalets/datasetexplorer-datalet/treemap_tooltip.html +++ b/datalets/datasetexplorer-datalet/treemap_tooltip.html @@ -65,7 +65,7 @@ margin: 0px; padding: 0px; height: 64px; - width: 64px; + /*width: 64px;*/ } p { @@ -83,9 +83,9 @@
-
{{name}}
+
-

{{description}}

+

{{name}}: {{description}}

There are {{datasets}} datasets.