From 6f305e369d64680672ccc9c322e87094d706f44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n?= <41774881+xentenza@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:51:49 +0100 Subject: [PATCH 1/2] Open Communication Guidelines - added Open Communication Guidelines to the news footer - corrected copyright date --- .../organisms/footer/footer-legal-news.twig | 41 ++++++++++++++++++ .../organisms/footer/footer-legal.twig | 6 +-- .../organisms/footer/footer-light-news.twig | 42 +++++++++++++++++++ assets/components/organisms/footer/footer.yml | 2 + .../pages/news-detail/news-detail.twig | 5 +++ .../pages/news-homepage/news-homepage.twig | 2 +- 6 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 assets/components/organisms/footer/footer-legal-news.twig create mode 100644 assets/components/organisms/footer/footer-light-news.twig diff --git a/assets/components/organisms/footer/footer-legal-news.twig b/assets/components/organisms/footer/footer-legal-news.twig new file mode 100644 index 000000000..031e7bfe3 --- /dev/null +++ b/assets/components/organisms/footer/footer-legal-news.twig @@ -0,0 +1,41 @@ +{% if language is not defined %}{% set language = 'fr' %}{% endif %} + +{% if language == 'fr' %} +
+
+ Accessibilité + Mentions légales + Protection des données + Charte +
+
+

© 2024 EPFL, tous droits réservés

+
+
+{% endif %} +{% if language == 'en' %} +
+
+ Accessibility + Disclaimer + Privacy policy + Charter +
+
+

© 2024 EPFL, all rights reserved

+
+
+{% endif %} +{% if language == 'de' %} +
+
+ Zugänglichkeit + Impressum + Datenschutzerklärung + Richtlinien +
+
+

© 2024 EPFL, alle Rechte vorbehalten

+
+
+{% endif %} diff --git a/assets/components/organisms/footer/footer-legal.twig b/assets/components/organisms/footer/footer-legal.twig index c05e94950..2586c3783 100644 --- a/assets/components/organisms/footer/footer-legal.twig +++ b/assets/components/organisms/footer/footer-legal.twig @@ -8,7 +8,7 @@ Protection des données
-

© 2023 EPFL, tous droits réservés

+

© 2024 EPFL, tous droits réservés

{% endif %} @@ -20,7 +20,7 @@ Privacy policy
-

© 2023 EPFL, all rights reserved

+

© 2024 EPFL, all rights reserved

{% endif %} @@ -32,7 +32,7 @@ Datenschutzerklärung
-

© 2023 EPFL, alle Rechte vorbehalten

+

© 2024 EPFL, alle Rechte vorbehalten

{% endif %} diff --git a/assets/components/organisms/footer/footer-light-news.twig b/assets/components/organisms/footer/footer-light-news.twig new file mode 100644 index 000000000..d084b4f93 --- /dev/null +++ b/assets/components/organisms/footer/footer-light-news.twig @@ -0,0 +1,42 @@ +{% if language is not defined %}{% set language = 'fr' %}{% endif %} + + + + diff --git a/assets/components/organisms/footer/footer.yml b/assets/components/organisms/footer/footer.yml index 16b994af8..834fd36d3 100644 --- a/assets/components/organisms/footer/footer.yml +++ b/assets/components/organisms/footer/footer.yml @@ -21,6 +21,8 @@ variants: title: Footer dark light notes: Add .bg-dark to the light container wrapper: bg-dark container + - name: light-news + title: Footer light for news notes: | ### Standard french diff --git a/assets/components/pages/news-detail/news-detail.twig b/assets/components/pages/news-detail/news-detail.twig index de268a7d0..09463879a 100644 --- a/assets/components/pages/news-detail/news-detail.twig +++ b/assets/components/pages/news-detail/news-detail.twig @@ -157,3 +157,8 @@ {% endblock %} + + {% block footer %} + {% include '@organisms/footer/footer-light-news.twig' %} + {% endblock %} + diff --git a/assets/components/pages/news-homepage/news-homepage.twig b/assets/components/pages/news-homepage/news-homepage.twig index 3497c6de0..7e838ec82 100644 --- a/assets/components/pages/news-homepage/news-homepage.twig +++ b/assets/components/pages/news-homepage/news-homepage.twig @@ -33,7 +33,7 @@
{% block footer %} - {% include '@organisms/footer/footer-light.twig' %} + {% include '@organisms/footer/footer-light-news.twig' %} {% endblock %}
From ccdab5befcb46b2c2f9bfe5eb4bcbcd41c983c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n?= <41774881+xentenza@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:28:02 +0100 Subject: [PATCH 2/2] ocg with conditions - first PR revocated (too many files) - introduction of conditions - corrected footer page/news-detail --- .../organisms/footer/footer-legal-news.twig | 41 ------------------ .../organisms/footer/footer-legal.twig | 9 ++++ .../organisms/footer/footer-light-news.twig | 42 ------------------- assets/components/organisms/footer/footer.yml | 2 - .../pages/news-detail/news-detail.twig | 12 +++++- .../pages/news-homepage/news-homepage.twig | 3 +- 6 files changed, 21 insertions(+), 88 deletions(-) delete mode 100644 assets/components/organisms/footer/footer-legal-news.twig delete mode 100644 assets/components/organisms/footer/footer-light-news.twig diff --git a/assets/components/organisms/footer/footer-legal-news.twig b/assets/components/organisms/footer/footer-legal-news.twig deleted file mode 100644 index 031e7bfe3..000000000 --- a/assets/components/organisms/footer/footer-legal-news.twig +++ /dev/null @@ -1,41 +0,0 @@ -{% if language is not defined %}{% set language = 'fr' %}{% endif %} - -{% if language == 'fr' %} -
-
- Accessibilité - Mentions légales - Protection des données - Charte -
-
-

