Merge branch 'release/1.9.0'

epfl-si · Jan 8, 2020 · a2b24e6 · a2b24e6
2 parents 2a95b93 + 18e0d77
commit a2b24e6
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # CHANGELOG
+*1.9.0* (2020-01-08)
+- New element version 2.0.6
+- Update footer
+- Remove 50 years artefacts (#250)
+- Delete PHP Notice et Warnings (#249)
+- Modification of table paddings (#431)
+
 *1.8.0* (2019-11-20)
 - Post gutenberg cleanup (#244)
 

diff --git a/wp-theme-2018/VERSION b/wp-theme-2018/VERSION
@@ -1 +1 @@
-1.8.0
+1.9.0
diff --git a/wp-theme-2018/assets/css/base.css b/wp-theme-2018/assets/css/base.css
diff --git a/wp-theme-2018/assets/icons/icons.svg b/wp-theme-2018/assets/icons/icons.svg
diff --git a/wp-theme-2018/assets/svg/portrait-placeholder.svg b/wp-theme-2018/assets/svg/portrait-placeholder.svg
diff --git a/wp-theme-2018/footer_en.php b/wp-theme-2018/footer_en.php
@@ -39,7 +39,7 @@
                                     <a href="https://www.epfl.ch/about/philanthropy/">Philanthropy</a>
                       </li>
                   <li>
-                                    <a href="https://cooperation.epfl.ch">Cooperation</a>
+                                    <a href="https://essentialtech.center">Cooperation</a>
                       </li>
                   <li>
                                     <a href="https://www.epflalumni.ch">Alumni</a>
@@ -190,25 +190,25 @@
   <div class="collapse collapse-item" id="collapse-fac">
     <ul class="footer-links">
           <li>
-                        <a href="https://www.epfl.ch/schools/enac/">School of architecture, civil and environmental engineering <strong>ENAC</strong></a>
+                        <a href="https://www.epfl.ch/schools/enac/">School of Architecture, Civil and Environmental Engineering <strong>ENAC</strong></a>
               </li>
           <li>
-                        <a href="https://www.epfl.ch/schools/sb/">School of basic sciences <strong>SB</strong></a>
+                        <a href="https://www.epfl.ch/schools/sb/">School of Basic Sciences <strong>SB</strong></a>
               </li>
           <li>
                         <a href="https://sti.epfl.ch">School of Engineering <strong>STI</strong></a>
               </li>
           <li>
-                        <a href="https://www.epfl.ch/schools/ic/">School of computer and communication sciences <strong>IC</strong></a>
+                        <a href="https://www.epfl.ch/schools/ic/">School of Computer and Communication Sciences <strong>IC</strong></a>
               </li>
           <li>
-                        <a href="https://www.epfl.ch/schools/sv/">School of life sciences <strong>SV</strong></a>
+                        <a href="https://www.epfl.ch/schools/sv/">School of Life Sciences <strong>SV</strong></a>
               </li>
           <li>
-                        <a href="https://www.epfl.ch/schools/cdm/">College of management of technology <strong>CDM</strong></a>
+                        <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 <strong>CDH</strong></a>
+                        <a href="https://www.epfl.ch/schools/cdh/">College of Humanities <strong>CDH</strong></a>
               </li>
           <li>
                         <a href="http://www.epfl.ae">Middle East <strong>ME</strong></a>

diff --git a/wp-theme-2018/footer_fr.php b/wp-theme-2018/footer_fr.php
@@ -39,7 +39,7 @@
                         <a href="https://www.epfl.ch/about/philanthropy/fr/philanthropie/">Philanthropie</a>
                                   </li>
                   <li>
-                        <a href="https://cooperation.epfl.ch/fr/index-fr-html/">Cooperation</a>
+                        <a href="https://essentialtech.center">Cooperation</a>
                                   </li>
                   <li>
                         <a href="https://www.epflalumni.ch/fr/">Alumni</a>

diff --git a/wp-theme-2018/header.php b/wp-theme-2018/header.php
@@ -84,19 +84,6 @@ function _get_our_soa () {
     }
 }
 
-?>
-<?php
-	// celebration link builder
-	// this is a temp hack until we remove it
-	$language = get_current_language();
-
-	if ($language === 'fr') {
-		$celebration_url = 'https://www.epfl.ch/campus/events/fr/celebration/';
-		$celebration_item = '<li id="menu-item--0" class="menu-item--0"><a style="color:#ff0000;" href="'. $celebration_url .'">50 ans</a></li>';
-	} else {
-		$celebration_url = 'https://www.epfl.ch/campus/events/celebration-en/';
-		$celebration_item = '<li id="menu-item--0" class="menu-item--0"><a style="color:#ff0000;" href="'. $celebration_url .'">50 years</a></li>';
-	}
 ?>
 <!doctype html>
 <html <?php language_attributes(); ?>>

diff --git a/wp-theme-2018/sidebar.php b/wp-theme-2018/sidebar.php
@@ -11,18 +11,6 @@
 
 global $EPFL_MENU_LOCATION;
 
-// celebration link builder
-// this is a temp hack until we remove it
-$language = get_current_language();
-
-if ($language === 'fr') {
-	$celebration_url = 'https://www.epfl.ch/campus/events/fr/celebration/';
-	$celebration_item = '<li id="menu-item--0" class="menu-item--0"><a style="color:#ff0000;" href="'. $celebration_url .'">50 ans</a></li>';
-} else {
-	$celebration_url = 'https://www.epfl.ch/campus/events/celebration-en/';
-	$celebration_item = '<li id="menu-item--0" class="menu-item--0"><a style="color:#ff0000;" href="'. $celebration_url .'">50 years</a></li>';
-}
-
 // recover current post and menu item
 $items = wp_filter_object_list( wp_get_nav_menu_items(get_current_menu_slug()), ['object_id' => $post->ID]);
 $item = reset($items);
@@ -40,7 +28,6 @@
 					'theme_location' => $EPFL_MENU_LOCATION,
 					'menu_class'=> 'nav-menu',
 					'container' => 'ul',
-					'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s' . $celebration_item . '</ul>',  // this is a temp hack until we remove it
 					'walker' => new Custom_Nav_Walker()
 				) );
 			?>

diff --git a/wp-theme-2018/style.css b/wp-theme-2018/style.css
@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.8.0
+Version: 1.9.0
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl