Merge branch 'release/1.2.16'

CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+*1.2.16* (2018-11-14)
+  - epfl_social_feed: simplify renderer to align the feed in center (#144)
+  - epfl_card: set full container in all case; allow to add a gray wrapper (#143)
+  - custom_teaser, custom_highlight, schools, hero: add recommended size (#142)
+  - epfl_links_group: Add margin (#141)
+  - Fix people html (#138)
+  - highlight page: improve image width (#140)
+  - epfl_quote: crop quote image with square crop (#139)
+  - epfl_publication: fix wrong context for translation (#136)
+  - use crop_large instead crop (too short) (#137)
+  - Merge pull request #135 from epfl-idevelop/epfl-google-forms
+  - Update shortcodes/epfl_google_forms/view.php
+  - Move 'loading' parameter from shortcode to theme and use of internal
+  - Put everything in a <div class='container'>
+  - Add render for 'epfl-google-forms' plugin
+
 *1.2.15* (2018-11-06)
   - Set padding only for cards view (#134)
   - Fix missing padding for shortcodes on the full container (#133)

VERSION

@@ -1 +1 @@
-1.2.15
+1.2.16

languages/fr_FR.po

@@ -1,18 +1,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: epfl\n"
-"POT-Creation-Date: 2018-10-24 16:15+0200\n"
-"PO-Revision-Date: 2018-10-30 11:21+0100\n"
+"POT-Creation-Date: 2018-11-13 16:06+0100\n"
+"PO-Revision-Date: 2018-11-13 16:07+0100\n"
 "Last-Translator: Charmier Grégory <[email protected]>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.7.1\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-KeywordsList: __;esc_html__;esc_html_e\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: shortcodes\n"
 "X-Poedit-SearchPath-1: .\n"
 
@@ -46,8 +47,9 @@ msgid "Primary"
 msgstr ""
 
 #: functions.php:56
+#, fuzzy
 msgid "Footer"
-msgstr ""
+msgstr "Pied de page"
 
 #: functions.php:197
 msgid "Par défaut"
@@ -135,40 +137,46 @@ msgstr "Image"
 msgid "Select Image"
 msgstr "Sélectionner une image"
 
-#: shortcodes/custom_highlight/shortcake.php:36
+#: shortcodes/custom_highlight/shortcake.php:34
+#: shortcodes/custom_teasers/shortcake.php:54 shortcodes/hero/shortcake.php:29
+#: shortcodes/schools/shortcake.php:36
+msgid "Recommended image size: 1920x1080"
+msgstr "Taille recommandée de l'image: 1920x1080"
+
+#: shortcodes/custom_highlight/shortcake.php:37
 #: shortcodes/page_highlight/shortcake.php:14
 #: shortcodes/post_highlight/shortcake.php:14
 msgid "Layout"
 msgstr ""
 
-#: shortcodes/custom_highlight/shortcake.php:38
+#: shortcodes/custom_highlight/shortcake.php:39
 #: shortcodes/page_highlight/shortcake.php:16
 #: shortcodes/post_highlight/shortcake.php:16
 msgid ""
 "Decides where the text will be aligned, to allow the subject of the picture "
 "to be visible"
 msgstr ""
 
-#: shortcodes/custom_highlight/shortcake.php:41
+#: shortcodes/custom_highlight/shortcake.php:42
 #: shortcodes/page_highlight/shortcake.php:19
 #: shortcodes/post_highlight/shortcake.php:19
 msgid "Right"
 msgstr ""
 
-#: shortcodes/custom_highlight/shortcake.php:42
+#: shortcodes/custom_highlight/shortcake.php:43
 #: shortcodes/page_highlight/shortcake.php:20
 #: shortcodes/post_highlight/shortcake.php:20
 msgid "Bottom"
 msgstr ""
 
-#: shortcodes/custom_highlight/shortcake.php:43
+#: shortcodes/custom_highlight/shortcake.php:44
 #: shortcodes/page_highlight/shortcake.php:21
 #: shortcodes/post_highlight/shortcake.php:21
 #, fuzzy
 msgid "Left"
 msgstr "Template pour un portail (avec l'image sur la gauche)"
 
-#: shortcodes/custom_highlight/shortcake.php:53
+#: shortcodes/custom_highlight/shortcake.php:54
 msgid "Custom Highlight"
 msgstr ""
 
@@ -185,7 +193,7 @@ msgstr ""
 msgid "Url"
 msgstr "URL"
 
-#: shortcodes/custom_teasers/shortcake.php:64
+#: shortcodes/custom_teasers/shortcake.php:65
 msgid "Custom teasers"
 msgstr ""
 
@@ -225,14 +233,19 @@ msgstr ""
 msgid "Definition list"
 msgstr ""
 
+#: shortcodes/epfl_google_forms/view.php:9
+msgid "Loading..."
+msgstr "Chargement..."
+
 #: shortcodes/epfl_memento/templates/card-info.php:22
 msgid "Place and room"
 msgstr "Lieu et salle"
 
 #: shortcodes/epfl_memento/templates/card-info.php:28
 #: shortcodes/epfl_memento/templates/card-info.php:30
+#, fuzzy
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #: shortcodes/epfl_memento/templates/card-slider-footer.php:16
 msgid "Complete agenda of events"
@@ -249,33 +262,41 @@ msgstr "Information & inscription"
 
 #: shortcodes/epfl_memento/view.php:131
 #, fuzzy
-#| msgid "No scheduled events"
 msgid "Next events"
-msgstr "Aucun événement programmé"
+msgstr "Les prochains événements"
 
 #: shortcodes/epfl_memento/view.php:134
+#, fuzzy
 msgid "See all events"
-msgstr ""
+msgstr "Voir tous les événements"
 
-#: shortcodes/epfl_news/view.php:46
+#: shortcodes/epfl_news/view.php:48
 msgid "The last news"
 msgstr "Les dernières actualités"
 
-#: shortcodes/epfl_news/view.php:116 shortcodes/epfl_news/view.php:157
-#: shortcodes/epfl_news/view.php:186
+#: shortcodes/epfl_news/view.php:118 shortcodes/epfl_news/view.php:159
+#: shortcodes/epfl_news/view.php:188
 msgid "News"
 msgstr "Actualités"
 
-#: shortcodes/epfl_news/view.php:121 shortcodes/epfl_news/view.php:130
-#: shortcodes/epfl_news/view.php:162 shortcodes/epfl_news/view.php:171
-#: shortcodes/page_highlight/view.php:33 shortcodes/page_highlight/view.php:45
+#: shortcodes/epfl_news/view.php:123 shortcodes/epfl_news/view.php:132
+#: shortcodes/epfl_news/view.php:164 shortcodes/epfl_news/view.php:173
+#: shortcodes/page_highlight/view.php:36 shortcodes/page_highlight/view.php:48
 msgid "Read more"
 msgstr "En savoir plus"
 
-#: shortcodes/epfl_news/view.php:202 shortcodes/epfl_news/view.php:222
+#: shortcodes/epfl_news/view.php:204 shortcodes/epfl_news/view.php:224
 msgid "All news"
 msgstr "Toutes les actualités"
 
+#: shortcodes/epfl_people/view.php:57
+msgid "Position"
+msgstr "Fonction"
+
+#: shortcodes/epfl_people/view.php:61
+msgid "Office"
+msgstr "Bureau"
+
 #: shortcodes/epfl_publication/renderers/fields.php:112
 msgid "Dir."
 msgstr "Dir."
@@ -307,8 +328,9 @@ msgid "Full text"
 msgstr "Texte intégral"
 
 #: shortcodes/epfl_publication/renderers/publications.php:126
+#, fuzzy
 msgid "View at publisher"
-msgstr ""
+msgstr "Consulter chez l'éditeur"
 
 #: shortcodes/epfl_scienceqa/view.php:13
 msgid "Question de science"
@@ -325,7 +347,6 @@ msgstr ""
 #: shortcodes/epfl_share/view.php:16 shortcodes/epfl_share/view.php:20
 #: shortcodes/epfl_share/view.php:42 shortcodes/epfl_share/view.php:46
 #, fuzzy
-#| msgid "Follow us on Twitter"
 msgid "Follow us on"
 msgstr "Nous rejoindre sur Twitter"
 
@@ -341,7 +362,7 @@ msgstr "Voir ce post sur Instagram"
 msgid "Follow us on Twitter"
 msgstr "Nous rejoindre sur Twitter"
 
-#: shortcodes/hero/shortcake.php:37
+#: shortcodes/hero/shortcake.php:38
 msgid "Hero"
 msgstr ""
 
@@ -447,12 +468,6 @@ msgstr ""
 msgid "Pages:"
 msgstr ""
 
-msgid "Position"
-msgstr "Fonction"
-
-msgid "Office"
-msgstr "Bureau"
-
 #~ msgid "Journal Articles"
 #~ msgstr "Articles de journaux"
 

shortcodes/custom_highlight/shortcake.php

@@ -31,6 +31,7 @@ function custom_highlight() {
       'libraryType' => array( 'image' ),
       'addButton'   => esc_html__( 'Select Image', 'epfl', 'shortcode-ui' ),
       'frameTitle'  => esc_html__( 'Select Image', 'epfl', 'shortcode-ui' ),
+      'description' => esc_html__('Recommended image size: 1920x1080', 'epfl')
     ),
     array(
       'label'    => esc_html__( 'Layout' , 'epfl'),

shortcodes/custom_teasers/shortcake.php

@@ -51,6 +51,7 @@ function custom_teasers() {
 					'libraryType' => array( 'image' ),
 					'addButton'   => esc_html__( 'Select Image', 'epfl', 'shortcode-ui' ),
 					'frameTitle'  => esc_html__( 'Select Image', 'epfl', 'shortcode-ui' ),
+					'description' => esc_html__('Recommended image size: 1920x1080', 'epfl')
 				)
 			]
 		);

shortcodes/custom_teasers/view.php

@@ -29,7 +29,7 @@
           <picture>
           <?php echo wp_get_attachment_image(
             $data['image'.$i],
-            'thumbnail_16_9_crop', // see functions.php
+            'thumbnail_16_9_large', // see functions.php
             '',
             [
               'class' => 'img-fluid',

shortcodes/epfl_card/view.php

@@ -1,5 +1,6 @@
 <?php
   $data = get_query_var('epfl_cards');
+  $gray_wrapper = $data['gray_wrapper'];
 
   if (!$data) return true;
 
@@ -10,10 +11,9 @@
     }
   }
 ?>
-<?php if ($elementCount > 1): ?>
-<div class="container my-3">
+
+<div class="container-full py-3<?php echo ($gray_wrapper) ? ' bg-gray-100' : '' ?>">
   <div class="card-deck <?php echo ($elementCount < 3) && ($elementCount > 1) ? ' card-deck-line' : '' ?>">
-<?php endif ?>
     <?php
     for($i = 1; $i < 4; $i++):
       $title = esc_html($data['title'.$i]);
@@ -34,7 +34,7 @@
         <picture>
         <?php echo wp_get_attachment_image(
           $image_id,
-          'thumbnail_16_9_crop', // see functions.php
+          'thumbnail_16_9_large', // see functions.php
           '',
           [
             'class' => 'img-fluid',
@@ -61,7 +61,5 @@
       endif;
       endfor;
     ?>
-<?php if ($elementCount > 1): ?>
   </div>
 </div>
-<?php endif ?>

shortcodes/epfl_cover/view.php

@@ -8,7 +8,7 @@
     <picture>
       <?php echo wp_get_attachment_image(
         $image,
-        'thumbnail_16_9_crop', // see functions.php
+        'thumbnail_16_9_large', // see functions.php
         '',
         [
           'class' => 'img-fluid',

shortcodes/epfl_google_forms/controller.php

@@ -0,0 +1,25 @@
+<?php
+
+/** 
+ * 3rd argument is the priority, higher means executed first
+ * 4rth argument is number of arguments the function can accept
+ **/
+
+add_action('epfl_google_forms_action', 'renderGoogleForms', 10, 3);
+
+function renderGoogleForms ( $src, $width, $height) {
+
+  if (is_admin()) {
+
+    // render placeholder for backend editor
+    set_query_var('epfl_placeholder_title', 'GoogleForms');
+    get_template_part('shortcodes/placeholder');
+
+  } else {
+
+    set_query_var('epfl_google_forms_src', $src);
+    set_query_var('epfl_google_forms_width', $width);
+    set_query_var('epfl_google_forms_height', $height);
+    get_template_part('shortcodes/epfl_google_forms/view');
+  }
+}

shortcodes/epfl_google_forms/view.php

@@ -0,0 +1,11 @@
+<?php  
+  $src     = get_query_var('epfl_google_forms_src');
+  $width   = get_query_var('epfl_google_forms_width');
+  $height  = get_query_var('epfl_google_forms_height');
+?>
+
+<div class="container my-3">
+    <iframe src="<?php echo esc_url($src); ?>" width="<?php echo esc_attr($width); ?>" height="<?php echo esc_attr($height); ?>" frameborder="0" marginheight="0" marginwidth="0">
+        <?php echo __("Loading...", "epfl");?>
+    </iframe>
+</div>

shortcodes/epfl_links_group/view.php

@@ -4,21 +4,23 @@
     $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 esc_url($main_url) ?>"><?php echo esc_html($title) ?></a>
-    <?php else: ?>
-    <?php echo esc_html($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 esc_url($link['url']) ?>"><?php echo esc_html($link['label']) ?></a>
-  <?php endforeach ?>
-  </nav>
+<div class="container-grid my-3">
+  <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 esc_url($main_url) ?>"><?php echo esc_html($title) ?></a>
+      <?php else: ?>
+      <?php echo esc_html($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 esc_url($link['url']) ?>"><?php echo esc_html($link['label']) ?></a>
+    <?php endforeach ?>
+    </nav>
+  </div>
 </div>