Skip to content

Commit

Permalink
Merge branch 'release/1.26.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jdelasoie committed Dec 16, 2020
2 parents e91ffce + 638e821 commit 64f75d0
Show file tree
Hide file tree
Showing 14 changed files with 561 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

*1.26.0* (2020-12-16)
- Set new link in footer

*1.25.1* (2020-12-09)
- Set new link in footer

Expand Down
2 changes: 1 addition & 1 deletion wp-theme-2018/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.25.1
1.26.0
3 changes: 1 addition & 2 deletions wp-theme-2018/assets/css/base.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-theme-2018/assets/js/app.bundle.js

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion wp-theme-2018/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
$language = get_current_language();

if ($language === 'fr') {
require_once(__DIR__.'/footer_fr.php');
require_once(__DIR__ . '/footer_fr.php');
}
elseif ($language === 'de') {
require_once(__DIR__.'/footer_de.php');
} else {
require_once(__DIR__.'/footer_en.php');
}
Expand Down
297 changes: 297 additions & 0 deletions wp-theme-2018/footer_de.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
<footer class="footer" role="contentinfo">

<div class="footer-group footer-sitemap">

<div class="footer-sitemap-col">
<button class="footer-title collapse-title collapsed" type="button" data-toggle="collapse"
data-target="#collapse-footer-1" aria-expanded="false" aria-controls="collapse-footer-1">
<strong>Über uns</strong>
</button>
<div class="collapse collapse-item" id="collapse-footer-1">
<ul class="footer-links">
<li>
<a href="https://www.epfl.ch/about/overview/">Präsentation</a>
</li>
<li>
<a href="https://www.epfl.ch/about/presidency/">Präsident</a>
</li>
<li>
<a href="https://www.epfl.ch/about/presidency/">Vizepräsidium</a>
</li>
<li>
<a href="https://www.epfl.ch/about/campus/">Erweiterter Campus</a>
</li>
<li>
<a href="https://www.epfl.ch/about/working/">Bei der EPFL arbeiten</a>
</li>
<li>
<a href="https://www.epfl.ch/about/recruiting/">Rekrutierung von Talenten durch die EPFL</a>
</li>
<li>
<a href="https://www.epfl.ch/about/news-and-media/">News & Medien</a>
</li>
<li>
<a href="https://www.epfl.ch/about/sustainability/">Nachhaltigkeit</a>
</li>
<li>
<a href="https://equality.epfl.ch">Chancengleichheit</a>
</li>
<li>
<a href="https://www.epfl.ch/about/philanthropy/">Philanthropie
</a>
</li>
<li>
<a href="https://essentialtech.center">Zusammenarbeit</a>
</li>
<li>
<a href="https://www.epflalumni.ch">Alumni</a>
</li>
</ul>
</div>
</div>
<div class="footer-sitemap-col">
<button class="footer-title collapse-title collapsed" type="button" data-toggle="collapse"
data-target="#collapse-footer-2" aria-expanded="false" aria-controls="collapse-footer-2">
<strong>Bildung</strong>
</button>
<div class="collapse collapse-item" id="collapse-footer-2">
<ul class="footer-links">
<li>
<a href="https://www.epfl.ch/education/educational-initiatives/">Bildungsinitiativen</a>
</li>
<li>
<a href="https://www.epfl.ch/education/educational-initiatives/">Bachelor</a>
</li>
<li>
<a href="https://www.epfl.ch/education/master/">Master</a>
</li>
<li>
<a href="https://phd.epfl.ch">Doktorat</a>
</li>
<li>
<a href="https://www.epfl.ch/education/continuing-education/">Weiterbildung</a>
</li>
<li>
<a href="https://www.epfl.ch/education/international/en/mobility/">International</a>
</li>
<li>
<a href="https://www.epfl.ch/education/admission/">Zulassung</a>
</li>
<li>
<a href="https://www.epfl.ch/education/studies/en/epfl-studies/">Studienverwaltung</a>
</li>
<li>
<a href="https://www.epfl.ch/education/education-and-science-outreach/">Förderung von Bildung
und Wissenschaft</a>
</li>
</ul>
</div>
</div>
<div class="footer-sitemap-col">
<button class="footer-title collapse-title collapsed" type="button" data-toggle="collapse"
data-target="#collapse-footer-3" aria-expanded="false" aria-controls="collapse-footer-3">
<strong>Forschung</strong>
</button>
<div class="collapse collapse-item" id="collapse-footer-3">
<ul class="footer-links">
<li>
<a href="https://www.epfl.ch/research/domains/">Forschungsbereiche</a>
</li>
<li>
<a href="https://www.epfl.ch/research/faculty-members/">Unsere Lehrkräfte</a>
</li>
<li>
<a href="https://www.epfl.ch/research/collaborate/">Mit unseren Forschenden zusammenarbeiten</a>
</li>
<li>
<a href="https://www.epfl.ch/research/facilities/">Verfügbare Infrastruktur</a>
</li>
<li>
<a href="https://www.epfl.ch/research/access-technology/">Zugang zu unseren Technologien</a>
</li>
<li>
<a href="https://www.epfl.ch/research/services/">Dienstleistungen für Forschende</a>
</li>
<li>
<a href="https://www.epfl.ch/research/ethic-statement/">Ethikerklärung</a>
</li>
<li>
<a href="https://www.epfl.ch/research/awards/">Preise und Auszeichnungen</a>
</li>
</ul>
</div>
</div>
<div class="footer-sitemap-col">
<button class="footer-title collapse-title collapsed" type="button" data-toggle="collapse"
data-target="#collapse-footer-4" aria-expanded="false" aria-controls="collapse-footer-4">
<strong>Innovation</strong>
</button>
<div class="collapse collapse-item" id="collapse-footer-4">
<ul class="footer-links">
<li>
<a href="https://www.epfl.ch/innovation/domains/">Innovationsbereiche</a>
</li>
<li>
<a href="https://www.epfl.ch/innovation/industry/">Zusammenarbeit mit der Industrie</a>
</li>
<li>
<a href="https://www.epfl.ch/innovation/startup/">Unternehmertum und Start-ups</a>
</li>
</ul>
</div>
</div>
<div class="footer-sitemap-col">
<button class="footer-title collapse-title collapsed" type="button" data-toggle="collapse"
data-target="#collapse-footer-5" aria-expanded="false" aria-controls="collapse-footer-5">
<strong>Campus</strong>
</button>
<div class="collapse collapse-item" id="collapse-footer-5">
<ul class="footer-links">
<li>
<a href="https://www.epfl.ch/campus/visitors/">Besucherinformationen</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/services/en/homepage/">Services und Ressourcen</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/library/">Bibliothek</a>
</li>
<li>
<a href="https://restauration.epfl.ch">Restaurants, Geschäfte und Hotels</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/events/">Veranstaltungen</a>
</li>
<li>
<a href="https://equality.epfl.ch/family_worklife/daycare/">Kinderkrippen und Tagesstätten</a>
</li>
<li>
<a href="https://sport.unil.ch">Sport</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/art-culture/">Kunst und Kultur</a>
</li>
<li>
<a href="https://securite.epfl.ch">Hilfe, Gesundheit und Sicherheit</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/spiritual-care/">Seelsorge</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/associations/">Vereinigungen</a>
</li>
<li>
<a href="https://www.epfl.ch/campus/mobility/">Mobilität und Transport</a>
</li>
</ul>
</div>
</div>
</div>

