Commit 564f0a81ad841ae166ed24593c47be8077f646b4
1 parent
be426b06
2 link footer
Showing
1 changed file
with
8 additions
and
10 deletions
datalets/base-datalet/base-datalet.html
@@ -80,16 +80,17 @@ Example : | @@ -80,16 +80,17 @@ Example : | ||
80 | width: 100%; | 80 | width: 100%; |
81 | } | 81 | } |
82 | 82 | ||
83 | + | ||
83 | </style> | 84 | </style> |
84 | 85 | ||
85 | <div id="base_datalet_imgWaitDatalet"> | 86 | <div id="base_datalet_imgWaitDatalet"> |
86 | <img id="image_spin" src="static/images/spin.svg"> | 87 | <img id="image_spin" src="static/images/spin.svg"> |
87 | 88 | ||
88 | </div> | 89 | </div> |
89 | - | ||
90 | <div id="base_datalet_container"> | 90 | <div id="base_datalet_container"> |
91 | - <b>Source: </b><span id="domain"></span> | ||
92 | - <b> </b><span id="domainPage"></span> | 91 | + <b> Source:</b><span id="domain"></span> |
92 | + <b> </b><span id="domainPage"> | ||
93 | + </span> | ||
93 | <div id="base_datalet_rtp"> | 94 | <div id="base_datalet_rtp"> |
94 | <div id="rtp">Powered by ROUTE-TO-PA</div> | 95 | <div id="rtp">Powered by ROUTE-TO-PA</div> |
95 | <div><a href="http://www.routetopa.eu/"><img id="rtpalogo" src="static/images/rtpalogo.png" ></a></div> | 96 | <div><a href="http://www.routetopa.eu/"><img id="rtpalogo" src="static/images/rtpalogo.png" ></a></div> |
@@ -134,8 +135,6 @@ Example : | @@ -134,8 +135,6 @@ Example : | ||
134 | var urlDatalet; | 135 | var urlDatalet; |
135 | if(this.dataUrl != undefined){ | 136 | if(this.dataUrl != undefined){ |
136 | 137 | ||
137 | - urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; | ||
138 | - | ||
139 | var apiIdResource = "resource_show?id="; | 138 | var apiIdResource = "resource_show?id="; |
140 | 139 | ||
141 | //Resourceid of a datalet | 140 | //Resourceid of a datalet |
@@ -148,10 +147,10 @@ Example : | @@ -148,10 +147,10 @@ Example : | ||
148 | queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"), this.dataUrl.indexOf("datastore_search")); | 147 | queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"), this.dataUrl.indexOf("datastore_search")); |
149 | 148 | ||
150 | urlDatalet = queryInitial + queryFinal + apiIdResource + resultIdDatalet; | 149 | urlDatalet = queryInitial + queryFinal + apiIdResource + resultIdDatalet; |
150 | + urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; | ||
151 | 151 | ||
152 | + this.$.domainPage.innerHTML = '<a href=' + urlSource + ' target=' + "_blank>" + urlSource + '</a>'+ "." ; | ||
152 | this.requestDataletData(urlDatalet); | 153 | this.requestDataletData(urlDatalet); |
153 | - //String source to define for Issy | ||
154 | - this.$.domain.textContent = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; | ||
155 | } | 154 | } |
156 | }, | 155 | }, |
157 | /** | 156 | /** |
@@ -214,10 +213,9 @@ Example : | @@ -214,10 +213,9 @@ Example : | ||
214 | urlDatalet = urlDatasetDownload.replace(/\/download\/.*/, ''); | 213 | urlDatalet = urlDatasetDownload.replace(/\/download\/.*/, ''); |
215 | urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; | 214 | urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; |
216 | 215 | ||
217 | - //this.$.domain.textContent = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; | ||
218 | 216 | ||
219 | - //this.$.domainPage.innerHTML = '<a href=' + urlSource + ' target=' + "_blank>" + " urlSource" + '</a>'; | ||
220 | - this.$.domainPage.innerHTML = '<a href=' + urlDatalet + ' target=' + "_blank>" + " Dataset's page" + '</a>'; | 217 | + this.$.domainPage.innerHTML += " (" + ' <a href=' + urlDatalet + ' target=' + "_blank>" + "Dataset's page" + '</a>' + " )"; |
218 | + | ||
221 | } | 219 | } |
222 | } | 220 | } |
223 | }); | 221 | }); |