diff --git a/controllets/dataset-selection-controllet/dataset-selection-controllet.html b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
index 55710a2..39c9318 100755
--- a/controllets/dataset-selection-controllet/dataset-selection-controllet.html
+++ b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
@@ -284,7 +284,7 @@
var h = $("#material_container").height() - 48;
var w = $("#material_container").width();
// /oxwall_x.y.z
- this.$.div_datasetexplorer.innerHTML = "";
+ this.$.div_datasetexplorer.innerHTML = "";
},
_selectDataUrl_treeMap : function(e) {
@@ -366,4 +366,4 @@
-
\ No newline at end of file
+
diff --git a/datalets/datasetexplorer-datalet/js/buildtreemap.js b/datalets/datasetexplorer-datalet/js/buildtreemap.js
index c8d6c63..2bb760f 100755
--- a/datalets/datasetexplorer-datalet/js/buildtreemap.js
+++ b/datalets/datasetexplorer-datalet/js/buildtreemap.js
@@ -131,30 +131,28 @@ 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, "", "", "0", ""];
- //d.name.split(':')[1]???
+ 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[3] = "description";//???
- data[4] = "http://essi-lab.eu/twiki/pub/GIcat/CKANProfilerGuide/logo-ckan.png";//id???
- data[5] = "2222";//meta???
+ data[1] = meta[id]['title'];
+ //data[3] = OW.getLanguageText('openwall', 'provider_'+id);//???
+ data[3] = (typeof OW == 'undefined') ? "" : OW.getLanguageText('openwall', 'provider_'+id);
+ data[4] = ((typeof ODE == '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..fef2af8 100644
--- a/datalets/datasetexplorer-datalet/treemap_tooltip.html
+++ b/datalets/datasetexplorer-datalet/treemap_tooltip.html
@@ -36,15 +36,29 @@
.tooltip {
font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
padding: 16px;
- min-width: 200px;
- max-width: 400px;
position: absolute;
+ /*min-width: 200px;*/
+ /*max-width: 400px;*/
+
/*position: relative*/
/*top: 20px;*/
/*left: 20px;*/
}
+ .tooltip#first_info {
+ width: 400px;
+ }
+
+ .tooltip#middle_info {
+ min-width: 200px;
+ }
+
+ .tooltip#last_info {
+ min-width: 200px;
+ max-width: 800px;
+ }
+
.tooltip_top {
display: flex;
margin: 0px;
@@ -65,7 +79,7 @@
margin: 0px;
padding: 0px;
height: 64px;
- width: 64px;
+ /*width: 64px;*/
}
p {
@@ -83,9 +97,9 @@
- {{description}}
+ {{name}}: {{description}}
There are {{datasets}} datasets.