This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 1034cd47ab1a78642e7899c29569003faaa850e3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Sep 18 16:16:53 2017 +0200 Respect des recomandation de la CNIL lie au suivi par Piwick --- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 ++- pollen-ui-riot-js/src/main/web/js/PageTracker.js | 17 +++++++++++-- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 6 +++++ .../src/main/web/tag/PollenFooter.tag.html | 1 + .../src/main/web/tag/Privacy.tag.html | 29 ++++++++++++++++++++++ 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index cf9fd669..b162539b 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -215,6 +215,7 @@ "footer_participate": "Get involved!", "footer_license": "Licence", "footer_gtu": "GTU", + "footer_privacy": "Privacy policy", "header_signin": "SignIn", "header_signup": "SignUp", "header_signout": "Disconnect", @@ -570,5 +571,6 @@ "gtu_validation_link" : "general terms of use.", "gtu_validation_after" : "", "gtu_change_title": "CGU has change", - "gtu_change_action": "Accept" + "gtu_change_action": "Accept", + "privacy_title": "Privacy policy" } diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 578c0cb3..3fea5fed 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -215,6 +215,7 @@ "footer_participate": "Contribuer au projet", "footer_license": "Licence", "footer_gtu": "CGU", + "footer_privacy": "Politique de confidentialité", "header_signin": "Connexion", "header_signup": "Inscription", "header_signout": "Déconnexion", @@ -570,5 +571,6 @@ "gtu_validation_link" : "conditions générales d'utilisation.", "gtu_validation_after" : "", "gtu_change_title": "Changement des CGU", - "gtu_change_action": "Accepter" + "gtu_change_action": "Accepter", + "privacy_title": "Politique de confidentialité" } diff --git a/pollen-ui-riot-js/src/main/web/js/PageTracker.js b/pollen-ui-riot-js/src/main/web/js/PageTracker.js index 0de6ef0b..dfdd7759 100644 --- a/pollen-ui-riot-js/src/main/web/js/PageTracker.js +++ b/pollen-ui-riot-js/src/main/web/js/PageTracker.js @@ -5,6 +5,19 @@ class PageTracker { constructor() { window._paq = window._paq || []; if (pollenConf.piwikUrl && pollenConf.piwikSiteId) { + _paq.push([function() { + var self = this; + function getOriginalVisitorCookieTimeout() { + var now = new Date(), + nowTs = Math.round(now.getTime() / 1000), + visitorInfo = self.getVisitorInfo(); + var createTs = parseInt(visitorInfo[2]); + var cookieTimeout = 33696000; // 13 mois en secondes + var originalTimeout = createTs + cookieTimeout - nowTs; + return originalTimeout; + } + this.setVisitorCookieTimeout(getOriginalVisitorCookieTimeout()); + }]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); var u = pollenConf.piwikUrl; @@ -41,8 +54,8 @@ class PageTracker { } trackResults() { - this._track("results"); - } + this._track("results"); + } trackComments() { this._track("comments"); diff --git a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html index 85f7598f..9268f164 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html @@ -26,6 +26,7 @@ require("./SignIn.tag.html"); require("./SignUp.tag.html"); require("./SignCheck.tag.html"); require("./Home.tag.html"); +require("./Privacy.tag.html"); require("./poll/EditPoll.tag.html"); require("./poll/Poll.tag.html"); require("./poll/Summary.tag.html"); @@ -244,6 +245,11 @@ require("./popup/GtuChangeModal.tag.html"); riot.mount(this.refs.content, "loginproviders"); }); + route("/privacy", () => { + this.bus.trigger("pageChanged", "privacy"); + riot.mount(this.refs.content, "privacy"); + }); + route(() => { var q = route.query(); if (q.loginProvider != null) { diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html index 131d505b..20f26865 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html @@ -27,6 +27,7 @@ <a href="http://www.gnu.org/licenses/agpl.html">{__.license}</a> <a if={session.isGtu} href="{session.configuration.endPoint}/v1/gtu" target="_blank">{__.gtu}</a> <a href="http://www.codelutin.com/" target="_blank">Code Lutin</a> + <a if={session.configuration.piwikUrl} href="#privacy">{__.privacy}</a> </div> <script type="es6"> diff --git a/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html b/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html new file mode 100644 index 00000000..3f385b40 --- /dev/null +++ b/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html @@ -0,0 +1,29 @@ +<Privacy> + + <div class="container" > + + <h1>{__.title}</h1> + + <div class="main-content"> + <iframe class="piwik-privacy" + if={session.configuration.piwikUrl} + src="{session.configuration.piwikUrl}index.php?module=CoreAdminHome&action=optOut&language={session.locale}"></iframe> + </div> + + </div> + + <script type="es6"> + this.session = require("../js/Session"); + this.installBundle(this.session, "privacy"); + + </script> + <style> + + .piwik-privacy { + border: 0; + height: 200px; + width: 100%; + } + + </style> +</Privacy> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.