Merge branch 'release/1.2.5'

CHANGELOG.md

@@ -1,6 +1,16 @@
 
 # CHANGELOG
 
+*1.2.5* (2018-09-07)
+  - epfl-video: render HTML
+  - epfl-links-group: render HTML
+  - epfl-cover: render HTML
+  - epfl-toggle: render HTML
+  - epfl-memento: fix resolution image 448x448
+  - epfl-news: fix div tag badly closed PR#74
+  - Custom highlight handle image with caption, legend, alt etc..
+  - Name menu location, change default name from 'primary' to 'top' to match 2010 theme, prepare for footer
+
 *1.2.4* (2018-08-30)
   - remove top padding on homepage
   - hotfix overflow hidden events 

VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

functions.php

@@ -7,6 +7,12 @@
  * @package epfl
  */
 
+global $EPFL_MENU_LOCATION;
+$EPFL_MENU_LOCATION = 'top';
+
+global $EPFL_FOOTER_MENU_LOCATION;
+$EPFL_FOOTER_MENU_LOCATION = 'footer_nav';
+
 if ( ! function_exists( 'epfl_setup' ) ) :
 	/**
 	 * Sets up theme defaults and registers support for various WordPress features.
@@ -43,9 +49,12 @@ function epfl_setup() {
 		add_theme_support( 'post-thumbnails' );
 
 		// This theme uses wp_nav_menu() in one location.
-		register_nav_menus( array(
-			'primary' => esc_html__( 'Primary', 'epfl' ),
-		) );
+		global $EPFL_MENU_LOCATION;
+		global $EPFL_FOOTER_MENU_LOCATION;
+		$nav_menus_args = [];
+		$nav_menus_args[$EPFL_MENU_LOCATION] = esc_html__( 'Primary', 'epfl' );
+		$nav_menus_args[$EPFL_FOOTER_MENU_LOCATION] = esc_html__( 'Footer', 'epfl' );
+		register_nav_menus($nav_menus_args);
 
 		/*
 		 * Switch default core markup for search form, comment form, and comments
@@ -298,8 +307,8 @@ function get_archives_link_mod ( $link_html ) {
  * @return string
  */
 function get_current_menu_slug() {
-	$theme_location = 'primary';
+    global $EPFL_MENU_LOCATION;
   $menu_locations = get_nav_menu_locations();
-  $menu_term = get_term($menu_locations[$theme_location], 'nav_menu');
+  $menu_term = get_term($menu_locations[$EPFL_MENU_LOCATION], 'nav_menu');
 	return $menu_term;
 }

header.php

@@ -30,7 +30,10 @@
 		</a>
 
 			<?php
+			    global $EPFL_MENU_LOCATION;
 				wp_nav_menu( array(
+				    'theme_location' => $EPFL_MENU_LOCATION,
+        		    'menu_id'        => $EPFL_MENU_LOCATION.'-menu',
 					'menu_class'=> 'nav-header d-none d-xl-flex',
 					'container' => 'ul',
 					'depth' => 1

shortcodes/custom_highlight/view.php

@@ -1,28 +1,34 @@
-<?php 
+<?php
 $data = get_query_var('epfl_custom_highlight_data');
 
 // manage layout
 $classes = '';
 if ($data['layout'] == 'bottom') $classes = 'fullwidth-teaser-horizontal';
 if ($data['layout'] == 'left') $classes = 'fullwidth-teaser-left';
-
+if ($data['layout'] == '') $classes = 'fullwidth-teaser-right';
 ?>
 
 <div class="container-full">
   <div class="fullwidth-teaser mt-5  <?php echo $classes; ?>">
-    <picture>
-      <?php echo wp_get_attachment_image(
-        $data['image'],
-        'thumbnail_16_9_large', // see functions.php
-        '',
-        [
-          'class' => 'img-fluid'
-        ]
-      ) ?>
-      <img src="<?php echo $data['image'] ?>" aria-labelledby="background-label" alt="An image description"
-      />
-    </picture>
-
+    <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject" class="cover">
+      <!-- <picture> -->
+        <?php // get/slice image informations
+        $image_src = wp_get_attachment_image_src($data['image'], 'thumbnail_16_9_large')[0]; // see functions.php
+        $image_caption = wp_get_attachment_caption($data['image']);
+        $image_alt = get_post_meta($data['image'] , '_wp_attachment_image_alt', true);
+         ?>
+        <img src="<?php echo $image_src ?>" alt="<?php echo $image_alt ?>" />
+      <!-- </picture> -->
+      <?php if ($image_caption): ?>
+        <figcaption>
+          <button aria-hidden="true" type="button" class="btn-circle" data-toggle="popover" data-content="<?php echo $image_caption ?>">
+            <svg class="icon" aria-hidden="true"><use xlink:href="#icon-info"></use></svg>
+            <svg class="icon icon-rotate-90" aria-hidden="true"><use xlink:href="#icon-chevron-right"></use></svg>
+          </button>
+          <p class="sr-only"><?php echo $image_caption ?></p>
+        </figcaption>
+      <?php endif; ?>
+    </figure>
     <div class="fullwidth-teaser-text">
 
       <div class="fullwidth-teaser-header">
@@ -47,4 +53,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

shortcodes/epfl_card/controller.php

@@ -0,0 +1,27 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_card_action', 'renderCard', 10, 4);
+
+function renderCard ($title, $text, $link, $image) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Card');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    set_query_var('epfl_card_title', $title);
+    set_query_var('epfl_card_text', $text);
+    set_query_var('epfl_card_link', $link);
+    set_query_var('epfl_card_image', $image);
+    get_template_part('shortcodes/epfl_card/view');
+
+  }
+}

