diff --git a/controllets/document-card-controllet/document-card-controllet.html b/controllets/document-card-controllet/document-card-controllet.html index 5cc9d72..814e181 100644 --- a/controllets/document-card-controllet/document-card-controllet.html +++ b/controllets/document-card-controllet/document-card-controllet.html @@ -21,10 +21,11 @@ } #content { - padding: 4px 4px 0px 4px; position:relative; + padding: 2px; + /*padding: 4px 4px 0px 4px; width: 98%; - height: 90%; + height: 90%;*/ } .footer { @@ -115,17 +116,19 @@ <paper-material id="paper_card_container" elevation="{{elevation}}"> <div id="content"> - <iframe id="resource" src="{{resourceUrl}}?userName={{userName}}"></iframe> + <iframe id="resource" src="{{resourceUrl}}?userName={{userName}}&showControls={{showControls}}&showLineNumbers=false&pageview=true"></iframe> <!--<iframe id="resource" src="{{resourceUrl}}"></iframe>--> </div> - <paper-fab id="fullscreen-button" class="open" mini icon="fullscreen" on-click="_handleOpenClick"></paper-fab> + <template id="dom-if" if="{{showControls}}"> + <paper-fab id="fullscreen-button" class="open" mini icon="fullscreen" on-click="_handleOpenClick"></paper-fab> - <paper-dialog id="fullscreen_container" entry-animation="scale-up-animation" exit-animation="fade-out-animation"> - <!--with-backdrop--> - <div id="fullscreen_content"></div> - <paper-button id="info_close_button" dialog-confirm autofocus>x</paper-button> - </paper-dialog> + <paper-dialog id="fullscreen_container" entry-animation="scale-up-animation" exit-animation="fade-out-animation"> + <!--with-backdrop--> + <div id="fullscreen_content"></div> + <paper-button id="info_close_button" dialog-confirm autofocus>x</paper-button> + </paper-dialog> + </template> </paper-material> @@ -134,7 +137,6 @@ <script src="../shared_js/perfect-scrollbar/js/min/perfect-scrollbar.jquery.min.js"></script> <script> - _this = null; Polymer({ is: "document-card-controllet", @@ -174,6 +176,12 @@ type: String, value: undefined }, + + showControls: { + type: Boolean, + value: false + }, + lang:{ type: String, value: navigator.language @@ -187,7 +195,6 @@ $(this.$.fullscreen_container).perfectScrollbar(); }, - _changeWidth: function(){ //this.style.width = this.width + "px"; //this.$.paper_card_container.style.width = this.width + "px"; diff --git a/controllets/postit-container-controllet/postit-container-controllet.html b/controllets/postit-container-controllet/postit-container-controllet.html index dee73d6..782d1b2 100755 --- a/controllets/postit-container-controllet/postit-container-controllet.html +++ b/controllets/postit-container-controllet/postit-container-controllet.html @@ -58,7 +58,7 @@ transition: 0.2s ease-out; } - .window { + .postitwindow { /*height: 80vh; width: 120vh;*/ display: none; @@ -246,7 +246,7 @@ </p> </div> - <paper-material id="window" class="window" elevation="0"> + <paper-material id="window" class="postitwindow" elevation="0"> <div class="transparent"></div> diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html index 3c53855..be7337a 100755 --- a/datalets/base-datalet/base-datalet.html +++ b/datalets/base-datalet/base-datalet.html @@ -367,7 +367,43 @@ Example : var post = 'svg_data=' + window.encodeURIComponent(svg) + '&datalet=' + parent.is + '&dataset=' + this.$.base_datalet_link.getAttribute("href"); xhr.responseType = 'blob'; - xhr.send(post); + + //OpenDataSoft check + if(this.dataUrl.indexOf("/records/") > -1 ) + { + var urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2]; + + var i; + if(this.dataUrl.indexOf("&") > -1) + i = this.dataUrl.indexOf("&"); + else + i = this.dataUrl.length; + + $.ajax({ + url: urlSource + "/api/dataset/1.0/" + this.dataUrl.substring(this.dataUrl.indexOf("=")+1, i), + dataType: "json", + success: function(e){ + post += '&name=' + e.metas.title + '&description=' + e.metas.description + '&created=' + e.metas.data_processed + '&lastModified=' + e.metas.modified; + xhr.send(post); + } + }); + } + else if(this.dataUrl.indexOf("datastore_search?resource_id") > -1 ) + { + $.ajax({ + url: this.dataUrl.replace("datastore_search?resource_id", "resource_show?id"), + dataType: "json", + success: function(e){ + post += '&name=' + e.result.name + '&description=' + e.result.description + '&created=' + e.result.created + '&format=' + e.result.format + '&lastModified=' + e.result.last_modified; + xhr.send(post); + } + }); + } + else + { + xhr.send(post); + } + }, importToMySpace: function() {