<div class="footer-group">

<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">
Fakultäten
</button>
<div class="collapse collapse-item" id="collapse-fac">
<ul class="footer-links">
<li>
<a href="https://www.epfl.ch/schools/enac/">Fakultät für Bau, Architektur und Umwelt <strong>ENAC</strong></a>
</li>
<li>
<a href="https://www.epfl.ch/schools/sb/">Fakultät für Grundlagenwissenschaften
<strong>SB</strong></a>
</li>
<li>
<a href="https://sti.epfl.ch">Fakultät für Ingenieurwissenschaften <strong>STI</strong></a>
</li>
<li>
<a href="https://www.epfl.ch/schools/ic/">Fakultät für Informatik und Kommunikation
<strong>IC</strong></a>
</li>
<li>
<a href="https://www.epfl.ch/schools/sv/">Fakultät für Lebenswissenschaften <strong>SV</strong></a>
</li>
<li>
<a href="https://www.epfl.ch/schools/cdm/">College of Management of Technology
<strong>CDM</strong></a>
</li>
<li>
<a href="https://www.epfl.ch/schools/cdh/">College of Humanities CDH <strong>CDH</strong></a>
</li>
<li>
<a href="http://www.epfl.ae">Middle East <strong>ME</strong></a>
</li>
</ul>
</div>
</div>
</div>

<div class="footer-group footer-buttons">
<p class="footer-title footer-title-no-underline">Praktische Hinweise</p>
<a href="https://www.epfl.ch/campus/services/en/homepage/" class="btn btn-secondary btn-sm">Services und
Ressourcen</a>
<a href="tel:+41216933000" class="btn btn-secondary btn-sm">Notfälle : +41 21 693 3000</a>
<a href="https://www.epfl.ch/about/overview/contact-en/" class="btn btn-secondary btn-sm">Kontakt</a>
<a href="https://map.epfl.ch/" class="btn btn-secondary btn-sm">Plan</a>
</div>