© 2024 EPFL, tous droits réservés

-
-
-{% endif %} -{% if language == 'en' %} -
-
- Accessibility - Disclaimer - Privacy policy - Charter -
-
-

© 2024 EPFL, all rights reserved

-
-
-{% endif %} -{% if language == 'de' %} -
-
- Zugänglichkeit - Impressum - Datenschutzerklärung - Richtlinien -
-
-

© 2024 EPFL, alle Rechte vorbehalten

-
-
-{% endif %} diff --git a/assets/components/organisms/footer/footer-legal.twig b/assets/components/organisms/footer/footer-legal.twig index 2586c3783..eaaa00945 100644 --- a/assets/components/organisms/footer/footer-legal.twig +++ b/assets/components/organisms/footer/footer-legal.twig @@ -6,6 +6,9 @@ Accessibilité Mentions légales Protection des données + {% if isNews %} + Charte + {% endif %}

© 2024 EPFL, tous droits réservés

@@ -18,6 +21,9 @@ Accessibility Disclaimer Privacy policy + {% if isNews %} + Charter + {% endif %}

© 2024 EPFL, all rights reserved

@@ -30,6 +36,9 @@ Zugänglichkeit Impressum Datenschutzerklärung + {% if isNews %} + Richtlinien + {% endif %}

© 2024 EPFL, alle Rechte vorbehalten

diff --git a/assets/components/organisms/footer/footer-light-news.twig b/assets/components/organisms/footer/footer-light-news.twig deleted file mode 100644 index d084b4f93..000000000 --- a/assets/components/organisms/footer/footer-light-news.twig +++ /dev/null @@ -1,42 +0,0 @@ -{% if language is not defined %}{% set language = 'fr' %}{% endif %} - - - - diff --git a/assets/components/organisms/footer/footer.yml b/assets/components/organisms/footer/footer.yml index 834fd36d3..16b994af8 100644 --- a/assets/components/organisms/footer/footer.yml +++ b/assets/components/organisms/footer/footer.yml @@ -21,8 +21,6 @@ variants: title: Footer dark light notes: Add .bg-dark to the light container wrapper: bg-dark container - - name: light-news - title: Footer light for news notes: | ### Standard french diff --git a/assets/components/pages/news-detail/news-detail.twig b/assets/components/pages/news-detail/news-detail.twig index 09463879a..3b6e7040f 100644 --- a/assets/components/pages/news-detail/news-detail.twig +++ b/assets/components/pages/news-detail/news-detail.twig @@ -1,4 +1,5 @@ {% set isSpecial = true %} +{% set isNews = true %} {% extends "@templates/base/base.twig" %} @@ -158,7 +159,14 @@
{% endblock %} +{% block footer_container %} +
+
{% block footer %} - {% include '@organisms/footer/footer-light-news.twig' %} + {% include '@organisms/footer/footer-light.twig' %} {% endblock %} - +
+
+ {% endblock %} + + diff --git a/assets/components/pages/news-homepage/news-homepage.twig b/assets/components/pages/news-homepage/news-homepage.twig index 7e838ec82..8475d5dda 100644 --- a/assets/components/pages/news-homepage/news-homepage.twig +++ b/assets/components/pages/news-homepage/news-homepage.twig @@ -1,4 +1,5 @@ {% set isSpecial = true %} +{% set isNews = true %} {% extends "@templates/base/base.twig" %} @@ -33,7 +34,7 @@
{% block footer %} - {% include '@organisms/footer/footer-light-news.twig' %} + {% include '@organisms/footer/footer-light.twig' %} {% endblock %}