SGH / COMPONENTS

Commit 238a48d91d08137becc44f6fecea5a62bdce173c

Authored by root
2 parents 0f6424fe bfa40fa6

Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

Inline Side-by-side
Showing 3 changed files with 14 additions and 14 deletions
controllets/animated-button-container-controllet/animated-button-container-controllet.html
  View file @238a48d
... ... @@ -239,13 +239,12 @@
239 239  
240 240 $(this.$.container_content).perfectScrollbar();
241 241  
242   - this.$.open.style.height = this.iconHeight + "px";
243   - this.$.open.style.width = this.iconWidth + "px";
244   - this.$.open_window_button.style.backgroundColor = this.backgroundButtonColor;
245   - this.$.open_window_button.style.width = 24 /*this.iconWidth*/ + "px";
246   - this.$.open_window_button.style.height = 24 /*this.iconHeight*/ + "px";
247   - this.$.open_window_button.style.padding = "6px";
248   - this.$.button_container.style.height = this.iconHeight + "px";
  242 + this.$.open.style.height = this.iconHeight + "px";
  243 + this.$.open.style.width = this.iconWidth + "px";
  244 + this.$.open_window_button.style.backgroundColor = this.backgroundButtonColor;
  245 + this.$.open_window_button.style.width = this.iconWidth + "px";
  246 + this.$.open_window_button.style.height = this.iconHeight + "px";
  247 + this.$.button_container.style.height = this.iconHeight + "px";
249 248 },
250 249  
251 250 _onOpenClick: function() {
... ...
datalets/datasetexplorer-datalet/js/buildtreemap.js
  View file @238a48d
... ... @@ -179,6 +179,7 @@ function build(root, place_holder, select_listener) {
179 179 if (!d._children[0]._children) {
180 180 if (select_listener) {
181 181 var url = d._children[0].name;
  182 + var ret = "Data provider not supported yet."
182 183  
183 184 // Check if CKAN
184 185 var strDatasetPos = url.indexOf('/dataset/');
... ... @@ -187,7 +188,7 @@ function build(root, place_holder, select_listener) {
187 188 var urlSegment1 = url.substring(0, strDatasetPos);
188 189 var urlResourceEnd = url.indexOf('/', strResourcePos + 10);
189 190 var resourceId = url.substring(strResourcePos + 10, urlResourceEnd);
190   - url = urlSegment1 + "/api/action/datastore_search?resourceid=" + resourceId;
  191 + ret = urlSegment1 + "/api/action/datastore_search?resource_id=" + resourceId;
191 192 }
192 193  
193 194 // Check if OPENDATASOFT
... ... @@ -196,10 +197,10 @@ function build(root, place_holder, select_listener) {
196 197 var urlSegment1 = url.substring(0, strExploreDatasetPos);
197 198 var datasetEnd = url.indexOf(strExploreDatasetPos + 17, '/');
198 199 var datasetId = url.substring(strExploreDatasetPos + 17, datasetEnd >= 0 ? datasetEnd : url.length);
199   - url = urlSegment1 + '/api/records/1.0/search?dataset=' + datasetId;
  200 + ret = urlSegment1 + '/api/records/1.0/search?dataset=' + datasetId;
200 201 }
201 202  
202   - select_listener(url);
  203 + select_listener(ret);
203 204 }
204 205  
205 206 var dataurl = d._children[0].name;
... ...
demo.html
  View file @238a48d
... ... @@ -264,8 +264,8 @@
264 264  
265 265 //DEEP.deepUrl = "http://deep.routetopa.eu/DEEP/";
266 266 //DEEP.datasetsList = "http://deep.routetopa.eu/DEEP/datalets-list";
267   - DEEP.deepUrl = "http://deep.routetopa.eu/DEEP/";
268   - DEEP.datasetsList = "http://deep.routetopa.eu/DEEP/datalets-list";
  267 + DEEP.deepUrl = "http://192.168.164.128/DatalEts-Ecosystem-Provider/DEEP/";
  268 + DEEP.datasetsList = "http://192.168.164.128/DatalEts-Ecosystem-Provider/DEEP/datalets-list";
269 269  
270 270 DEEP.Datasets = {
271 271 names:[
... ... @@ -346,7 +346,7 @@
346 346 if(response.idm.inputs.input.constructor == Object) {
347 347 if(response.idm.inputs.input.selection == "*")
348 348 {
349   - var fields = this.$.selectedFields_container.querySelectorAll('draggable-element-controllet');
  349 + var fields = this.$.selected_fields_container.querySelectorAll('draggable-element-controllet');
350 350 input = response.idm.inputs.input;
351 351 response.idm.inputs.input = new Array();
352 352 for(var i=0;i<fields.length;i++){
... ... @@ -551,4 +551,4 @@
551 551 </script>
552 552  
553 553 </body>
554   -</html>
  554 +</html>
555 555 \ No newline at end of file
... ...