branch feature/41_mentions_legales updated (5a778c5b -> 95bea2d4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/41_mentions_legales in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5a778c5b Supprime le tag concernant les mentions légales. new 95bea2d4 Restaure la section Politique de confidentialité The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 95bea2d4d20441fac6808af0cd7b3109c9a666f5 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 26 16:45:51 2017 +0200 Restaure la section Politique de confidentialité Summary of changes: pollen-ui-riot-js/src/main/web/conf.js | 2 +- 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/tag/Pollen.tag.html | 6 +++++ .../src/main/web/tag/PollenFooter.tag.html | 1 + .../src/main/web/tag/Privacy.tag.html | 29 ++++++++++++++++++++++ 6 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 95bea2d4d20441fac6808af0cd7b3109c9a666f5 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 | 4 ++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 ++- 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, 43 insertions(+), 3 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js index 5b5da95d..bbb07b7d 100644 --- a/pollen-ui-riot-js/src/main/web/conf.js +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -1,6 +1,6 @@ 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 57415285..d5eceebc 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -219,6 +219,7 @@ "footer_license": "Licence", "footer_gtu": "GTU", "footer_legalNotices": "Legal Notices", + "footer_privacy": "Privacy policy", "header_signin": "SignIn", "header_signup": "SignUp", "header_signout": "Disconnect", @@ -581,5 +582,6 @@ "gtu_validation_after" : "", "gtu_change_title": "CGU has change", "gtu_change_action": "Accept", - "legalNotices_title": "Legal notices" + "legalNotices_title": "Legal notices", + "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 d7461843..d0146ce2 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -219,6 +219,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", @@ -581,5 +582,6 @@ "gtu_validation_after" : "", "gtu_change_title": "Changement des CGU", "gtu_change_action": "Accepter", - "legalNotices_title": "Mentions légales" + "legalNotices_title": "Mentions légales", + "privacy_title": "Politique de confidentialité" } 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 6cde463b..bed9ddaa 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 @@ -31,6 +31,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"); @@ -258,6 +259,11 @@ require("./popup/GtuChangeModal.tag.html"); }); }); + 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 8dfc6172..383defb0 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 @@ -28,6 +28,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>.
participants (1)
-
chorem.org scm