Skip to content

Commit

Permalink
ocg with conditions
Browse files Browse the repository at this point in the history
- first PR revocated (too many files)
- introduction of conditions
- corrected footer page/news-detail
  • Loading branch information
xentenza committed Mar 27, 2024
1 parent 6f305e3 commit ccdab5b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 88 deletions.
41 changes: 0 additions & 41 deletions assets/components/organisms/footer/footer-legal-news.twig

This file was deleted.

9 changes: 9 additions & 0 deletions assets/components/organisms/footer/footer-legal.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
42 changes: 0 additions & 42 deletions assets/components/organisms/footer/footer-light-news.twig

This file was deleted.

2 changes: 0 additions & 2 deletions assets/components/organisms/footer/footer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 10 additions & 2 deletions assets/components/pages/news-detail/news-detail.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% set isSpecial = true %}
{% set isNews = true %}

{% extends "@templates/base/base.twig" %}

Expand Down Expand Up @@ -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>
3 changes: 2 additions & 1 deletion assets/components/pages/news-homepage/news-homepage.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% set isSpecial = true %}
{% set isNews = true %}

{% extends "@templates/base/base.twig" %}

Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit ccdab5b

Please sign in to comment.