diff --git a/controllets/data-sevc-controllet/data-sevc-controllet.html b/controllets/data-sevc-controllet/data-sevc-controllet.html
index bf56542..f3cec86 100755
--- a/controllets/data-sevc-controllet/data-sevc-controllet.html
+++ b/controllets/data-sevc-controllet/data-sevc-controllet.html
@@ -3,6 +3,8 @@
+
+
/********************************************************************************************************************************
@@ -114,8 +116,12 @@
this.$.slider.selected = 1;
// console.log(this.selectedDatalet);
this.dataUrl = this.dataletPreset["data-url"];
-
}
+
+// var languageLink = document.createElement("link");
+// languageLink.rel = "localization";
+// languageLink.href = "../../../locales/it.l20n";
+// document.getElementsByTagName("head")[0].appendChild(languageLink);
},
_updateSlider : function(e){
diff --git a/controllets/data-sevc-controllet/demo/index.html b/controllets/data-sevc-controllet/demo/index.html
index 98cbdef..db6804d 100755
--- a/controllets/data-sevc-controllet/demo/index.html
+++ b/controllets/data-sevc-controllet/demo/index.html
@@ -9,11 +9,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -24,6 +24,12 @@
+
+
+
\ No newline at end of file
diff --git a/controllets/paper-card-controllet/paper-card-controllet.html b/controllets/paper-card-controllet/paper-card-controllet.html
index 64823d7..9be8dba 100755
--- a/controllets/paper-card-controllet/paper-card-controllet.html
+++ b/controllets/paper-card-controllet/paper-card-controllet.html
@@ -210,11 +210,11 @@
properties: {
width: {
type: Number,
- observer: "_changeWidth",
+ observer: "_changeWidth"
},
height: {
type: Number,
- observer: "_changeHeight",
+ observer: "_changeHeight"
},
cardType:{
type: String,
diff --git a/controllets/search-panel-controllet/search-panel-controllet.html b/controllets/search-panel-controllet/search-panel-controllet.html
index 66815e7..f7b4519 100755
--- a/controllets/search-panel-controllet/search-panel-controllet.html
+++ b/controllets/search-panel-controllet/search-panel-controllet.html
@@ -68,10 +68,10 @@ Example:
position: absolute;
top: -12px;
width: 20vw;
-
}
- neon-animated-pages{
+ neon-animated-pages
+ {
/*width: 20vw;*/
}
@@ -143,7 +143,7 @@ Example:
ready: function(){
- if(this.leftDirection != undefined){
+ if(this.leftDirection != undefined){
this.$.search_text.style.left = '5px';
}else if(this.rightDirection != undefined){
this.$.search_text.style.right = '5px';
@@ -169,8 +169,9 @@ Example:
* @param {Event} e
*/
_valueChanged : function(oldvalue, newValue){
- clearTimeout (this.timer);
- this.timer = setTimeout(this.fire('search-panel-controllet_content-changed', {searchKey: this.searchKey, id : this.id}), 500);
+ var t = this;
+ clearTimeout(this.timer);
+ this.timer = setTimeout(function(){t.fire('search-panel-controllet_content-changed', {searchKey: t.searchKey, id : t.id})}, 500);
},
/**
* It returns the value in text area
diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html
index 1f09892..6831aee 100755
--- a/datalets/base-datalet/base-datalet.html
+++ b/datalets/base-datalet/base-datalet.html
@@ -97,7 +97,7 @@ Example :
- Source: ( dataset )
+ Source: (dataset)
Powered by ROUTE-TO-PA
@@ -140,33 +140,46 @@ Example :
* @method ready
*/
ready: function(){
+ //cKan organized with or not catalog
+ queryInitial = this.dataUrl.substring(0, this.dataUrl.indexOf("api")); //SOURCE
+ urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
+ this.$.base_datalet_source.innerHTML = urlSource;
+ this.$.base_datalet_source.setAttribute("href", urlSource);
- var urlDatalet;
- if(this.dataUrl != undefined){
+ //OpenDataSoft check
+ if(this.dataUrl.indexOf("/records/") > -1 )
+ {
+ //Resourceid of a datalet
+ var query = this.dataUrl.substring(this.dataUrl.indexOf("?"), this.dataUrl.length);
+ var params = this.decomponeQueryString(query);
+ resultIssyIdDatalet = params["dataset"];
+ resultIssyAPI = "explore/dataset/";
+ urlPageDatasetIssy = queryInitial + resultIssyAPI + resultIssyIdDatalet + "/";
+ this.$.base_datalet_link.setAttribute("href", urlPageDatasetIssy);
+ }
+ else
+ {
+ //CKAN portal
+ var urlDatalet;
+ if(this.dataUrl != undefined) {
var apiIdResource = "resource_show?id=";
//Resourceid of a datalet
var query = this.dataUrl.substring(this.dataUrl.indexOf("?"), this.dataUrl.length);
- var params = this.decomponeQueryString(query);
+ var params = this.decomponeQueryString(query);
+ //CKAN
resultIdDatalet = params["resource_id"];
//cKan organized with or not catalog
- queryInitial = this.dataUrl.substring(0, this.dataUrl.indexOf("api"));
- queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"), this.dataUrl.indexOf("datastore_search"));
-
- urlDatalet = queryInitial + queryFinal + apiIdResource + resultIdDatalet;
- urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
-
-// this.$.domainPage.innerHTML = '
'+ "." ;
-
- this.$.base_datalet_source.innerHTML = urlSource;
- this.$.base_datalet_source.setAttribute("href", urlSource);
+ queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"), this.dataUrl.indexOf("datastore_search"));
+ urlDatalet = queryInitial + queryFinal + apiIdResource + resultIdDatalet;
this.requestDataletData(urlDatalet);
}
+ }
},
/**
* Set the domain url to show in the footer
@@ -210,7 +223,6 @@ Example :
*/
handleDataletResponse: function(e) {
this.objectDatalet.json_resultDatalet.value = e;
-
//packageId of a give datalet
packageIdDatalet = this.objectDatalet.json_resultDatalet.value.result.package_id;
resourceId = this.objectDatalet.json_resultDatalet.value.result.id;
@@ -228,8 +240,6 @@ Example :
urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
this.$.base_datalet_link.setAttribute("href", urlDatalet);
-// this.$.domainPage.innerHTML += " (" + ' ' + " )";
-
}
}
});
diff --git a/locales/en-EN.l20n b/locales/en.l20n
index 056f454..056f454 100644
--- a/locales/en-EN.l20n
+++ b/locales/en.l20n
diff --git a/locales/fr.l20n b/locales/fr.l20n
new file mode 100644
index 0000000..056f454
--- /dev/null
+++ b/locales/fr.l20n
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/locales/it-IT.l20n b/locales/it.l20n
index 2ee74a8..2ee74a8 100644
--- a/locales/it-IT.l20n
+++ b/locales/it.l20n
diff --git a/locales/nl.l20n b/locales/nl.l20n
new file mode 100644
index 0000000..056f454
--- /dev/null
+++ b/locales/nl.l20n
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file