<div class="footer-group footer-socials">
<p class="footer-title footer-title-no-underline">Der EPFL in sozialen Netzwerken folgen</p>
<div class="footer-social">

<a href="true" class="social-icon social-icon-facebook social-icon-negative" rel="nofollow">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-facebook"></use>
</svg>
<span class="sr-only">Follow us on Facebook.</span>
</a>
<a href="true" class="social-icon social-icon-twitter social-icon-negative" rel="nofollow">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-twitter"></use>
</svg>
<span class="sr-only">Follow us on Twitter.</span>
</a>
<a href="true" class="social-icon social-icon-instagram social-icon-negative" rel="nofollow">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-instagram"></use>
</svg>
<span class="sr-only">Follow us on Instagram.</span>
</a>
<a href="true" class="social-icon social-icon-youtube social-icon-negative" rel="nofollow">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-youtube"></use>
</svg>
<span class="sr-only">Follow us on Youtube.</span>
</a>
<a href="true" class="social-icon social-icon-linkedin social-icon-negative" rel="nofollow">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-linkedin"></use>
</svg>
<span class="sr-only">Follow us on LinkedIn.</span>
</a>
</div>
</div>


<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>
</div>
<div>
<p>&copy; <?php echo date("Y"); ?> EPFL, alle Rechte vorbehalten</p>
</div>
</div>

</footer>

<button id="back-to-top" class="btn btn-primary btn-back-to-top">
<span class="sr-only">Back to top</span>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-chevron-top"></use>
</svg>
</button>
2 changes: 1 addition & 1 deletion wp-theme-2018/footer_fr.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
<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/">Politique de protection des données</a>
<a href="https://go.epfl.ch/protection-des-donnees/">Protection des données</a>
</div>
<div>
<p>&copy; <?php echo date("Y"); ?> EPFL, tous droits réservés</p>
Expand Down
23 changes: 23 additions & 0 deletions wp-theme-2018/header-top-menu-fallback-de.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<ul aria-hidden="true" class="nav-header d-none d-xl-flex">
<li id="menu-item-1">
<a class="nav-item" href="https://www.epfl.ch/about/">Über uns</a>
</li>
<li id="menu-item-2">
<a class="nav-item" href="https://www.epfl.ch/education/">Bildung</a>
</li>
<li id="menu-item-3">
<a class="nav-item" href="https://www.epfl.ch/research/">Forschung</a>
</li>
<li id="menu-item-4">
<a class="nav-item" href="https://www.epfl.ch/innovation/">Innovation</a>
</li>
<li id="menu-item-5">
<a class="nav-item" href="https://www.epfl.ch/schools/">Fakultäten</a>
</li>
<li id="menu-item-6">
<a class="nav-item" href="https://www.epfl.ch/campus/">Campus</a>
</li>
<li id="menu-item-0">
<a style="color:#ff0000;" href="https://www.epfl.ch/campus/security-safety/en/health/coronavirus-covid19/">Coronavirus Info</a>
</li>
</ul>
2 changes: 2 additions & 0 deletions wp-theme-2018/header-top-menu-fallback.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

if ($language === 'fr') {
require_once(__DIR__.'/header-top-menu-fallback-fr.php');
} elseif ($language === 'de') {
require_once(__DIR__.'/header-top-menu-fallback-de.php');
} else {
require_once(__DIR__.'/header-top-menu-fallback-en.php');
}
2 changes: 1 addition & 1 deletion wp-theme-2018/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ function _get_our_soa () {
<?php get_template_part( 'template-parts/language-switcher' ) ?>

<div class="btn btn-secondary nav-toggle-mobile d-xl-none">
<span class="label">Menu</span>
<span class="label"><?php esc_html_e('Menu', 'epfl') ?></span>
<div class="hamburger">
<span></span>
<span></span>
Expand Down
2 changes: 1 addition & 1 deletion wp-theme-2018/inc/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
function get_current_language ($default_lang='en') {
# fetch language
$allowed_langs = array('en', 'fr');
$allowed_langs = array('en', 'fr', 'de');
$language = $default_lang;

/* If Polylang installed */
Expand Down
Binary file added wp-theme-2018/languages/de_DE.mo
Binary file not shown.
Loading

0 comments on commit 64f75d0

Please sign in to comment.