This is an automated email from the git hooks/post-receive script. New commit to branch feature/41_mentions_legales in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 5d307666ea642fc33a05f9b2c78d0e0dcfd3c079 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 26 16:45:51 2017 +0200 Restaure la section Politique de confidentialité --- pollen-ui-riot-js/src/main/web/conf.js | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 ++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 10 ++++++++ .../src/main/web/tag/PollenFooter.tag.html | 1 + .../src/main/web/tag/Privacy.tag.html | 29 ++++++++++++++++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js index 5e1887b6..d0ac4384 100644 --- a/pollen-ui-riot-js/src/main/web/conf.js +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -20,7 +20,7 @@ */ window.pollenConf = { endPoint: POLLEN_API_URL, - piwikUrl: "", // add the piwik url, eg: http://localhost/piwik + piwikUrl: "toto", // add the piwik url, eg: http://localhost/piwik piwikSiteId: "", // add the site id, eg: 3 defaultMessageTimeout: 15, resourceMaxSize: 10000000 // octets => 10 Mo 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 2430db8f..aab9f664 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -230,6 +230,7 @@ "footer_license": "License", "footer_gtu": "GTU", "footer_legalNotices": "Legal Notices", + "footer_privacy": "Privacy policy", "header_signin": "SignIn", "header_signup": "SignUp", "header_signout": "Disconnect", @@ -613,6 +614,7 @@ "gtu_change_title": "CGU has change", "gtu_change_action": "Accept", "legalNotices_title": "Legal notices", + "privacy_title": "Privacy policy", "emailAddressList_emailAddresses": "Email addresses", "emailAddressList_resendValidation": "Send a new validation email", "emailAddressList_validationResent": "An email has been sent to {0}", 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 a37867b8..a1b3abaa 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -230,6 +230,7 @@ "footer_license": "Licence", "footer_gtu": "CGU", "footer_legalNotices": "Mentions légales", + "footer_privacy": "Politique de confidentialité", "header_signin": "Connexion", "header_signup": "Inscription", "header_signout": "Déconnexion", @@ -615,6 +616,7 @@ "gtu_change_title": "Changement des CGU", "gtu_change_action": "Accepter", "legalNotices_title": "Mentions légales", + "privacy_title": "Politique de confidentialité", "emailAddressList_emailAddresses": "Adresses électroniques", "emailAddressList_resendValidation": "Envoyer un nouveau courriel de validation de l'adresse électronique", "emailAddressList_validationResent": "Un courriel a été envoyé à l'adresse {0}", 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 b398e60c..5961ad66 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 @@ -38,6 +38,7 @@ require("./poll/Poll.tag.html"); require("./poll/Summary.tag.html"); require("./poll/Polls.tag.html"); require("./UserProfile.tag.html"); +require("./Privacy.tag.html"); require("./admin/Users.tag.html"); require("./admin/Gtus.tag.html"); require("./admin/LoginProviders.tag.html"); @@ -76,6 +77,15 @@ require("./popup/GtuChangeModal.tag.html"); </Authorization> </route> + + + <route path="privacy"> + <FilterLoginProvider/> + <Authorization connected-if-required="true"> + <Privacy/> + </Authorization> + </route> + <route path="poll/*/vote"> <Authorization connected-if-required="true"> <Poll poll-id={routeArguments[0]} 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 abf2a8f6..9bd43737 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 @@ -30,6 +30,7 @@ <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 href="http://codelutin.page.nuiton.org/pollen-sass/legalNotices-{session.locale}.html" target="_blank">{__.legalNotices}</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>.