-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Header + Footer update for translations (#349)
- Loading branch information
Showing
26 changed files
with
581 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,22 @@ | ||
| {% if language is not defined %}{% set language = 'fr' %}{% endif %} | ||
|
|
||
| <nav class="nav-lang nav-lang-short ml-auto"> | ||
| <ul> | ||
| {% if language == 'fr' %} | ||
| <li> | ||
| <span class="active" aria-label="Français">FR</span> | ||
| </li> | ||
| <li> | ||
| <a href="/en" aria-label="English">EN</a> | ||
| </li> | ||
| {% endif %} | ||
| {% if language == 'en' %} | ||
| <li> | ||
| <a href="/en" aria-label="English">FR</a> | ||
| </li> | ||
| <li> | ||
| <span class="active" aria-label="Français">EN</span> | ||
| </li> | ||
| {% endif %} | ||
| </ul> | ||
| </nav> |
12 changes: 5 additions & 7 deletions
12
assets/components/atoms/social-icon/social-icon-link-group.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| {% set round = round ? round : false %} | ||
| {% set discrete = discrete ? discrete : false %} | ||
| {% set negative = negative ? negative : false %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Facebook', icon: 'icon-facebook', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Twitter', icon: 'icon-twitter', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Instagram', icon: 'icon-instagram', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Mailplane', icon: 'icon-mail-plane', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'WhatsApp', icon: 'icon-whatsapp', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'GooglePlus', icon: 'icon-googleplus', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'LinkedIn', icon: 'icon-linkedin', round: round, discrete: discrete, negative: negative } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Facebook', icon: 'icon-facebook', round: round, discrete: discrete, negative: negative, url: 'https://www.facebook.com/epflcampus' } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Twitter', icon: 'icon-twitter', round: round, discrete: discrete, negative: negative, url: 'https://twitter.com/epfl' } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Instagram', icon: 'icon-instagram', round: round, discrete: discrete, negative: negative, url: 'http://instagram.com/epflcampus' } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Youtube', icon: 'icon-youtube', round: round, discrete: discrete, negative: negative, url: 'https://www.youtube.com/user/epflnews' } %} | ||
| {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'LinkedIn', icon: 'icon-linkedin', round: round, discrete: discrete, negative: negative, url: 'https://www.linkedin.com/school/epfl/' } %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,13 @@ | ||
| <p class="footer-title footer-title-no-underline">Portail interne de l’EPFL</p> | ||
| <a href="#" class="btn btn-secondary btn-sm">Enseignants et chercheurs</a> | ||
| <a href="#" class="btn btn-secondary btn-sm">Étudiants</a> | ||
| <a href="#" class="btn btn-secondary btn-sm">Collaborateurs</a> | ||
| {% if language is not defined %}{% set language = 'fr' %}{% endif %} | ||
|
|
||
| {% if language == 'fr' %} | ||
| <p class="footer-title footer-title-no-underline">Pratique</p> | ||
| <a href="https://www2018.epfl.ch/campus/services" class="btn btn-secondary btn-sm">Services et ressources</a> | ||
| <a href="tel:+41216933000" class="btn btn-secondary btn-sm">Urgences : +41 21 693 3000</a> | ||
| {% endif %} | ||
|
|
||
| {% if language == 'en' %} | ||
| <p class="footer-title footer-title-no-underline">Practical</p> | ||
| <a href="https://www2018.epfl.ch/campus/services" class="btn btn-secondary btn-sm">Services and ressources</a> | ||
| <a href="tel:+41216933000" class="btn btn-secondary btn-sm">Emergencies: +41 21 693 3000</a> | ||
| {% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include "@organisms/footer/footer.twig" %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <footer class="footer" role="contentinfo"> | ||
|
|
||
| <div class="footer-group footer-sitemap"> | ||
| {% include "@organisms/footer/footer-col.twig" with {'language': 'en'} %} | ||
| </div> | ||
|
|
||
| <div class="footer-group"> | ||
| {% include "@organisms/footer/footer-faculties.twig" with {'language': 'en'} %} | ||
| </div> | ||
|
|
||
| <div class="footer-group footer-buttons"> | ||
| {% include "@organisms/footer/footer-buttons.twig" with {'language': 'en'} %} | ||
| </div> | ||
|
|
||
| <div class="footer-group footer-socials"> | ||
| {% include "@organisms/footer/footer-socials.twig" with {'language': 'en'} %} | ||
| </div> | ||
|
|
||
| {% include "@organisms/footer/footer-legal.twig" with {'language': 'en'} %} | ||
|
|
||
| </footer> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,26 @@ | ||
| {% if language is not defined %}{% set language = 'fr' %}{% endif %} | ||
|
|
||
| <div class="footer-faculties"> | ||
| <button class="footer-title collapse-title collapsed" type="button" data-toggle="collapse" data-target="#collapse-fac" aria-expanded="false" aria-controls="collapse-fac"> | ||
| {% if language == 'fr' %} | ||
| Facultés | ||
| {% endif %} | ||
| {% if language == 'en' %} | ||
| Schools | ||
| {% endif %} | ||
| </button> | ||
| <div class="collapse collapse-item" id="collapse-fac"> | ||
| <ul class="footer-links"> | ||
| {% for school in schools %} | ||
| <li> | ||
| <a href="#">Environnement Naturel, Architectural et Construit <strong>ENAC</strong></a> | ||
| </li> | ||
| <li> | ||
| <a href="#">Sciences de Base <strong>SB</strong></a> | ||
| </li> | ||
| <li> | ||
| <a href="#">Sciences et Techniques de l'Ingénieur <strong>STI</strong></a> | ||
| </li> | ||
| <li> | ||
| <a href="#">Informatique et Communications <strong>IC</strong></a> | ||
| </li> | ||
| <li> | ||
| <a href="#">Sciences de la Vie <strong>SV</strong></a> | ||
| </li> | ||
| <li> | ||
| <a href="#">Collège du Management de la Technologie <strong>CDM</strong></a> | ||
| </li> | ||
| <li> | ||
| <a href="#">Collège des Humanités <strong>CDH</strong></a> | ||
| {% if language == 'fr' %} | ||
| <a href="{{school.urlfr}}">{{school.namefr}} <strong>{{school.acronym}}</strong></a> | ||
| {% endif %} | ||
| {% if language == 'en' %} | ||
| <a href="{{school.urlen}}">{{school.nameen}} <strong>{{school.acronym}}</strong></a> | ||
| {% endif %} | ||
| </li> | ||
| {% endfor %} | ||
| </ul> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,24 @@ | ||
| {% if language is not defined %}{% set language = 'fr' %}{% endif %} | ||
|
|
||
| {% if language == 'fr' %} | ||
| <div class="footer-legal"> | ||
| <div class="footer-legal-links"> | ||
| <a href="">Accessibilité</a> | ||
| <a href="">Mentions légales</a> | ||
| <a href="https://epfl-idevelop.github.io/elements/#/doc/accessibility.html">Accessibilité</a> | ||
| <a href="https://mediacom.epfl.ch/mentions-legales">Mentions légales</a> | ||
| </div> | ||
| <div> | ||
| <p>© 2018 EPFL, tous droits réservés</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endif %} | ||
| {% if language == 'en' %} | ||
| <div class="footer-legal"> | ||
| <div class="footer-legal-links"> | ||
| <a href="https://epfl-idevelop.github.io/elements/#/doc/accessibility.html">Accessibility</a> | ||
| <a href="https://mediacom.epfl.ch/disclaimer">Legals</a> | ||
| </div> | ||
| <div> | ||
| <p>© 2018 EPFL, all rights reserved</p> | ||
| </div> | ||
| </div> | ||
| {% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include '@organisms/footer/footer-light-dark.twig' with { 'language': 'en' } %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include '@organisms/footer/footer-light.twig' with { 'language': 'en' } %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,10 @@ | ||
| <p class="footer-title footer-title-no-underline">Suivre les pulsations de l’EPFL sur les réseaux sociaux</p> | ||
| {% if language is not defined %}{% set language = 'fr' %}{% endif %} | ||
| {% 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 %} | ||
| <div class="footer-social"> | ||
| {% include '@atoms/social-icon/social-icon-link-group.twig' with { negative: true } %} | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| <footer class="footer" role="contentinfo"> | ||
|
|
||
| <div class="footer-group footer-sitemap"> | ||
| {% include "@organisms/footer/footer-col.twig" %} | ||
| {% include "@organisms/footer/footer-col.twig" with {'language': 'fr'} %} | ||
| </div> | ||
|
|
||
| <div class="footer-group"> | ||
| {% include "@organisms/footer/footer-faculties.twig" %} | ||
| {% include "@organisms/footer/footer-faculties.twig" with {'language': 'fr'} %} | ||
| </div> | ||
|
|
||
| <div class="footer-group footer-buttons"> | ||
| {% include "@organisms/footer/footer-buttons.twig" %} | ||
| {% include "@organisms/footer/footer-buttons.twig" with {'language': 'fr'} %} | ||
| </div> | ||
|
|
||
| <div class="footer-group footer-socials"> | ||
| {% include "@organisms/footer/footer-socials.twig" %} | ||
| {% include "@organisms/footer/footer-socials.twig" with {'language': 'fr'} %} | ||
| </div> | ||
|
|
||
| {% include "@organisms/footer/footer-legal.twig" %} | ||
| {% include "@organisms/footer/footer-legal.twig" with {'language': 'fr'} %} | ||
|
|
||
| </footer> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include "@organisms/header/header.twig" with {'language': 'en'} %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include "@organisms/header/header.twig" with {'language': 'fr'} %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include "@organisms/header/header-light.twig" with {'language': 'en'} %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {% include "@organisms/header/header-light.twig" with {'language': 'fr'} %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.