-
-
-
-
[[item.name]]
-
-
-
[[item.description]]
+
+
+
+
+
+
+
+
+
+
{{item.url}}
+
+
{{item.resource_name}}
+
+
+
+ {{mata.name}}:
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -188,34 +347,353 @@
Polymer({
is: 'select-dataset-controllet',
properties: {
- items: {
- type: Array,
- value: [
-// {"name": "Bob"},
-// {"name": "Tim"},
-// {"name": "Mike"}
- ]
+ datasets: {
+ type: Object,
+ value: undefined
+ },
+ filteredDatasets : {
+ type : Array,
+ value : undefined
+ },
+ shownDatasets : {
+ type : Array,
+ value : undefined
+ },
+ suggestedDatasets : {
+ type : Array,
+ value : undefined
+ },
+
+ providers : {
+ type : Array,
+ value : undefined
+ },
+ dataUrl : {
+ type : String,
+ value : undefined,
+ observer : '_fireDataUrl'
+ },
+ filter : {
+ type : String,
+ value : "",
+ observer : '_filter'
+ },
+ selected : {
+ type : Number,
+ value : 0
+ },
+ prev : {type : Number, value : undefined},
+ next : {type : Number, value : undefined},
+ shownPrev : {type : Number, value : undefined},
+ shownNext : {type : Number, value : undefined},
+ length : {type : Number, value : undefined},
+ tLength : {type : Number, computed : 'treemapLength(length)'},
+ step : {type : Number, value : 20},
+ colors : {
+ type : Array,
+ value : ["#8dd3c7","#ffffb3","#bebada","#fb8072","#80b1d3","#fdb462","#b3de69","#fccde5","#d9d9d9","#bc80bd","#ccebc5","#ffed6f"]
}
},
+
+ listeners: {
+ 'datasetexplorer-datalet_data-url': '_selectDataUrl_treeMap'
+ },
+
ready : function() {
$(this.$.list_container).perfectScrollbar();
- },
- _prova : function(e) {
-// console.log(e.target);
-// e.target.style.background = "#B6B6B6";
+
+// this.$.selected_url.invalid = true;
},
attached: function() {
- // Use the document element
+ this._resize();
+ var that = this;
+ window.addEventListener("resize", function() { that._resize(); });
+
+ this.providers = this.datasets["result"]["providers"];
+ this.datasets = this.datasets["result"]["datasets"];
+
+ if(this.suggestedDatasets) {
+ this.tempDatasets = this.datasets;
+ this.datasets = this.suggestedDatasets.concat(this.datasets);
+ this.$.suggested_div.style.visibility = "visible";
+ }
+
+ this.filteredDatasets = this.datasets;
+
+ this.prev = 1;
+ this.next = this.step;
+ this.length = this.filteredDatasets.length;
+
+ this.shownPrev = Math.min(this.prev, this.length);
+ this.shownNext = Math.min(this.next, this.length);
+ this.shownDatasets = this.filteredDatasets.slice(this.prev-1, this.next);
+
this.$.list.scrollTarget = this.ownerDocument.documentElement;
+
+ this._translate();
+
+ this._loadTreeMap();
+ },
+
+ _translate : function(){
+ this.$.listView.innerHTML = ln["listView_" + ln["localization"]];
+ this.$.treeMapView.innerHTML = ln["treeMapView_" + ln["localization"]];
+
+ this.$.ddl_provider.setAttribute("label", ln["provider_" + ln["localization"]]);
+ this.$.datasets_filter.setAttribute("label", ln["search_" + ln["localization"]]);
+
+ this.$.suggested_datasets.innerHTML = ln["suggestedDatasets_" + ln["localization"]];
+
+ this.$.showing.innerHTML = ln["showing_" + ln["localization"]];
+ this.$.showing2.innerHTML = ln["showing_" + ln["localization"]];
+ this.$.to.innerHTML = ln["to_" + ln["localization"]];
+ this.$.of.innerHTML = ln["of_" + ln["localization"]];
+ this.$.datasets.innerHTML = ln["datasets_" + ln["localization"]];
+ this.$.datasets2.innerHTML = ln["datasets_" + ln["localization"]];
+
+ this.$.selected_url.setAttribute("label", ln["selectedUrl_" + ln["localization"]]);
+ this.errorMessage = ln["wrongUrl_" + ln["localization"]];
},
- iconForItem: function(item) {
- return item ? (item.integer < 50 ? 'star-border' : 'info-outline') : '';
+
+ showSuggested : function(e) {
+ if(e.target.checked)
+ this.datasets = this.suggestedDatasets.concat(this.tempDatasets);
+ else
+ this.datasets = this.tempDatasets;
+ this._filter();
+ },
+
+ _loadTreeMap : function(){
+ var h = $("#neon_container").height() - 48;
+ var w = $("#neon_container").width();
+
+ var data = JSON.stringify({result : {providers: this.providers, datasets: this.filteredDatasets}}).replace(/'/g, "");
+
+ if(this.filteredDatasets.length > 0)
+ this.$.treemap_container.innerHTML = "
";
+ else
+ this.$.treemap_container.innerHTML = "";
+ },
+
+ _filter : function() {
+ if(this.filteredDatasets) {
+ this.async(function () {
+ var ddl_provider = $(this.$.ddl_provider).find("paper-menu")[0].selectedItem;
+ var name = ddl_provider.innerHTML.trim();
+ var id = this._getIdByProviderName(name);
+ this.prev = 1;
+ this.next = this.step;
+ if (id) {
+ //filtered by provider name
+ this.filteredDatasets = this.datasets.filter(function (el) {
+ return el.provider_name == "p:" + id;
+ });
+ }
+ else {
+ this.filteredDatasets = this.datasets;
+ }
+
+ //filtered by filter
+ var filter = this.filter;
+ this.filteredDatasets = this.filteredDatasets.filter(function (el) {
+ return el.resource_name.toLowerCase().indexOf(filter.toLowerCase()) > -1;
+ });
+
+ this.length = this.filteredDatasets.length;
+
+ this.shownPrev = Math.min(this.prev, this.length);
+ this.shownNext = Math.min(this.next, this.length);
+ this.shownDatasets = this.filteredDatasets.slice(this.prev - 1, this.next);
+
+ $("#list_container").animate({scrollTop: 0}, 0);
+
+ this._loadTreeMap();
+ }, 0);
+ }
+ },
+
+ _refreshList : function() {
+ this.shownDatasets = this.filteredDatasets.slice(this.prev - 1, this.next);
+ },
+
+ _clearInput : function() {
+ this.$.datasets_filter.value = "";
},
- getClassForItem: function(item, selected) {
- console.log(item);
- console.log(selected);
+
+ _getIdByProviderName : function(name) {
+ for(var id in this.providers) {
+ if (this.providers[id].title == name)
+ return this.providers[id].id;
+ }
+ },
+
+// iconForItem: function(item) {
+// return item ? (item.integer < 50 ? 'star-border' : 'info-outline') : '';
+// },
+
+ treemapLength : function(length) {
+ var ddl_provider = $(this.$.ddl_provider).find("paper-menu")[0].selectedItem;
+ var name = ddl_provider.innerHTML.trim();
+ var id = this._getIdByProviderName(name);
+
+ if(this.suggestedDatasets && !id)
+ return Math.max(length - this.suggestedDatasets.length, 0);
+ return length;
+ },
+
+ _getColorForIcon : function(item) {
+ var ddl_provider = $(this.$.ddl_provider).find("paper-menu")[0].selectedItem;
+ var name = ddl_provider.innerHTML.trim();
+ var id = this._getIdByProviderName(name);
+ if (id) {
+ return this.colors[0];
+ }
+ if(!item.provider_name) {
+ return "#00BCD4";
+ }
+ var id = item.provider_name.substring(2, item.provider_name.length);
+ var i = this.getProviderById(id) % this.colors.length;
+ return this.colors[i];
+ },
+
+ _getColorForItem : function(item) {
+// var ddl_provider = $(this.$.ddl_provider).find("paper-menu")[0].selectedItem;
+// var name = ddl_provider.innerHTML.trim();
+// var id = this._getIdByProviderName(name);
+// if (id) {
+// return this.colors[0];
+// }
+ if(!item.provider_name) {
+ return "#FFEB3B";
+ }
+// var id = item.provider_name.substring(2, item.provider_name.length);
+// var i = this.getProviderById(id) % this.colors.length;
+// return this.colors[i];
+ },
+
+ _getIconForItem : function(item) {
+ return item.provider_name ? 'bookmark' : 'star';
+ },
+
+// _getProviderColor: function(id) {
+// var i = this.getProviderById(id) % this.colors.length;
+// return this.colors[i];
+// },
+
+ getClassForItem: function(selected) {
return selected ? 'item expanded' : 'item';
+ },
+
+ getProviderById: function(providerId) {
+ var i = 0;
+ for(var id in this.providers){
+ if(this.providers[id].id == providerId)
+ return i;
+ i++;
+ }
+ },
+
+ _onPrevClick : function(){
+ if(this.prev != 1) {
+ this.prev -= this.step;
+ this.next -= this.step;
+
+ this.shownPrev = Math.min(this.prev, this.length);
+ this.shownNext = Math.min(this.next, this.length);
+ this.shownDatasets = this.filteredDatasets.slice(this.prev - 1, this.next);
+ }
+ $("#list_container").animate({ scrollTop: 0}, 0);
+ },
+
+ _onNextClick : function(){
+ if(this.next < this.length) {
+ this.prev += this.step;
+ this.next += this.step;
+
+ this.shownPrev = Math.min(this.prev, this.length);
+ this.shownNext = Math.min(this.next, this.length);
+ this.shownDatasets = this.filteredDatasets.slice(this.prev - 1, this.next);
+ }
+ $("#list_container").animate({ scrollTop: 0}, 0);
+ },
+
+ _stringToArray: function(obj) {
+ obj = JSON.parse(obj);
+ return Object.keys(obj).map(function(key) {
+ return {
+ name: key,
+ value: obj[key]
+ };
+ });
+ },
+
+ _toArray: function(obj) {
+ return Object.keys(obj).map(function(key) {
+ return {
+ name: key,
+ value: obj[key]
+ };
+ });
+ },
+
+ _selectDataUrl : function(){
+ this.async(function () {
+ if(this.$.list.selectedItem) {
+ var url = this.$.list.selectedItem.url;
+
+ // Check if CKAN
+ var strDatasetPos = url.indexOf('/dataset/');
+ var strResourcePos = (strDatasetPos >= 0) ? url.indexOf('/resource/') : -1;
+ if (strDatasetPos >= 0 && strResourcePos > strDatasetPos) {
+ var urlSegment1 = url.substring(0, strDatasetPos);
+ var urlResourceEnd = url.indexOf('/', strResourcePos + 10);
+ var resourceId = url.substring(strResourcePos + 10, urlResourceEnd);
+ url = urlSegment1 + "/api/action/datastore_search?resource_id=" + resourceId;
+ }
+
+ // Check if OPENDATASOFT
+ var strExploreDatasetPos = url.indexOf('/explore/dataset/');
+ if (strExploreDatasetPos >= 0) {
+ var urlSegment1 = url.substring(0, strExploreDatasetPos);
+ var datasetEnd = url.indexOf(strExploreDatasetPos + 17, '/');
+ var datasetId = url.substring(strExploreDatasetPos + 17, datasetEnd >= 0 ? datasetEnd : url.length);
+ url = urlSegment1 + '/api/records/1.0/search?dataset=' + datasetId;
+ }
+
+ this.dataUrl = this._addlimitUrl(url);
+ }
+ else {
+ this.dataUrl = "";
+ }
+ }, 0);
+ },
+
+ _selectDataUrl_treeMap : function(e) {
+ this.dataUrl = this._addlimitUrl(e.detail.url);
+ },
+
+ _fireDataUrl : function(){
+ this.fire('dataset-selection-controllet_data-url', {url: this.dataUrl});
+ },
+
+ _addlimitUrl : function(url){
+ //CKAN --> action no limit
+ if((url.indexOf("api/action") > -1) && !(url.indexOf("limit") > -1))
+ {
+ url += "&limit=99999";
+ }
+ //OpenDataSoft --> action no limit
+ if((url.indexOf("api/records") > -1) && !(url.indexOf("rows") > -1)){
+ url += "&rows=10000";
+ }
+ return url;
+ },
+
+ _resize : function(){
+ var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - 16;
+ h = h - 64 - 8; //height with page scroller
+ $("#select_dataset_container").height(h);
}
});
});
diff --git a/controllets/select-visualization-controllet/select-datalet-inputs.html b/controllets/select-visualization-controllet/select-datalet-inputs.html
index d8740c2..501b70f 100644
--- a/controllets/select-visualization-controllet/select-datalet-inputs.html
+++ b/controllets/select-visualization-controllet/select-datalet-inputs.html
@@ -186,6 +186,18 @@
this._translate();
},
+ _preselectInputs : function(fields, aggregators, orders) {
+ var ddls = this.$.inputs_container.querySelectorAll("paper-dropdown-menu");
+
+// this.async(function () {
+ for (var i = 0; i < fields.length; i++) {
+ var menu = $(ddls[i]).find("paper-menu")[0];
+ menu.select(i+1);
+ }
+ this.selectedFields = this._copy(fields);
+// }, 2);
+ },
+
getSelectedFields : function () {
return this.selectedFields.filter(function(field){ return field != "" });
},
@@ -201,11 +213,12 @@
setFields : function(fields) {
var temp = this._copy(fields);
temp.unshift("");
- this.fields = this._copy(temp);
-
- this.$.expert_header.style.display = "block";
- this._reset();
+ if (JSON.stringify(this.fields) != JSON.stringify(temp)) {
+ this.fields = this._copy(temp);
+ this.$.expert_header.style.display = "block";
+ this._reset();
+ }
},
setInputs : function(inputs) {
diff --git a/controllets/select-visualization-controllet/select-datalet-inputs_series.html b/controllets/select-visualization-controllet/select-datalet-inputs_series.html
index f5f0987..9eda2da 100644
--- a/controllets/select-visualization-controllet/select-datalet-inputs_series.html
+++ b/controllets/select-visualization-controllet/select-datalet-inputs_series.html
@@ -187,6 +187,18 @@
this._translate();
},
+ _preselectInputs : function(fields, aggregators, orders) {
+ var ddls = this.$.inputs_series_container.querySelectorAll("paper-dropdown-menu");
+
+// this.async(function () {
+ for (var i = 0; i < fields.length; i++) {
+ var menu = $(ddls[i]).find("paper-menu")[0];
+ menu.select(i+1);
+ }
+ this.selectedFields = this._copy(fields);
+// }, 0);
+ },
+
getSelectedFields : function () {
var gb_menu = $(this.$.group_by).find("paper-menu")[0];
var c_menu = $("#calculate_0").find("paper-menu")[0];
@@ -210,9 +222,11 @@
setFields : function(fields) {
var temp = this._copy(fields);
temp.unshift("");
- this.fields = this._copy(temp);
- this._reset();
+ if (JSON.stringify(this.fields) != JSON.stringify(temp)) {
+ this.fields = this._copy(temp);
+ this._reset();
+ }
},
setInputs : function(inputs) {
diff --git a/controllets/select-visualization-controllet/select-datalet-options.html b/controllets/select-visualization-controllet/select-datalet-options.html
index f9a03f8..09bc0c9 100644
--- a/controllets/select-visualization-controllet/select-datalet-options.html
+++ b/controllets/select-visualization-controllet/select-datalet-options.html
@@ -195,6 +195,28 @@
this._translate();
},
+ _preselectOptions : function(params) {
+ var textarea = this.$.select_datalet_options_container.querySelectorAll("paper-textarea");
+ textarea[0].value = params["description"];
+
+ var inputs = this.$.select_datalet_options_container.querySelectorAll("paper-input");
+ inputs[0].value = params["title"];
+
+ for (var i = 1; i < inputs.length; i++)
+ if(params[this.options[i - 1].name])
+ inputs[i].value = params[this.options[i - 1].name];
+
+ this._updateParams();
+
+// var menus = this.$.select_datalet_options_container.querySelectorAll("paper-menu");
+// var ddls = this.$.select_datalet_options_container.querySelectorAll("paper-dropdown-menu");
+// for (var i = 0; i < ddls.length; i++) {
+// var menu = $(ddls[i]).find("paper-menu")[0];
+// if(params[ddls[i].label])
+// menu.select(1);//select item con nome params[ddls[i].label]
+// }
+ },
+
setOptions : function(options) {
this.options = [];
this.params = [];
diff --git a/controllets/select-visualization-controllet/select-visualization-controllet.html b/controllets/select-visualization-controllet/select-visualization-controllet.html
index b5568d0..ea9ded6 100755
--- a/controllets/select-visualization-controllet/select-visualization-controllet.html
+++ b/controllets/select-visualization-controllet/select-visualization-controllet.html
@@ -205,10 +205,7 @@
$(this.$.datalet_selection_datalet).perfectScrollbar();
- this.params = {'data-url' : this.dataUrl};
-
- if(this.preselectedDatalet)
- this._preselectDatalet();
+// this.params = {'data-url' : this.dataUrl};//not here
},
attached : function() {
@@ -224,17 +221,27 @@
},
setFields : function(fields) {
+ if (this.fields.length > 0 && JSON.stringify(this.fields) != JSON.stringify(fields))
+ this.reset();
+
this.fields = this._copy(fields);
var inputs = this._getInputs();
- if(inputs)
+ if (inputs)
inputs.setFields(this.fields);
},
reset : function() {
this.$.vslider._reset();
- this.type = "";
- this.$.datalet_selection_datalet_placeholder.innerHTML = "";
+ },
+
+ show : function() {//show --> preselect
+ if(this.preselectedDatalet)
+ this._preselectDatalet();
+// if (this.$.datalet_selection_datalet_placeholder.innerHTML == "") {
+// var inputs = this._getInputs();
+// inputs.fireReady();
+// }
},
_translate : function(){
@@ -264,25 +271,6 @@
}
},
- _preselectDatalet : function() {
-// console.log("_preselectDatalet to implement");
-// console.log(this.preselectedDatalet);
-// console.log(this.fields);
-// console.log(this.dataletPreset);
-
- var dataletParams ={
- component : this.preselectedDatalet+"-datalet",
- params : this.dataletPreset,
- fields : this.fields,
- placeHolder : this.$.datalet_selection_datalet_placeholder
- };
-
- ComponentService.deep_url = this.deepUrl;
- ComponentService.getComponent(dataletParams);
-
- this.$.add_button.removeAttribute("disabled");
- },
-
_handleSelectedDatalet : function(e){
if(this.type != e.detail.response.type) {
@@ -305,6 +293,23 @@
var inputs = this._getInputs();
inputs.fireReady();
}, 0);
+
+// this.async(function () {
+// if(this.preselectedDatalet)
+// this._preselectDatalet();
+// }, 1);
+ },
+
+ _preselectDatalet : function() {
+ var inputs = this._getInputs();
+ inputs._preselectInputs(this.fields, this.dataletPreset["aggregators"], this.dataletPreset["orders"]);
+ this.$.options._preselectOptions(this.dataletPreset);
+ this.dataletPreset = undefined;
+
+// this.async(function () {
+// var inputs = this._getInputs();
+// inputs.fireReady();
+// }, 500);
},
_tryLoadDatalet : function(){
@@ -322,6 +327,8 @@
this.selectedFields = inputs.getSelectedFields();
+ this.params = {'data-url' : this.dataUrl};
+
this.params["filters"] = JSON.stringify(this.filters);
this.params["aggregators"] = JSON.stringify(inputs.getAggregators());
this.params["orders"] = JSON.stringify(inputs.getOrders());
diff --git a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
index dae3366..ed00718 100755
--- a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
+++ b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
@@ -164,7 +164,7 @@ Example:
this.map.children = [];
for(var i = 0; i < treemapData.length; i++){
- this.checkAggragationField(treemapData[i], this._component.fields.length - 1, this._component.fields.length - 1);
+ this.checkAggragationField(treemapData[i], this._component.fields.length - 2, this._component.fields.length - 2);
}
var json = JSON.stringify(this.map);
@@ -204,6 +204,7 @@ Example:
var xyz = function(url) {
me.selectResource(url);
}
+ this.map.name = this._component.name;
build2(this.map, this.meta, this._component.$.treemap_placeholder, xyz, this._component.width, this._component.height);
},
@@ -262,6 +263,11 @@ Example:
value : {}
},
+ name : {
+ type : String,
+ value: ""
+ },
+
width : {
type : Number,
value: 968
diff --git a/datalets/datasetexplorer-datalet/js/buildtreemap2.js b/datalets/datasetexplorer-datalet/js/buildtreemap2.js
index 1e664aa..87e1715 100755
--- a/datalets/datasetexplorer-datalet/js/buildtreemap2.js
+++ b/datalets/datasetexplorer-datalet/js/buildtreemap2.js
@@ -148,17 +148,13 @@ function build2(root, meta, place_holder, select_listener, width, height) {
// FIRST LVL
data[0] = "first";
data[1] = meta[id]['title'];
- var key = (typeof OW == 'undefined') ? "" : OW.getLanguageText('openwall', 'provider_'+id);
- //data[3] = key;
- data[3] = datasetexplorer_ln[key+"_"+datasetexplorer_ln["ln"]];
- //data[4] = ((typeof ODE == 'undefined') ? parent.ODE.THEME_IMAGES_URL : ODE.THEME_IMAGES_URL) + "/logos/"+id+".png";//meta[id]['logo_url'];
- data[4] = "/ow_static/themes/spod_theme_matter/images/logos/"+id+".png";//meta[id]['logo_url'];
- //data[5] = d.value;
+ data[3] = meta[id]['description'];
+ data[4] = "/ow_static/themes/spod_theme_matter/images/logos/"+id+".png";
+ //data[4] = "/ow_static/themes/spod_theme_matter/images/logos/"+meta[id]['logo_png'];
} else if (d._children && !d._children[0]._children) {
// LAST LVL
data[0] = "last";
data[6] = d._children[0].name;
- //data[6] = "datasert url";
} else {
// MIDDLE LVL
data[0] = "middle";
@@ -346,7 +342,7 @@ function build2(root, meta, place_holder, select_listener, width, height) {
function name(d) {
return d.parent
- ? name(d.parent) + " >> " + checkProviderName(d.name)
+ ? name(d.parent) + "." + checkProviderName(d.name)
: checkProviderName(d.name);
}
diff --git a/locales/controllet_ln.js b/locales/controllet_ln.js
index c587dc0..a441bff 100755
--- a/locales/controllet_ln.js
+++ b/locales/controllet_ln.js
@@ -4,7 +4,7 @@ var ln = [];
//PAGE SLIDER
ln["slide1Title_en"] = "SELECT DATASET";
-ln["slide1Subtitle_en"] = "Search or copy and paste the url of dataset.";
+ln["slide1Subtitle_en"] = "Select a dataset from the list or copy and paste the url of dataset.";
ln["slide2Title_en"] = "SELECT DATA";
ln["slide2Subtitle_en"] = "Select the fields from tree-view. The multi-table will show the values related to the selected fields.";
ln["slide3Title_en"] = "SELECT VISUALIZATION";
@@ -15,7 +15,12 @@ ln["forward_en"] = "Forward";
//SELECT DATASET
ln["listView_en"] = "LIST VIEW";
ln["treeMapView_en"] = "TREE MAP VIEW";
-ln["availableDatasets_en"] = "Available datasets";
+ln["provider_en"] = "Provider";
+ln["showing_en"] = "Showing";
+ln["to_en"] = "to";
+ln["of_en"] = "of";
+ln["datasets_en"] = "datasets";
+//ln["availableDatasets_en"] = "Available datasets";
ln["suggestedDatasets_en"] = "Suggested datasets";
ln["selectedUrl_en"] = "Selected url";
ln["wrongUrl_en"] = "Invalid url or data provider not supported yet.";
@@ -112,7 +117,7 @@ ln["donut_description_en"] = "If 'true' Pie will become Donut! :)";
//PAGE SLIDER
ln["slide1Title_it"] = "SELEZIONA IL DATASET";
-ln["slide1Subtitle_it"] = "Ricerca o copia e incolla la url del dataset.";
+ln["slide1Subtitle_it"] = "Seleziona il dataset dalla lista o copia e incolla la url del dataset.";
ln["slide2Title_it"] = "SELEZIONA I DATI";
ln["slide2Subtitle_it"] = "Seleziona i campi dalla struttura ad albero. Nella tabella saranno mostrati i valori dei campi selezionati.";
ln["slide3Title_it"] = "SELEZIONA LA VISUALIZZAZIONE";
@@ -123,7 +128,12 @@ ln["forward_it"] = "Avanti";
//SELECT DATASET
ln["listView_it"] = "ELENCO";
ln["treeMapView_it"] = "GRAFICO AD ALBERO";
-ln["availableDatasets_it"] = "Dataset disponibili";
+ln["provider_it"] = "Provider";
+ln["showing_it"] = "Visualizzati";
+ln["to_it"] = "a";
+ln["of_it"] = "di";
+ln["datasets_it"] = "datasets";
+//ln["availableDatasets_it"] = "Dataset disponibili";
ln["suggestedDatasets_it"] = "Dataset suggeriti";
ln["selectedUrl_it"] = "Url selezionata";
ln["wrongUrl_it"] = "Url invalido o data provider non ancora supportato.";
@@ -231,7 +241,12 @@ ln["forward_fr"] = "AVANT";
//SELECT DATASET
ln["listView_fr"] = "VUE EN LISTE";
ln["treeMapView_fr"] = "VUE EN ARBORESCENCE";
-ln["availableDatasets_fr"] = "Jeux de données disponibles";
+ln["provider_fr"] = "Provider";
+ln["showing_fr"] = "Showing";
+ln["to_fr"] = "to";
+ln["of_fr"] = "of";
+ln["datasets_fr"] = "datasets";
+//ln["availableDatasets_fr"] = "Jeux de données disponibles";
ln["suggestedDatasets_fr"] = "Jeux de données suggérés";
ln["selectedUrl_fr"] = "Sélectionner URL";
ln["wrongUrl_fr"] = "Invalid url or data provider not supported yet.";
@@ -339,7 +354,12 @@ ln["forward_nl"] = "VOOTUIT";
//SELECT DATASET
ln["listView_nl"] = "LIJSTWEERGAVE";
ln["treeMapView_nl"] = "BOOMSTRUCTUUR WEEERGAVE";
-ln["availableDatasets_nl"] = "Beschikbare datasets";
+ln["provider_nl"] = "Provider";
+ln["showing_nl"] = "Showing";
+ln["to_nl"] = "to";
+ln["of_nl"] = "of";
+ln["datasets_nl"] = "datasets";
+//ln["availableDatasets_nl"] = "Beschikbare datasets";
ln["suggestedDatasets_nl"] = "Voeg aanbevolen datasets";
ln["selectedUrl_nl"] = "Selecteer url";
ln["wrongUrl_nl"] = "Ongeldige url of data provider nog niet ondersteund.";
diff --git a/locales/datasetexplorer_ln.js b/locales/datasetexplorer_ln.js
index 8735ed4..fcd0921 100755
--- a/locales/datasetexplorer_ln.js
+++ b/locales/datasetexplorer_ln.js
@@ -3,47 +3,11 @@ datasetexplorer_ln = [];
/*EN*/
datasetexplorer_ln["ode+back_en"] = "<< Click to navigate back to the top level.";
-//datasetexplorer_ln["openwall+provider_1_en"] = "Example CKAN with data from out pilots (Pratos - Groiningen - Den Haag)";
-//datasetexplorer_ln["openwall+provider_2_en"] = "data.issy.com (from OpenDataSoft France)";
-//datasetexplorer_ln["openwall+provider_3_en"] = "Open data Regione Lazio (Italy)";
-//datasetexplorer_ln["openwall+provider_4_en"] = "data.gov.uk (UK)";
-//datasetexplorer_ln["openwall+provider_5_en"] = "Dataportaal van de Nederlandse overheid (Netherland)";
-//datasetexplorer_ln["openwall+provider_6_en"] = "French Open Data Portal (France)";
-//datasetexplorer_ln["openwall+provider_7_en"] = "Ireland\\'s Open Data Portal (Ireland)";
-//datasetexplorer_ln["openwall+provider_8_en"] = "TET v.0.1 @ Galway (Ireland)";
-
/*IT*/
datasetexplorer_ln["ode+back_it"] = "<< Clicca qui per tornare al livello precedente.";
-//datasetexplorer_ln["openwall+provider_1_it"] = "Example CKAN with data from out pilots (Pratos - Groiningen - Den Haag)";
-//datasetexplorer_ln["openwall+provider_2_it"] = "data.issy.com (from OpenDataSoft France)";
-//datasetexplorer_ln["openwall+provider_3_it"] = "Open data Regione Lazio (Italy)";
-//datasetexplorer_ln["openwall+provider_4_it"] = "data.gov.uk (UK)";
-//datasetexplorer_ln["openwall+provider_5_it"] = "Dataportaal van de Nederlandse overheid (Netherland)";
-//datasetexplorer_ln["openwall+provider_6_it"] = "French Open Data Portal (France)";
-//datasetexplorer_ln["openwall+provider_7_it"] = "Ireland\\'s Open Data Portal (Ireland)";
-//datasetexplorer_ln["openwall+provider_8_it"] = "TET v.0.1 @ Galway (Ireland)";
-
/*FR*/
datasetexplorer_ln["ode+back_fr"] = "<< Click to navigate back to the top level.";
-//datasetexplorer_ln["openwall+provider_1_fr"] = "Example CKAN with data from out pilots (Pratos - Groiningen - Den Haag)";
-//datasetexplorer_ln["openwall+provider_2_fr"] = "data.issy.com (from OpenDataSoft France)";
-//datasetexplorer_ln["openwall+provider_3_fr"] = "Open data Regione Lazio (Italy)";
-//datasetexplorer_ln["openwall+provider_4_fr"] = "data.gov.uk (UK)";
-//datasetexplorer_ln["openwall+provider_5_fr"] = "Dataportaal van de Nederlandse overheid (Netherland)";
-//datasetexplorer_ln["openwall+provider_6_fr"] = "French Open Data Portal (France)";
-//datasetexplorer_ln["openwall+provider_7_fr"] = "Ireland\\'s Open Data Portal (Ireland)";
-//datasetexplorer_ln["openwall+provider_8_fr"] = "TET v.0.1 @ Galway (Ireland)";
-
/*NL*/
datasetexplorer_ln["ode+back_nl"] = "<< Click to navigate back to the top level.";
-
-//datasetexplorer_ln["openwall+provider_1_nl"] = "Example CKAN with data from out pilots (Pratos - Groiningen - Den Haag)";
-//datasetexplorer_ln["openwall+provider_2_nl"] = "data.issy.com (from OpenDataSoft France)";
-//datasetexplorer_ln["openwall+provider_3_nl"] = "Open data Regione Lazio (Italy)";
-//datasetexplorer_ln["openwall+provider_4_nl"] = "data.gov.uk (UK)";
-//datasetexplorer_ln["openwall+provider_5_nl"] = "Dataportaal van de Nederlandse overheid (Netherland)";
-//datasetexplorer_ln["openwall+provider_6_nl"] = "French Open Data Portal (France)";
-//datasetexplorer_ln["openwall+provider_7_nl"] = "Ireland\\'s Open Data Portal (Ireland)";
-//datasetexplorer_ln["openwall+provider_8_nl"] = "TET v.0.1 @ Galway (Ireland)";