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 9dbd4c8f77c72ee09dcee2833ef2d3dab6331227 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 23 16:57:16 2017 +0200 rebase sur develop --- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 21 +++++++++++---------- pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 10 deletions(-) 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 cfb3885c..31282eed 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 @@ -30,7 +30,6 @@ require("./SignInAction.tag.js"); require("./SignUp.tag.html"); require("./SignCheck.tag.html"); require("./ContentLoader.tag.html"); -require("./LegalNotices.tag.html"); require("./PageChanged.tag.js"); require("./FilterLoginProvider.tag.js"); require("./poll/EditPoll.tag.html"); @@ -73,22 +72,20 @@ require("./popup/GtuChangeModal.tag.html"); <route path=""> <FilterLoginProvider/> <Authorization connected-if-required="true"> - <ContentLoader path={locale => '/customData/home-${locale}.html'}/> + <ContentLoader path={parent.parent.parent.homePage}/> </Authorization> </route> <route path="privacy"> - <FilterLoginProvider/> <Authorization> - <Privacy/> - </Authorization> - </route> + <Privacy/> + </Authorization> + </route> <route path="legalNotices"> - <FilterLoginProvider/> - <Authorization> - <ContentLoader path={locale => '/customData/legalNotices-${locale}.html'}/> - </Authorization> + <Authorization> + <ContentLoader path={parent.parent.parent.legalNoticePage}/> + </Authorization> </route> <route path="poll/*/vote"> @@ -288,6 +285,10 @@ require("./popup/GtuChangeModal.tag.html"); }); }); + this.homePage = locale => "/customData/home-" + locale + ".html"; + + this.legalNoticePage = locale => "/customData/legalNotices-" + locale + ".html"; + window.onkeydown = e => { if (e.keyCode === 27) { this.bus.trigger("escape"); 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 index 3f385b40..25105629 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html @@ -1,3 +1,23 @@ +<!-- + #%L + Pollen :: UI RiotJs + %% + Copyright (C) 2009 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> <Privacy> <div class="container" > -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.