From 7e129909a0719e3efda955faaf04f9efd4312cfd Mon Sep 17 00:00:00 2001 From: kappu Date: Wed, 1 Jul 2015 13:32:43 +0200 Subject: [PATCH 1/5] Close #691 --- .../app/static/config/managerConfig.js | 1 + .../app/static/config/mapStoreConfig.js | 1 + mapcomposer/app/static/config/viewerConfig.js | 2 + .../static/externals/cookiechoices/LICENSE | 202 ++++++++++++++++++ .../externals/cookiechoices/cookiechoices.css | 51 +++++ .../externals/cookiechoices/cookiechoices.js | 171 +++++++++++++++ .../externals/mapmanager/translations/de.js | 9 +- .../externals/mapmanager/translations/en.js | 8 +- .../externals/mapmanager/translations/es.js | 9 +- .../externals/mapmanager/translations/fr.js | 9 +- .../externals/mapmanager/translations/it.js | 9 +- mapcomposer/app/static/translations/de.js | 10 +- mapcomposer/app/static/translations/en.js | 9 +- mapcomposer/app/static/translations/es.js | 9 +- mapcomposer/app/static/translations/fr.js | 9 +- mapcomposer/app/static/translations/it.js | 11 +- mapcomposer/app/templates/base.html | 3 + mapcomposer/app/templates/composer.html | 5 + mapcomposer/app/templates/manager.html | 9 +- mapcomposer/app/templates/viewer.html | 26 +-- mapcomposer/buildjs.cfg | 6 +- 21 files changed, 538 insertions(+), 31 deletions(-) create mode 100644 mapcomposer/app/static/externals/cookiechoices/LICENSE create mode 100644 mapcomposer/app/static/externals/cookiechoices/cookiechoices.css create mode 100644 mapcomposer/app/static/externals/cookiechoices/cookiechoices.js diff --git a/mapcomposer/app/static/config/managerConfig.js b/mapcomposer/app/static/config/managerConfig.js index 6b5534c72..9b723193d 100644 --- a/mapcomposer/app/static/config/managerConfig.js +++ b/mapcomposer/app/static/config/managerConfig.js @@ -36,6 +36,7 @@ "Español" ] ], + "cookieConsent":{"link":true}, "tools":[{ "ptype": "mxp_mapmanager", "loginManager": "loginTool", diff --git a/mapcomposer/app/static/config/mapStoreConfig.js b/mapcomposer/app/static/config/mapStoreConfig.js index 675dbb8cf..0b7ca6142 100644 --- a/mapcomposer/app/static/config/mapStoreConfig.js +++ b/mapcomposer/app/static/config/mapStoreConfig.js @@ -22,6 +22,7 @@ "height": 100, "center": true }, + "cookieConsent":{"link":true}, "map": { "projection": "EPSG:900913", "units": "m", diff --git a/mapcomposer/app/static/config/viewerConfig.js b/mapcomposer/app/static/config/viewerConfig.js index d29eafbd6..71e1bea86 100644 --- a/mapcomposer/app/static/config/viewerConfig.js +++ b/mapcomposer/app/static/config/viewerConfig.js @@ -23,6 +23,8 @@ "center": [1250000.000000, 5370000.000000], "zoom": 5 }, + "cookieConsent":{"link":false}, + "loadingPanel": { "width": 100, "height": 100, diff --git a/mapcomposer/app/static/externals/cookiechoices/LICENSE b/mapcomposer/app/static/externals/cookiechoices/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/mapcomposer/app/static/externals/cookiechoices/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/mapcomposer/app/static/externals/cookiechoices/cookiechoices.css b/mapcomposer/app/static/externals/cookiechoices/cookiechoices.css new file mode 100644 index 000000000..63ad94eb9 --- /dev/null +++ b/mapcomposer/app/static/externals/cookiechoices/cookiechoices.css @@ -0,0 +1,51 @@ +#cookie-statement { + background-color: #5a5a5a; + + + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + color: #fff; + display: none; + font-weight: bold; + margin: 0 -15px; + padding-left: 0; + padding-right: 0; + position: absolute; + width: 100%; + z-index: 999 +} + +#cookieChoiceInfo.display { + display: block +} + +#cookieChoiceInfo .text { + padding: 0 15px; + display: block +} + +#cookieChoiceInfo a { + background-color: #303030; + border: 1px solid rgba(0, 0, 0, .1); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + color: #fff; + cursor: pointer; + line-height: 19px; + padding: 4px 8px; + text-decoration: none; + white-space: nowrap +} +#cookieChoiceInfo, #cookieChoiceInfo div { + background-color: #5a5a5a; + opacity: .8; + color: #fff; + font-weight: bold; + min-height: 40px; + text-align: center; + padding-top: 15px; + +} + diff --git a/mapcomposer/app/static/externals/cookiechoices/cookiechoices.js b/mapcomposer/app/static/externals/cookiechoices/cookiechoices.js new file mode 100644 index 000000000..f7158d505 --- /dev/null +++ b/mapcomposer/app/static/externals/cookiechoices/cookiechoices.js @@ -0,0 +1,171 @@ +/* + Copyright 2014 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +(function(window) { + + if (!!window.cookieChoices) { + return window.cookieChoices; + } + + var document = window.document; + // IE8 does not support textContent, so we should fallback to innerText. + var supportsTextContent = 'textContent' in document.body; + + var cookieChoices = (function() { + + var cookieName = 'displayCookieConsent'; + var cookieConsentId = 'cookieChoiceInfo'; + var dismissLinkId = 'cookieChoiceDismiss'; + + function _createHeaderElement(cookieText, dismissText, linkText, linkHref) { + var butterBarStyles = 'position:fixed;width:100%;' + + 'margin:0; left:0; top:0;z-index:1000;text-align:center;'; + + var cookieConsentElement = document.createElement('div'); + cookieConsentElement.id = cookieConsentId; + cookieConsentElement.style.cssText = butterBarStyles; + cookieConsentElement.appendChild(_createConsentText(cookieText)); + + if (!!linkText && !!linkHref) { + cookieConsentElement.appendChild(_createInformationLink(linkText, linkHref)); + } + cookieConsentElement.appendChild(_createDismissLink(dismissText)); + return cookieConsentElement; + } + + function _createDialogElement(cookieText, dismissText, linkText, linkHref) { + var glassStyle = 'position:fixed;width:100%;height:100%;z-index:999;' + + 'top:0;left:0;opacity:0.5;filter:alpha(opacity=50);' + + 'background-color:#ccc;'; + var dialogStyle = 'z-index:1000;position:fixed;left:50%;top:50%'; + var contentStyle = 'position:relative;left:-50%;margin-top:-25%;' + + 'background-color:#fff;padding:20px;box-shadow:4px 4px 25px #888;'; + + var cookieConsentElement = document.createElement('div'); + cookieConsentElement.id = cookieConsentId; + + var glassPanel = document.createElement('div'); + glassPanel.style.cssText = glassStyle; + + var content = document.createElement('div'); + content.style.cssText = contentStyle; + + var dialog = document.createElement('div'); + dialog.style.cssText = dialogStyle; + + var dismissLink = _createDismissLink(dismissText); + dismissLink.style.display = 'block'; + dismissLink.style.textAlign = 'right'; + dismissLink.style.marginTop = '8px'; + + content.appendChild(_createConsentText(cookieText)); + if (!!linkText && !!linkHref) { + content.appendChild(_createInformationLink(linkText, linkHref)); + } + content.appendChild(dismissLink); + dialog.appendChild(content); + cookieConsentElement.appendChild(glassPanel); + cookieConsentElement.appendChild(dialog); + return cookieConsentElement; + } + + function _setElementText(element, text) { + if (supportsTextContent) { + element.textContent = text; + } else { + element.innerText = text; + } + } + + function _createConsentText(cookieText) { + var consentText = document.createElement('span'); + _setElementText(consentText, cookieText); + return consentText; + } + + function _createDismissLink(dismissText) { + var dismissLink = document.createElement('a'); + _setElementText(dismissLink, dismissText); + dismissLink.id = dismissLinkId; + dismissLink.href = '#'; + dismissLink.style.marginLeft = '24px'; + return dismissLink; + } + + function _createInformationLink(linkText, linkHref) { + var infoLink = document.createElement('a'); + _setElementText(infoLink, linkText); + infoLink.href = linkHref; + infoLink.target = '_blank'; + infoLink.style.marginLeft = '8px'; + return infoLink; + } + + function _dismissLinkClick() { + _saveUserPreference(); + _removeCookieConsent(); + return false; + } + + function _showCookieConsent(cookieText, dismissText, linkText, linkHref, isDialog) { + if (_shouldDisplayConsent()) { + _removeCookieConsent(); + var consentElement = (isDialog) ? + _createDialogElement(cookieText, dismissText, linkText, linkHref) : + _createHeaderElement(cookieText, dismissText, linkText, linkHref); + var fragment = document.createDocumentFragment(); + fragment.appendChild(consentElement); + document.body.appendChild(fragment.cloneNode(true)); + document.getElementById(dismissLinkId).onclick = _dismissLinkClick; + } + } + + function showCookieConsentBar(cookieText, dismissText, linkText, linkHref) { + _showCookieConsent(cookieText, dismissText, linkText, linkHref, false); + } + + function showCookieConsentDialog(cookieText, dismissText, linkText, linkHref) { + _showCookieConsent(cookieText, dismissText, linkText, linkHref, true); + } + + function _removeCookieConsent() { + var cookieChoiceElement = document.getElementById(cookieConsentId); + if (cookieChoiceElement != null) { + cookieChoiceElement.parentNode.removeChild(cookieChoiceElement); + } + } + + function _saveUserPreference() { + // Set the cookie expiry to one year after today. + var expiryDate = new Date(); + expiryDate.setFullYear(expiryDate.getFullYear() + 1); + document.cookie = cookieName + '=y; expires=' + expiryDate.toGMTString(); + } + + function _shouldDisplayConsent() { + // Display the header only if the cookie has not been set. + return !document.cookie.match(new RegExp(cookieName + '=([^;]+)')); + } + + var exports = {}; + exports.showCookieConsentBar = showCookieConsentBar; + exports.showCookieConsentDialog = showCookieConsentDialog; + return exports; + })(); + + window.cookieChoices = cookieChoices; + return cookieChoices; +})(this); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/de.js b/mapcomposer/app/static/externals/mapmanager/translations/de.js index 4b95e3ef2..ff599af5c 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/de.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/de.js @@ -337,5 +337,12 @@ GeoExt.Lang.add("de", { successText: "Erfolg", errorText:"Error", runSuccessText: "Der Arbeitsablauf wurde erfolgreich begonnen
" - } + }, + "cookieChoices": { + "cookieText": "Cookies erleichtern die Bereitstellung unserer Dienste. Mit der Nutzung unserer Dienste erklären Sie sich damit einverstanden, dass wir Cookies verwenden.", + "dismissText": "OK", + "linkText":"Weitere Informationen", + "linkHref":"http://google.com" + + } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/en.js b/mapcomposer/app/static/externals/mapmanager/translations/en.js index c4bb22946..a8fb6eb19 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/en.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/en.js @@ -337,5 +337,11 @@ GeoExt.Lang.add("en", { successText: "Success", errorText:"Error", runSuccessText: "The workflow has been started successfully
" - } + }, + "cookieChoices": { + "cookieText": "Cookies help us deliver our services. By using our services, you agree to our use of cookies.", + "dismissText": "Got it", + "linkText":"Learn more", + "linkHref":"http://google.com" + } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/es.js b/mapcomposer/app/static/externals/mapmanager/translations/es.js index 16f2aa2b7..1ff64998e 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/es.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/es.js @@ -337,5 +337,12 @@ GeoExt.Lang.add("es", { successText: "Éxito", errorText:"Error", runSuccessText: "El flujo de trabajo se ha iniciado con éxito
" - } + }, + "cookieChoices": { + "cookieText": "Las cookies nos ayudan a ofrecer nuestros servicios. Al utilizarlos, usted acepta el uso de cookies.", + "dismissText": "Entendido", + "linkText":"Más información", + "linkHref":"http://google.com" + + } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/fr.js b/mapcomposer/app/static/externals/mapmanager/translations/fr.js index 32105d8fc..c8fcf6d3a 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/fr.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/fr.js @@ -336,5 +336,12 @@ GeoExt.Lang.add("fr", { successText: "Succès", errorText:"Error", runSuccessText: "Le flux de travail a été lancé avec succès
" - } + }, + + "cookieChoices": { + "cookieText": "Les cookies nous permettent de vous proposer nos services plus facilement. En utilisant nos services, vous nous donnez expressément votre accord pour exploiter ces cookies.", + "dismissText": "OK", + "linkText":"En Savoir plus", + "linkHref":"http://google.com" + } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/it.js b/mapcomposer/app/static/externals/mapmanager/translations/it.js index 2ac5740f0..4dacea491 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/it.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/it.js @@ -336,5 +336,12 @@ GeoExt.Lang.add("it", { successText: "Successo", errorText:"Errore", runSuccessText: "Il flusso è stato avviato correttamente
" - } + }, + "cookieChoices": { + "cookieText": "I cookie ci aiutano ad erogare servizi di qualità. Utilizzando i nostri servizi, l'utente accetta le nostre modalità d'uso dei cookie.", + "dismissText": "Accetto", + "linkText":"Dettagli", + "linkHref":"http://google.com" + + } }); diff --git a/mapcomposer/app/static/translations/de.js b/mapcomposer/app/static/translations/de.js index 651f15bb2..f73824bb3 100644 --- a/mapcomposer/app/static/translations/de.js +++ b/mapcomposer/app/static/translations/de.js @@ -1029,5 +1029,13 @@ GeoExt.Lang.add("de", { showExecutionIdText: "Zeige ID", processIdentifierText: "Kennzeichnung", downloadIdTitle: "Download ID" - } + }, + + "cookieChoices": { + "cookieText": "Cookies erleichtern die Bereitstellung unserer Dienste. Mit der Nutzung unserer Dienste erklären Sie sich damit einverstanden, dass wir Cookies verwenden.", + "dismissText": "OK", + "linkText":"Weitere Informationen", + "linkHref":"http://google.com" + + } }); diff --git a/mapcomposer/app/static/translations/en.js b/mapcomposer/app/static/translations/en.js index 0c899e7da..4913fe905 100644 --- a/mapcomposer/app/static/translations/en.js +++ b/mapcomposer/app/static/translations/en.js @@ -1016,5 +1016,12 @@ GeoExt.Lang.add("en", { showExecutionIdText: "Show Execution ID", processIdentifierText: "Identifier", downloadIdTitle: "Download ID" - } + }, + "cookieChoices": { + "cookieText": "Cookies help us deliver our services. By using our services, you agree to our use of cookies.", + "dismissText": "Got it", + "linkText":"Learn more", + "linkHref":"http://google.com" + + } }); diff --git a/mapcomposer/app/static/translations/es.js b/mapcomposer/app/static/translations/es.js index abe777abe..aacb79979 100644 --- a/mapcomposer/app/static/translations/es.js +++ b/mapcomposer/app/static/translations/es.js @@ -858,5 +858,12 @@ GeoExt.Lang.add("es", { "gxp.plugins.StaticPage.prototype": { tabTitle: "Página estática" - } + }, + "cookieChoices": { + "cookieText": "Las cookies nos ayudan a ofrecer nuestros servicios. Al utilizarlos, usted acepta el uso de cookies.", + "dismissText": "Entendido", + "linkText":"Más información", + "linkHref":"http://google.com" + + } }); diff --git a/mapcomposer/app/static/translations/fr.js b/mapcomposer/app/static/translations/fr.js index 3d11f9d95..9cca52dc5 100644 --- a/mapcomposer/app/static/translations/fr.js +++ b/mapcomposer/app/static/translations/fr.js @@ -902,7 +902,14 @@ GeoExt.Lang.add("fr", { "gxp.plugins.StaticPage.prototype": { tabTitle: "Page Statique" - } + } , + + "cookieChoices": { + "cookieText": "Les cookies nous permettent de vous proposer nos services plus facilement. En utilisant nos services, vous nous donnez expressément votre accord pour exploiter ces cookies.", + "dismissText": "OK", + "linkText":"En Savoir plus", + "linkHref":"http://google.com" + } }); diff --git a/mapcomposer/app/static/translations/it.js b/mapcomposer/app/static/translations/it.js index bb599c220..72ac63f01 100644 --- a/mapcomposer/app/static/translations/it.js +++ b/mapcomposer/app/static/translations/it.js @@ -7,6 +7,7 @@ */ GeoExt.Lang.add("it", { + "GeoExplorer.prototype": { zoomSliderText: "
Livello di Zoom: {zoom}
Scala: 1:{scale}
", loadConfigErrorText: "Impossibile leggere la configurazione salvata :
", @@ -1030,5 +1031,13 @@ GeoExt.Lang.add("it", { showExecutionIdText: "Mostra ID", processIdentifierText: "Identificatore", downloadIdTitle: "ID Download" - } + }, + "cookieChoices": { + "cookieText": "I cookie ci aiutano ad erogare servizi di qualità. Utilizzando i nostri servizi, l'utente accetta le nostre modalità d'uso dei cookie.", + "dismissText": "Accetto", + "linkText":"Dettagli", + "linkHref":"http://google.com" + + } + }); diff --git a/mapcomposer/app/templates/base.html b/mapcomposer/app/templates/base.html index b493fa6a5..b74e85eaa 100644 --- a/mapcomposer/app/templates/base.html +++ b/mapcomposer/app/templates/base.html @@ -12,10 +12,13 @@ + + <% render extrahead %> <% render content %>
+ diff --git a/mapcomposer/app/templates/composer.html b/mapcomposer/app/templates/composer.html index 4dca26f66..e1db50544 100644 --- a/mapcomposer/app/templates/composer.html +++ b/mapcomposer/app/templates/composer.html @@ -552,6 +552,11 @@ resources ); }; + /*Consent cookie text and link from transaltion files, google cookieChoices.js lib must be added to page's body*/ + if(serverConfig.cookieConsent && cookieChoices.cookieText && !parent.manager){ + cookieChoices.showCookieConsentBar(cookieChoices.cookieText, + cookieChoices.dismissText, (serverConfig.cookieConsent.link)?cookieChoices.linkText:null, cookieChoices.linkHref); + }; }; // geostore base diff --git a/mapcomposer/app/templates/manager.html b/mapcomposer/app/templates/manager.html index 27b7783ce..6c77afa1f 100644 --- a/mapcomposer/app/templates/manager.html +++ b/mapcomposer/app/templates/manager.html @@ -48,7 +48,7 @@ - + \ No newline at end of file diff --git a/mapcomposer/app/templates/viewer.html b/mapcomposer/app/templates/viewer.html index 3c7393b58..b53d090ef 100644 --- a/mapcomposer/app/templates/viewer.html +++ b/mapcomposer/app/templates/viewer.html @@ -1,16 +1,5 @@ - - - - - Map Viewer - - - - - - - - +<% extends ./base.html %> +<% subskin extrahead %> @@ -411,6 +400,11 @@ resources ); }; + /*Consent cookie text and link from transaltion files, google cookieChoices.js lib must be added to page's body*/ + if(serverConfig.cookieConsent && cookieChoices.cookieText){ + cookieChoices.showCookieConsentBar(cookieChoices.cookieText, + cookieChoices.dismissText, (serverConfig.cookieConsent.link)?cookieChoices.linkText:null, cookieChoices.linkHref); + }; }; Ext.Ajax.request({ @@ -451,9 +445,3 @@ }); - - - <% render content %> -
- - diff --git a/mapcomposer/buildjs.cfg b/mapcomposer/buildjs.cfg index 6b473dd63..55336c19c 100644 --- a/mapcomposer/buildjs.cfg +++ b/mapcomposer/buildjs.cfg @@ -441,4 +441,8 @@ include = root = app/static/script/common include = data/GeoStoreStore.js - + +[cookiechoices.js] +root = app/static/externals/cookiechoices +include = + cookiechoices.js \ No newline at end of file From b6ad579c6a878c3cddf54c78ce754d36fa5e9657 Mon Sep 17 00:00:00 2001 From: kappu Date: Tue, 7 Jul 2015 16:57:37 +0200 Subject: [PATCH 2/5] Added Itanlin and English explanation about cookies we use. Modified configuration setting --- .../app/static/config/managerConfig.js | 2 +- .../app/static/config/mapStoreConfig.js | 2 +- mapcomposer/app/static/config/viewerConfig.js | 2 +- mapcomposer/app/static/cookies-policy-en.html | 133 +++++++++++++++++ mapcomposer/app/static/cookies-policy-it.html | 138 ++++++++++++++++++ .../externals/mapmanager/translations/de.js | 2 +- .../externals/mapmanager/translations/en.js | 4 +- .../externals/mapmanager/translations/es.js | 2 +- .../externals/mapmanager/translations/fr.js | 2 +- .../externals/mapmanager/translations/it.js | 2 +- mapcomposer/app/static/translations/de.js | 2 +- mapcomposer/app/static/translations/en.js | 4 +- mapcomposer/app/static/translations/es.js | 2 +- mapcomposer/app/static/translations/fr.js | 2 +- mapcomposer/app/static/translations/it.js | 2 +- mapcomposer/app/templates/composer.html | 2 +- mapcomposer/app/templates/manager.html | 2 +- mapcomposer/app/templates/viewer.html | 2 +- 18 files changed, 289 insertions(+), 18 deletions(-) create mode 100644 mapcomposer/app/static/cookies-policy-en.html create mode 100644 mapcomposer/app/static/cookies-policy-it.html diff --git a/mapcomposer/app/static/config/managerConfig.js b/mapcomposer/app/static/config/managerConfig.js index 9b723193d..0215d119d 100644 --- a/mapcomposer/app/static/config/managerConfig.js +++ b/mapcomposer/app/static/config/managerConfig.js @@ -36,7 +36,7 @@ "Español" ] ], - "cookieConsent":{"link":true}, + "cookieConsent":true, "tools":[{ "ptype": "mxp_mapmanager", "loginManager": "loginTool", diff --git a/mapcomposer/app/static/config/mapStoreConfig.js b/mapcomposer/app/static/config/mapStoreConfig.js index 0b7ca6142..935ab9962 100644 --- a/mapcomposer/app/static/config/mapStoreConfig.js +++ b/mapcomposer/app/static/config/mapStoreConfig.js @@ -22,7 +22,7 @@ "height": 100, "center": true }, - "cookieConsent":{"link":true}, + "cookieConsent":true, "map": { "projection": "EPSG:900913", "units": "m", diff --git a/mapcomposer/app/static/config/viewerConfig.js b/mapcomposer/app/static/config/viewerConfig.js index 71e1bea86..aec6826e5 100644 --- a/mapcomposer/app/static/config/viewerConfig.js +++ b/mapcomposer/app/static/config/viewerConfig.js @@ -23,7 +23,7 @@ "center": [1250000.000000, 5370000.000000], "zoom": 5 }, - "cookieConsent":{"link":false}, + "cookieConsent":true, "loadingPanel": { "width": 100, diff --git a/mapcomposer/app/static/cookies-policy-en.html b/mapcomposer/app/static/cookies-policy-en.html new file mode 100644 index 000000000..882567c18 --- /dev/null +++ b/mapcomposer/app/static/cookies-policy-en.html @@ -0,0 +1,133 @@ + + + + Privacy e Cookies Policy + + + + + +
+
+ +
+

Privacy e Cookies Policy

+
+

+ In accordance with Legislative Decree No. 196/2003, which replaced the Law No. 675/1996 regarding + Personal Data Protection, we inform you that continuing navigation on this site you consent + the processing of your personal data (sensitive information will not be treated in any way). + Your data will only be used for operations at the site and will not be + disclosed to third party companies without your consent. In any case, it is possible + exercise the rights granted to you under the Legislative Decree 196/2003 (access to data, + updating, cancellation). + If you click the "Agree" button, you acknowledge that you have read this text and consent to treatment + of personal data. At any time you can ask the staff of the site to delete you from + service. +

+ +

Cosa sono i Cookies

+ +

+ A cookie is a small piece of text sent to your browser by a website you visit. + It helps the website to remember information about your visit, like your preferred language and other settings. + That can make your next visit easier and the site more useful to you. + The browser saves the information and forward it to the site server when you visit again + that website. +

+ +

+ Our cookies help us to: +

+ +
    +
  • Make our website work as you'd expect
    • +
  • Remember your settings during and between visits
    • +
  • Improve the performance/security of our website
    • +
  • Allow you to share pages with social networks like Facebook
    • +
+ +

+ We do not use cookies to: +

+ +
    +
  • Collect any personally identifiable information (without your express permission)
    • +
  • Collect any sensitive information (without your express permission)
    • +
  • Pass data to advertising networks
    • +
+

+ You can learn more about all the cookies we use below. +

+ +

+ If the settings on your software that you are using to view this website (your browser) are adjusted to accept cookies we take this, and your continued use of our website, to mean that you are fine with this. Should you wish to remove or not use cookies from our site you can learn how to do this below, however doing so will likely mean that our site will not work as you would expect. +

+ +

I nostri Cookies

+ +

+ We use cookies to make our site work, including: +

+ +
    +
  • Determining if you are logged in or not
    • +
  • Authentication to services WMS, WFS, WPS through HTTP requests
    • +
+ +

Social Website Cookies

+

+ To facilitate easy sharing or liking of content on social network platforms such Facebook and Twitter, we have included sharing buttons on our site. Cookies are enabled for: +

+ +
    +
  • Twitter
    • +
  • Facebook
    • +
+

+ The privacy implications on this will vary from social network to social network and will be dependent on the privacy settings you have chosen on these networks. +

+

Disabilitare i Cookies

+ +

+ All browsers allow you to manage which cookies you accept, reject and delete via controls found under the ‘Preferences' or ‘Tools' menu. Further information on deleting or controlling cookies is available + here). + Please note however that if you disable cookies you may not be able to access certain services or facilities of this as of many of the Web sites around the world (cookies are a standard component of most modern websites). +

+ +


+ +
+
+
+ + \ No newline at end of file diff --git a/mapcomposer/app/static/cookies-policy-it.html b/mapcomposer/app/static/cookies-policy-it.html new file mode 100644 index 000000000..691eb6928 --- /dev/null +++ b/mapcomposer/app/static/cookies-policy-it.html @@ -0,0 +1,138 @@ + + + + Privacy e Cookies Policy + + + + + +
+
+ +
+

Privacy e Cookies Policy

+
+

+ Ai sensi del Decreto Legislativo n ° 196/2003, che ha sostituito la legge n ° 675/1996 in materia di + protezione dei dati personali, Vi informiamo che proseguendo la navigazione su questo sito voi acconsentite + al trattamento dei vostri dati personali (i dati sensibili non saranno trattati in alcun modo). + I suoi dati saranno utilizzati esclusivamente per le operazioni all'interno del sito e non potranno essere + comunicati a società di terze parti senza il vostro consenso. In ogni caso, è possibile + esercitare i diritti concessi all'utente ai sensi del Decreto Legislativo n ° 196/2003 (accesso ai dati, + aggiornamento, integrazione, cancellazione). + Facendo clic sul pulsante "Accetto", si dichiara di aver letto questo testo e di acconsentire al trattamento + dei dati personali. In qualsiasi momento è possibile chiedere alla redazione del sito di cancellarti dal + servizio. +

+ +

Cosa sono i Cookies

+ +

+ Un cookie è un file di testo che un sito web salva sul browser del computer dell’utente. Solitamente i cookie + consentono di memorizzare le preferenze espresse dall’utente per non dover essere reinserite successivamente. + Il browser salva l’informazione e la ritrasmette al server del sito nel momento in cui l’utente visita nuovamente + quel sito web. +

+ +

+ I nostri cookie ci aiutano a: +

+ +
    +
  • Permettere al sito web di lavorare come atteso
    • +
  • Ricordare le impostazioni durante e tra le visite al sito
    • +
  • Migliorare la velocità / sicurezza del sito
    • +
  • Permette di condividere le pagine con i social network come Facebook
    • +
+ +

+ Non viene fatto uso di cookies per: +

+ +
    +
  • Raccogliere tutte le informazioni di identificazione personale (senza il vostro consenso)
    • +
  • Raccogliere tutte le informazioni sensibili (senza il tuo esplicito consenso)
    • +
  • Passare i dati alle reti pubblicitarie
    • +
+

+ Potete saperne di più su tutti i cookies che utilizziamo qui sotto. +

+ +

+ Se le impostazioni del software che si sta utilizzando per la navigazione del sito (il browser) sono regolati per accettare + i cookies prendiamo questo, e l'uso continuato del nostro sito web, a significare che si acconsente all'utilizzo di cookies. + Se si desidera rimuovere o non usare i cookies dal nostro sito lo si può fare seguendo le indicazioni riportate di seguito, + così facendo tuttavia il nostro sito potrebbe non funzionare come ci si aspetterebbe. +

+ +

I nostri Cookies

+ +

+ Utilizziamo i cookie per garantire determinate funzionalità del sito web tra cui: +

+ +
    +
  • Operazioni di Login e successive autenticazioni
    • +
  • Autenticazione a servizi WMS, WFS, WPS attraverso richieste HTTP
    • +
+ +

Social Website Cookies

+

+ Tu puoi facilmente esprimere il tuo gradimento o condividere alcuni contenuti su Facebook e Twitter (abbiamo incluso + i pulsanti di condivisione sul nostro sito). I cookies sono stati abilitati per: +

+ +
    +
  • Twitter
    • +
  • Facebook
    • +
+

+ Le implicazioni di privacy su questo variano da social network a social network e dipenderanno dalle impostazioni di privacy + che avete scelto su queste reti. +

+

Disabilitare i Cookies

+ +

+ Di solito è possibile disattivare i cookies modificando le impostazioni del browser per impedire l'uso degli stessi (vedi + qui). + In questo modo però probabilmente si limiteranno le funzionalità del nostro come di molti dei siti web di tutto il mondo (i cookie + sono una componente standard della maggior parte dei siti web moderni). +

+ +


+ +
+
+
+ + \ No newline at end of file diff --git a/mapcomposer/app/static/externals/mapmanager/translations/de.js b/mapcomposer/app/static/externals/mapmanager/translations/de.js index ff599af5c..e2d575217 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/de.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/de.js @@ -342,7 +342,7 @@ GeoExt.Lang.add("de", { "cookieText": "Cookies erleichtern die Bereitstellung unserer Dienste. Mit der Nutzung unserer Dienste erklären Sie sich damit einverstanden, dass wir Cookies verwenden.", "dismissText": "OK", "linkText":"Weitere Informationen", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/en.js b/mapcomposer/app/static/externals/mapmanager/translations/en.js index a8fb6eb19..ea2bfd087 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/en.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/en.js @@ -340,8 +340,8 @@ GeoExt.Lang.add("en", { }, "cookieChoices": { "cookieText": "Cookies help us deliver our services. By using our services, you agree to our use of cookies.", - "dismissText": "Got it", + "dismissText": "I Agree", "linkText":"Learn more", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/es.js b/mapcomposer/app/static/externals/mapmanager/translations/es.js index 1ff64998e..eff40cf11 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/es.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/es.js @@ -342,7 +342,7 @@ GeoExt.Lang.add("es", { "cookieText": "Las cookies nos ayudan a ofrecer nuestros servicios. Al utilizarlos, usted acepta el uso de cookies.", "dismissText": "Entendido", "linkText":"Más información", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/fr.js b/mapcomposer/app/static/externals/mapmanager/translations/fr.js index c8fcf6d3a..2f9639220 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/fr.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/fr.js @@ -342,6 +342,6 @@ GeoExt.Lang.add("fr", { "cookieText": "Les cookies nous permettent de vous proposer nos services plus facilement. En utilisant nos services, vous nous donnez expressément votre accord pour exploiter ces cookies.", "dismissText": "OK", "linkText":"En Savoir plus", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/externals/mapmanager/translations/it.js b/mapcomposer/app/static/externals/mapmanager/translations/it.js index 4dacea491..87becc614 100644 --- a/mapcomposer/app/static/externals/mapmanager/translations/it.js +++ b/mapcomposer/app/static/externals/mapmanager/translations/it.js @@ -341,7 +341,7 @@ GeoExt.Lang.add("it", { "cookieText": "I cookie ci aiutano ad erogare servizi di qualità. Utilizzando i nostri servizi, l'utente accetta le nostre modalità d'uso dei cookie.", "dismissText": "Accetto", "linkText":"Dettagli", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-it.html" } }); diff --git a/mapcomposer/app/static/translations/de.js b/mapcomposer/app/static/translations/de.js index f73824bb3..f75b2ef0d 100644 --- a/mapcomposer/app/static/translations/de.js +++ b/mapcomposer/app/static/translations/de.js @@ -1035,7 +1035,7 @@ GeoExt.Lang.add("de", { "cookieText": "Cookies erleichtern die Bereitstellung unserer Dienste. Mit der Nutzung unserer Dienste erklären Sie sich damit einverstanden, dass wir Cookies verwenden.", "dismissText": "OK", "linkText":"Weitere Informationen", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/translations/en.js b/mapcomposer/app/static/translations/en.js index 4913fe905..b7b7450ad 100644 --- a/mapcomposer/app/static/translations/en.js +++ b/mapcomposer/app/static/translations/en.js @@ -1019,9 +1019,9 @@ GeoExt.Lang.add("en", { }, "cookieChoices": { "cookieText": "Cookies help us deliver our services. By using our services, you agree to our use of cookies.", - "dismissText": "Got it", + "dismissText": "I Agree", "linkText":"Learn more", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/translations/es.js b/mapcomposer/app/static/translations/es.js index aacb79979..289fa536e 100644 --- a/mapcomposer/app/static/translations/es.js +++ b/mapcomposer/app/static/translations/es.js @@ -863,7 +863,7 @@ GeoExt.Lang.add("es", { "cookieText": "Las cookies nos ayudan a ofrecer nuestros servicios. Al utilizarlos, usted acepta el uso de cookies.", "dismissText": "Entendido", "linkText":"Más información", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/translations/fr.js b/mapcomposer/app/static/translations/fr.js index 9cca52dc5..5107c7487 100644 --- a/mapcomposer/app/static/translations/fr.js +++ b/mapcomposer/app/static/translations/fr.js @@ -908,7 +908,7 @@ GeoExt.Lang.add("fr", { "cookieText": "Les cookies nous permettent de vous proposer nos services plus facilement. En utilisant nos services, vous nous donnez expressément votre accord pour exploiter ces cookies.", "dismissText": "OK", "linkText":"En Savoir plus", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-en.html" } }); diff --git a/mapcomposer/app/static/translations/it.js b/mapcomposer/app/static/translations/it.js index 72ac63f01..00262c32e 100644 --- a/mapcomposer/app/static/translations/it.js +++ b/mapcomposer/app/static/translations/it.js @@ -1036,7 +1036,7 @@ GeoExt.Lang.add("it", { "cookieText": "I cookie ci aiutano ad erogare servizi di qualità. Utilizzando i nostri servizi, l'utente accetta le nostre modalità d'uso dei cookie.", "dismissText": "Accetto", "linkText":"Dettagli", - "linkHref":"http://google.com" + "linkHref":"cookies-policy-it.html" } diff --git a/mapcomposer/app/templates/composer.html b/mapcomposer/app/templates/composer.html index e1db50544..18ff76b8b 100644 --- a/mapcomposer/app/templates/composer.html +++ b/mapcomposer/app/templates/composer.html @@ -555,7 +555,7 @@ /*Consent cookie text and link from transaltion files, google cookieChoices.js lib must be added to page's body*/ if(serverConfig.cookieConsent && cookieChoices.cookieText && !parent.manager){ cookieChoices.showCookieConsentBar(cookieChoices.cookieText, - cookieChoices.dismissText, (serverConfig.cookieConsent.link)?cookieChoices.linkText:null, cookieChoices.linkHref); + cookieChoices.dismissText, cookieChoices.linkText, cookieChoices.linkHref); }; }; diff --git a/mapcomposer/app/templates/manager.html b/mapcomposer/app/templates/manager.html index 6c77afa1f..1ef0c9eb0 100644 --- a/mapcomposer/app/templates/manager.html +++ b/mapcomposer/app/templates/manager.html @@ -147,7 +147,7 @@ /*Consent cookie text and link from transaltion files, google cookieChoices.js lib must be added to page's body*/ if(serverConfig.cookieConsent && cookieChoices.cookieText){ cookieChoices.showCookieConsentBar(cookieChoices.cookieText, - cookieChoices.dismissText, (serverConfig.cookieConsent.link)?cookieChoices.linkText:null, cookieChoices.linkHref); + cookieChoices.dismissText, cookieChoices.linkText, cookieChoices.linkHref); } }; diff --git a/mapcomposer/app/templates/viewer.html b/mapcomposer/app/templates/viewer.html index b53d090ef..39b6931e4 100644 --- a/mapcomposer/app/templates/viewer.html +++ b/mapcomposer/app/templates/viewer.html @@ -403,7 +403,7 @@ /*Consent cookie text and link from transaltion files, google cookieChoices.js lib must be added to page's body*/ if(serverConfig.cookieConsent && cookieChoices.cookieText){ cookieChoices.showCookieConsentBar(cookieChoices.cookieText, - cookieChoices.dismissText, (serverConfig.cookieConsent.link)?cookieChoices.linkText:null, cookieChoices.linkHref); + cookieChoices.dismissText, cookieChoices.linkText, cookieChoices.linkHref); }; }; From 9da68c0814660cb6ac2baf43cf0120e2fbef9c15 Mon Sep 17 00:00:00 2001 From: kappu Date: Wed, 8 Jul 2015 10:57:32 +0200 Subject: [PATCH 3/5] fixed paragraph title --- mapcomposer/app/static/cookies-policy-en.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapcomposer/app/static/cookies-policy-en.html b/mapcomposer/app/static/cookies-policy-en.html index 882567c18..16d724faf 100644 --- a/mapcomposer/app/static/cookies-policy-en.html +++ b/mapcomposer/app/static/cookies-policy-en.html @@ -55,7 +55,7 @@

Privacy e Cookies Policy

service.

-

Cosa sono i Cookies

+

What are Cookies

A cookie is a small piece of text sent to your browser by a website you visit. From baf180a1337dc2cd08b3ed8f9801d6ec9feaf9e8 Mon Sep 17 00:00:00 2001 From: kappu Date: Wed, 8 Jul 2015 11:05:14 +0200 Subject: [PATCH 4/5] fixed paragraph title --- mapcomposer/app/static/cookies-policy-en.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mapcomposer/app/static/cookies-policy-en.html b/mapcomposer/app/static/cookies-policy-en.html index 16d724faf..3632733ed 100644 --- a/mapcomposer/app/static/cookies-policy-en.html +++ b/mapcomposer/app/static/cookies-policy-en.html @@ -40,7 +40,7 @@

-

Privacy e Cookies Policy

+

Privacy and Cookies Policy

In accordance with Legislative Decree No. 196/2003, which replaced the Law No. 675/1996 regarding @@ -116,7 +116,7 @@

Social Website Cookies

The privacy implications on this will vary from social network to social network and will be dependent on the privacy settings you have chosen on these networks.

-

Disabilitare i Cookies

+

Controlling Cookies

All browsers allow you to manage which cookies you accept, reject and delete via controls found under the ‘Preferences' or ‘Tools' menu. Further information on deleting or controlling cookies is available From 345cc956f0bedb5f58089a4b4b19da8920c13523 Mon Sep 17 00:00:00 2001 From: kappu Date: Wed, 8 Jul 2015 12:18:53 +0200 Subject: [PATCH 5/5] fixed paragraph title --- mapcomposer/app/static/cookies-policy-en.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mapcomposer/app/static/cookies-policy-en.html b/mapcomposer/app/static/cookies-policy-en.html index 3632733ed..7e9295f74 100644 --- a/mapcomposer/app/static/cookies-policy-en.html +++ b/mapcomposer/app/static/cookies-policy-en.html @@ -93,12 +93,12 @@

What are Cookies

If the settings on your software that you are using to view this website (your browser) are adjusted to accept cookies we take this, and your continued use of our website, to mean that you are fine with this. Should you wish to remove or not use cookies from our site you can learn how to do this below, however doing so will likely mean that our site will not work as you would expect.

-

I nostri Cookies

+

Cookies set by our own Website

We use cookies to make our site work, including:

- +
  • Determining if you are logged in or not
  • Authentication to services WMS, WFS, WPS through HTTP requests