shortcodes/epfl_card/view.php

@@ -0,0 +1,18 @@
+<?php
+    $title = get_query_var('epfl_card_title');
+    $text  = get_query_var('epfl_card_text');
+    $link  = get_query_var('epfl_card_link');
+    $image = get_query_var('epfl_card_image');
+?>
+
+<a href="<?php echo $link; ?>" class="card link-trapeze-horizontal">
+  <?php if ($image): ?> 
+  <picture class="card-img-top">
+    <img src="<?php echo $image; ?>" class="img-fluid" title="<?php echo $title; ?>" alt="<?php echo $title; ?>" />
+  </picture>
+  <?php endif ?>
+  <div class="card-body">
+    <h3 class="card-title"><?php echo $title; ?></h3>
+    <p><?php echo $text; ?></p>
+  </div>
+</a>

shortcodes/epfl_cover/controller.php

@@ -0,0 +1,26 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_cover_action', 'renderCover', 10, 2);
+
+function renderCover ($image, $description) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Cover');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    // render for frontend
+    set_query_var('epfl_cover_image', $image);
+    set_query_var('epfl_cover_description', $description);
+    get_template_part('shortcodes/epfl_cover/view');
+
+  }
+}

shortcodes/epfl_cover/view.php

@@ -0,0 +1,25 @@
+<?php
+    $description = get_query_var('epfl_cover_description');
+    $image = get_query_var('epfl_cover_image');
+?>
+
+<div class="container">
+  <figure class="cover">
+    <picture>
+      <img src="<?php echo $image; ?>" class="img-fluid" alt="<?php echo $description; ?>">
+    </picture>
+    <figcaption>
+      <button
+        aria-hidden="true"
+        type="button"
+        class="btn-circle"
+        data-toggle="popover"
+        data-content="<?php echo $description; ?>"
+      >
+        <svg class="icon" aria-hidden="true"><use xlink:href="#icon-info"></use></svg>
+        <svg class="icon icon-rotate-90" aria-hidden="true"><use xlink:href="#icon-chevron-right"></use></svg>
+      </button>
+      <p class="sr-only"><?php echo $description; ?></p>
+      </figcaption>
+  </figure>
+</div>

shortcodes/epfl_links_group/controller.php

@@ -0,0 +1,36 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_links_group_action', 'renderLinksGroup', 10, 1);
+
+function renderLinksGroup ($args) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'Links group');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    set_query_var('epfl_links_group_main_url', $args['main_url']);
+    set_query_var('epfl_links_group_title', $args['title']);
+
+    unset($args['main_url']);
+    unset($args['title']);
+
+    $links = [];
+    foreach ($args as $key => $value) {
+      $field_key = substr($key, -1);
+      $field_name = substr($key, 0, -1);  
+      $links[$field_key][$field_name] = $value;
+    }
+    set_query_var('epfl_links_group_links', $links);
+
+    get_template_part('shortcodes/epfl_links_group/view');
+  }
+}

shortcodes/epfl_links_group/view.php

@@ -0,0 +1,24 @@
+<?php
+    $links    = get_query_var('epfl_links_group_links');
+    $main_url = get_query_var('epfl_links_group_main_url');
+    $title    = get_query_var('epfl_links_group_title');
+    $is_links_teaser = ("" !== $main_url);
+?>
+<div class="links-group <?php if ($is_links_teaser):?>links-group-teaser<?php endif; ?>">
+  <h5 id="links-group-title">
+    <?php if($is_links_teaser): ?>
+    <a class="link-pretty" href="<?php echo $main_url; ?>"><?php echo $title; ?></a>
+    <?php else: ?>
+    <?php echo $title; ?>
+    <?php endif; ?>
+  </h5>
+  <nav
+    class="nav flex-column flex-wrap align-items-start"
+    role="navigation"
+    aria-labelledby="links-group-title"
+  >
+  <?php foreach($links as $link): ?>
+    <a class="nav-link link-pretty" href="<?php echo $link['url']; ?>"><?php echo $link['label']; ?></a>
+  <?php endforeach ?>
+  </nav>
+</div>