diff --git a/controllets/select-dataset-controllet/ortelio-controllet.html b/controllets/select-dataset-controllet/ortelio-controllet.html new file mode 100755 index 0000000..975e270 --- /dev/null +++ b/controllets/select-dataset-controllet/ortelio-controllet.html @@ -0,0 +1,551 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/controllets/select-dataset-controllet/select-dataset-controllet.html b/controllets/select-dataset-controllet/select-dataset-controllet.html index f2b387f..ce17d15 100755 --- a/controllets/select-dataset-controllet/select-dataset-controllet.html +++ b/controllets/select-dataset-controllet/select-dataset-controllet.html @@ -33,6 +33,7 @@ + @@ -186,7 +187,7 @@ position: relative; height: 100%; width: 50%; - border-left: 4px solid #B6B6B6;; + border-left: 4px solid #B6B6B6; } #select_dataset_container #info_container { @@ -194,8 +195,6 @@ height: 100%; width: 50%; border-right: 4px solid #B6B6B6; - - /*background-color: red;*/ } #select_dataset_container #info { @@ -297,14 +296,22 @@ /*font-weight: bold;*/ /*line-height: 48px;*/ /*}*/ + + /*#ortelio {*/ + /*/!*height: calc(100% - 172px);*!/*/ + /*/!*width: calc(100% - 8px);*!/*/ + /*height: 100%;*/ + /*width: 100%;*/ + /*background-color: red;*/ + /*}*/ - - + + + + + + + +
@@ -496,6 +509,7 @@ _translate : function(){ this.$.listView.innerHTML = ln["listView_" + ln["localization"]]; this.$.treeMapView.innerHTML = ln["treeMapView_" + ln["localization"]]; + this.$.extendedSearch.innerHTML = ln["extendedSearch_" + ln["localization"]]; this.$.ddl_provider.setAttribute("label", ln["provider_" + ln["localization"]]); this.$.datasets_filter.setAttribute("label", ln["search_" + ln["localization"]]); @@ -572,14 +586,28 @@ _refreshList : function() { this.shownDatasets = this.filteredDatasets.slice(this.prev - 1, this.next); + + this.$.header.style.display = "flex"; + this.$.header.style.visibility = "visible"; +// this.$.url.style.marginTop = "-4px"; + this.$.header.className = this.$.header.className.replace(" noshadow", ""); }, _noShadow : function() { - console.log(this.$.header); + this.$.header.style.display = "flex"; + this.$.header.style.visibility = "visible"; +// this.$.url.style.marginTop = "-4px"; + this.$.header.className += " noshadow"; }, + _hideSearch : function() { +// this.$.header.style.display = "none"; + this.$.header.style.visibility = "hidden"; +// this.$.url.style.marginTop = "44px"; + }, + _clearInput : function() { this.$.datasets_filter.value = ""; }, diff --git a/controllets/select-visualization-controllet/select-visualization-controllet.html b/controllets/select-visualization-controllet/select-visualization-controllet.html index 1ae79d8..e3c5b32 100755 --- a/controllets/select-visualization-controllet/select-visualization-controllet.html +++ b/controllets/select-visualization-controllet/select-visualization-controllet.html @@ -337,6 +337,8 @@ this.params["aggregators"] = JSON.stringify(inputs.getAggregators()); this.params["orders"] = JSON.stringify(inputs.getOrders()); + this.params["export_menu"] = "0"; + var params = this.$.options.getParams(); for (var key in params) { this.params[key] = params[key]; } diff --git a/locales/controllet_ln.js b/locales/controllet_ln.js index a441bff..246f0fc 100755 --- a/locales/controllet_ln.js +++ b/locales/controllet_ln.js @@ -15,6 +15,7 @@ ln["forward_en"] = "Forward"; //SELECT DATASET ln["listView_en"] = "LIST VIEW"; ln["treeMapView_en"] = "TREE MAP VIEW"; +ln["extendedSearch_en"] = "EXTENDED SEARCH"; ln["provider_en"] = "Provider"; ln["showing_en"] = "Showing"; ln["to_en"] = "to"; @@ -128,6 +129,7 @@ ln["forward_it"] = "Avanti"; //SELECT DATASET ln["listView_it"] = "ELENCO"; ln["treeMapView_it"] = "GRAFICO AD ALBERO"; +ln["extendedSearch_it"] = "RICERCA ESTESA"; ln["provider_it"] = "Provider"; ln["showing_it"] = "Visualizzati"; ln["to_it"] = "a"; @@ -241,6 +243,7 @@ ln["forward_fr"] = "AVANT"; //SELECT DATASET ln["listView_fr"] = "VUE EN LISTE"; ln["treeMapView_fr"] = "VUE EN ARBORESCENCE"; +ln["extendedSearch_fr"] = "EXTENDED SEARCH"; ln["provider_fr"] = "Provider"; ln["showing_fr"] = "Showing"; ln["to_fr"] = "to"; @@ -354,6 +357,7 @@ ln["forward_nl"] = "VOOTUIT"; //SELECT DATASET ln["listView_nl"] = "LIJSTWEERGAVE"; ln["treeMapView_nl"] = "BOOMSTRUCTUUR WEEERGAVE"; +ln["extendedSearch_nl"] = "EXTENDED SEARCH"; ln["provider_nl"] = "Provider"; ln["showing_nl"] = "Showing"; ln["to_nl"] = "to";