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 2457bbad74a668aa5d40125cbb1b189120ae4230 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 26 10:55:34 2017 +0200 Renomme le composant 'Privacy' en 'LegalNotices' --- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 ++-- .../src/main/web/tag/{Privacy.tag.html => LegalNotices.tag.html} | 7 +++---- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 8 ++++---- pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html | 2 +- 5 files changed, 12 insertions(+), 13 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 fbde0ab4..57415285 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -218,7 +218,7 @@ "footer_participate": "Get involved!", "footer_license": "Licence", "footer_gtu": "GTU", - "footer_privacy": "Privacy policy", + "footer_legalNotices": "Legal Notices", "header_signin": "SignIn", "header_signup": "SignUp", "header_signout": "Disconnect", @@ -581,5 +581,5 @@ "gtu_validation_after" : "", "gtu_change_title": "CGU has change", "gtu_change_action": "Accept", - "privacy_title": "Privacy policy" + "legalNotices_title": "Legal notices" } 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 47f8b0d8..d7461843 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -218,7 +218,7 @@ "footer_participate": "Contribuer au projet", "footer_license": "Licence", "footer_gtu": "CGU", - "footer_privacy": "Politique de confidentialité", + "footer_legalNotices": "Mentions légales", "header_signin": "Connexion", "header_signup": "Inscription", "header_signout": "Déconnexion", @@ -581,5 +581,5 @@ "gtu_validation_after" : "", "gtu_change_title": "Changement des CGU", "gtu_change_action": "Accepter", - "privacy_title": "Politique de confidentialité" + "legalNotices_title": "Mentions légales" } diff --git a/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html b/pollen-ui-riot-js/src/main/web/tag/LegalNotices.tag.html similarity index 86% rename from pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html rename to pollen-ui-riot-js/src/main/web/tag/LegalNotices.tag.html index 3f385b40..cfb95c14 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/LegalNotices.tag.html @@ -1,4 +1,4 @@ -<Privacy> +<LegalNotices> <div class="container" > @@ -14,8 +14,7 @@ <script type="es6"> this.session = require("../js/Session"); - this.installBundle(this.session, "privacy"); - + this.installBundle(this.session, "legalNotices"); </script> <style> @@ -26,4 +25,4 @@ } </style> -</Privacy> +</LegalNotices> 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 56d89608..8891c495 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,7 +26,7 @@ require("./SignIn.tag.html"); require("./SignUp.tag.html"); require("./SignCheck.tag.html"); require("./Home.tag.html"); -require("./Privacy.tag.html"); +require("./LegalNotices.tag.html"); require("./poll/EditPoll.tag.html"); require("./poll/Poll.tag.html"); require("./poll/Summary.tag.html"); @@ -259,9 +259,9 @@ require("./popup/GtuChangeModal.tag.html"); }); }); - route("/privacy", () => { - this.bus.trigger("pageChanged", "privacy"); - riot.mount(this.refs.content, "privacy"); + route("/legalNotices", () => { + this.bus.trigger("pageChanged", "legalNotices"); + riot.mount(this.refs.content, "legalnotices"); }); route(() => { 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 20f26865..2bb40f1d 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,7 +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> + <a href="#legalNotices">{__.legalNotices}</a> </div> <script type="es6"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.