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] 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' %}
-<div class="footer-legal">
-  <div class="footer-legal-links">
-    <a href="https://www.epfl.ch/about/overview/fr/reglements-et-directives/mentions-legales/">Accessibilité</a>
-    <a href="https://www.epfl.ch/about/overview/fr/reglements-et-directives/mentions-legales/">Mentions légales</a>
-    <a href="https://go.epfl.ch/protection-des-donnees/">Protection des données</a>
-    <a href="https://go.epfl.ch/charte">Charte</a>
-  </div>
-  <div>
-    <p>&copy; 2024 EPFL, tous droits réservés</p>
-  </div>
-</div>
-{% endif %}
-{% if language == 'en' %}
-<div class="footer-legal">
-  <div class="footer-legal-links">
-    <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Accessibility</a>
-    <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Disclaimer</a>
-    <a href="https://go.epfl.ch/privacy-policy/">Privacy policy</a>
-    <a href="https://go.epfl.ch/guidelines">Charter</a>
-  </div>
-  <div>
-    <p>&copy; 2024 EPFL, all rights reserved</p>
-  </div>
-</div>
-{% endif %}
-{% if language == 'de' %}
-  <div class="footer-legal">
-    <div class="footer-legal-links">
-      <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Zugänglichkeit</a>
-      <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Impressum</a>
-      <a href="https://go.epfl.ch/privacy-policy/">Datenschutzerklärung</a>
-      <a href="https://go.epfl.ch/guidelines">Richtlinien</a>
-    </div>
-    <div>
-      <p>&copy; 2024 EPFL, alle Rechte vorbehalten</p>
-    </div>
-  </div>
-{% 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 @@
     <a href="https://www.epfl.ch/about/overview/fr/reglements-et-directives/mentions-legales/">Accessibilité</a>
     <a href="https://www.epfl.ch/about/overview/fr/reglements-et-directives/mentions-legales/">Mentions légales</a>
     <a href="https://go.epfl.ch/protection-des-donnees/">Protection des données</a>
+    {% if isNews %}
+      <a href="https://go.epfl.ch/charte">Charte</a>
+    {% endif %}
   </div>
   <div>
     <p>&copy; 2024 EPFL, tous droits réservés</p>
@@ -18,6 +21,9 @@
     <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Accessibility</a>
     <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Disclaimer</a>
     <a href="https://go.epfl.ch/privacy-policy/">Privacy policy</a>
+    {% if isNews %}
+      <a href="https://go.epfl.ch/guidelines">Charter</a>
+    {% endif %}
   </div>
   <div>
     <p>&copy; 2024 EPFL, all rights reserved</p>
@@ -30,6 +36,9 @@
       <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Zugänglichkeit</a>
       <a href="https://www.epfl.ch/about/overview/regulations-and-guidelines/disclaimer/">Impressum</a>
       <a href="https://go.epfl.ch/privacy-policy/">Datenschutzerklärung</a>
+      {% if isNews %}
+        <a href="https://go.epfl.ch/guidelines">Richtlinien</a>
+      {% endif %}
     </div>
     <div>
       <p>&copy; 2024 EPFL, alle Rechte vorbehalten</p>
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 %}
-
-<footer class="footer-light" role="contentinfo">
-  <div class="row">
-    <div class="col-6 mx-auto mx-md-0 mb-4 col-md-3 col-lg-2">
-      <a href="#">
-        <img src="svg/epfl-logo.svg" alt="Logo EPFL, École polytechnique fédérale de Lausanne" class="img-fluid">
-      </a>
-    </div>
-    <div class="col-md-9 col-lg-10 mb-4">
-      <div class="ml-md-2 ml-lg-5">
-        <ul class="list-inline list-unstyled">
-          {% if language == 'de' %}
-            <li class="list-inline-item">Kontakt</li>
-          {% else %}
-            <li class="list-inline-item">Contact</li>
-          {% endif %}
-          <li class="list-inline-item text-muted pl-3"><small>EPFL  CH-1015 Lausanne</small></li>
-          <li class="list-inline-item text-muted pl-3"><small>+41 21 693 11 11</small></li>
-        </ul>
-        <div class="footer-light-socials">
-        {% if language == 'fr' %}
-          <p class="footer-title footer-title-no-underline">Suivez l'EPFL sur les réseaux sociaux</p>
-        {% endif %}
-        {% if language == 'en' %}
-          <p class="footer-title footer-title-no-underline">Follow EPFL on social media</p>
-        {% endif %}
-        {% if language == 'de' %}
-          <p class="footer-title footer-title-no-underline">Der EPFL in sozialen Netzwerken folgen</p>
-        {% endif %}
-          {% include '@atoms/social-icon/social-icon-link-group.twig' with { negative: true }  %}
-        </div>
-        {% include "@organisms/footer/footer-legal-news.twig" with { 'language': language } %}
-      </div>
-    </div>
-  </div>
-</footer>
-
-<button id="back-to-top" class="btn btn-primary btn-back-to-top">
-  <span class="sr-only">Back to top</span>
-  {% include '@atoms/icon/icon.twig' with {icon: 'icon-chevron-top'} %}
-</button>
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 @@
   </div>
 {% endblock %}
 
+{% block footer_container %}
+  <div class="bg-gray-100 pt-5">
+    <div class="container">
       {% block footer %}
-        {% include '@organisms/footer/footer-light-news.twig' %}
+        {% include '@organisms/footer/footer-light.twig' %}
       {% endblock %}
-
+    </div>
+  </div>
+  {% endblock %}
+  </div>
+</div>
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 @@
   <div class="bg-gray-100 pt-5">
     <div class="container">
       {% block footer %}
-        {% include '@organisms/footer/footer-light-news.twig' %}
+        {% include '@organisms/footer/footer-light.twig' %}
       {% endblock %}
     </div>
   </div>