From ecfe5f2c0631364bc798d4df6c3d93ab219dbd37 Mon Sep 17 00:00:00 2001 From: LuluTchab Date: Tue, 6 Nov 2018 15:33:34 +0100 Subject: [PATCH 01/14] Add render for 'epfl-google-forms' plugin --- shortcodes/epfl_google_forms/controller.php | 26 +++++++++++++++++++++ shortcodes/epfl_google_forms/view.php | 10 ++++++++ shortcodes/index.php | 1 + 3 files changed, 37 insertions(+) create mode 100644 shortcodes/epfl_google_forms/controller.php create mode 100644 shortcodes/epfl_google_forms/view.php diff --git a/shortcodes/epfl_google_forms/controller.php b/shortcodes/epfl_google_forms/controller.php new file mode 100644 index 00000000..d0714c08 --- /dev/null +++ b/shortcodes/epfl_google_forms/controller.php @@ -0,0 +1,26 @@ + + diff --git a/shortcodes/index.php b/shortcodes/index.php index d301bc50..1b4d21e3 100644 --- a/shortcodes/index.php +++ b/shortcodes/index.php @@ -28,3 +28,4 @@ require_once(get_template_directory().'/shortcodes/epfl_share/controller.php'); require_once(get_template_directory().'/shortcodes/epfl_contact/controller.php'); require_once(get_template_directory().'/shortcodes/epfl_tableau/controller.php'); +require_once(get_template_directory().'/shortcodes/epfl_google_forms/controller.php'); From 4a812263741b765cfdf7efe0c57ff5572ba71d3e Mon Sep 17 00:00:00 2001 From: LuluTchab Date: Tue, 6 Nov 2018 15:35:40 +0100 Subject: [PATCH 02/14] Put everything in a
--- shortcodes/epfl_google_forms/view.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/shortcodes/epfl_google_forms/view.php b/shortcodes/epfl_google_forms/view.php index f2a848b8..5fe25535 100644 --- a/shortcodes/epfl_google_forms/view.php +++ b/shortcodes/epfl_google_forms/view.php @@ -5,6 +5,8 @@ $loading = get_query_var('epfl_google_forms_loading'); ?> - +
+ +
From 2e2117f99052120f0058964e4e0eb0886ab87336 Mon Sep 17 00:00:00 2001 From: LuluTchab Date: Wed, 7 Nov 2018 10:13:10 +0100 Subject: [PATCH 03/14] Move 'loading' parameter from shortcode to theme and use of internal translation file --- languages/fr_FR.mo | Bin 2203 -> 2275 bytes languages/fr_FR.po | 39 +++++++++++--------- shortcodes/epfl_google_forms/controller.php | 5 +-- shortcodes/epfl_google_forms/view.php | 5 +-- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/languages/fr_FR.mo b/languages/fr_FR.mo index 546955b50cc2ea583fe1455a0f6cf6b50155fcc2..6229b264ffdf06acf95bc1c93ab414f8fb4150f9 100644 GIT binary patch delta 796 zcmX}q&r1|x9LMozc2~D1%~spAAIew+Ma(d>7q^9oDAa?fXkNt2vJJLqyP=yWWeGfb zTf(42MMcmh!hfMIk#$iaf(q2DX9XeOpK<76pLspc>^|S;`+c5$k=f4Ff48Te8Cnnh z61~MT<~kmt+N*>yC-60%#}C+spD~3Scou)+N!-I>+{bntNFJ}7M4NdHwXTjGV3rv) z^Wr&P#g}*nzu;-yLM5<^3b2RT=m51YNwjll$M#|?^E_%@KVHNUx><*YFLhl5faY<_})L9n?wu!*Og&A6Ht6T|yV!WbOU!q? z%>HJRK?e6x3vAL>=3P8muora_9;)(Ncm)U0!5LISD@X|QKAwL>CHxhYz>j$T3svx6 z%*NLo15`Es@5-YeF^f|K)uyc_)gU9Pd7+Di0!jkisU9n~jurSR^<;@o^#D>xJP``!Fn Vwt3KM)w}8NQCO*Ir>XR9>j+0JSK|Nx delta 738 zcmX}qK}Zx)9LMqhth=jjTCQ4FwlFAxA_Fs{rtBezJas5BI!XwxG9Y?TJShtzdJ@z@ z5IsxaDOhh^BI-~O1fkHyOAvbyI(4@1Z+7spZ$9&8=e_^`{onj99v7>Zo!JAUmFSP? zS;uS;uTX6_W7dLu_yCXa4xV8aKVvt3#a6t;msrP69BXRKdx3g?7P~OQyjj)Oxp~Zk zP3*u^yp11Ffxlq^e_|2\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" @@ -225,6 +226,10 @@ 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" @@ -249,7 +254,6 @@ msgstr "Information & inscription" #: shortcodes/epfl_memento/view.php:131 #, fuzzy -#| msgid "No scheduled events" msgid "Next events" msgstr "Aucun événement programmé" @@ -257,25 +261,33 @@ msgstr "Aucun événement programmé" msgid "See all events" msgstr "" -#: 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/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:33 shortcodes/page_highlight/view.php:45 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:66 +msgid "Position" +msgstr "Fonction" + +#: shortcodes/epfl_people/view.php:70 +msgid "Office" +msgstr "Bureau" + #: shortcodes/epfl_publication/renderers/fields.php:112 msgid "Dir." msgstr "Dir." @@ -325,7 +337,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" @@ -447,12 +458,6 @@ msgstr "" msgid "Pages:" msgstr "" -msgid "Position" -msgstr "Fonction" - -msgid "Office" -msgstr "Bureau" - #~ msgid "Journal Articles" #~ msgstr "Articles de journaux" diff --git a/shortcodes/epfl_google_forms/controller.php b/shortcodes/epfl_google_forms/controller.php index d0714c08..79011bca 100644 --- a/shortcodes/epfl_google_forms/controller.php +++ b/shortcodes/epfl_google_forms/controller.php @@ -5,9 +5,9 @@ * 4rth argument is number of arguments the function can accept **/ -add_action('epfl_google_forms_action', 'renderGoogleForms', 10, 4); +add_action('epfl_google_forms_action', 'renderGoogleForms', 10, 3); -function renderGoogleForms ( $src, $width, $height, $loading) { +function renderGoogleForms ( $src, $width, $height) { if (is_admin()) { @@ -20,7 +20,6 @@ function renderGoogleForms ( $src, $width, $height, $loading) { set_query_var('epfl_google_forms_src', $src); set_query_var('epfl_google_forms_width', $width); set_query_var('epfl_google_forms_height', $height); - set_query_var('epfl_google_forms_loading', $loading); get_template_part('shortcodes/epfl_google_forms/view'); } } diff --git a/shortcodes/epfl_google_forms/view.php b/shortcodes/epfl_google_forms/view.php index 5fe25535..c9ed583e 100644 --- a/shortcodes/epfl_google_forms/view.php +++ b/shortcodes/epfl_google_forms/view.php @@ -2,11 +2,10 @@ $src = get_query_var('epfl_google_forms_src'); $width = get_query_var('epfl_google_forms_width'); $height = get_query_var('epfl_google_forms_height'); - $loading = get_query_var('epfl_google_forms_loading'); - ?> +
From 6a8aaeca8977e5c4a9d57d67471a733612d8e988 Mon Sep 17 00:00:00 2001 From: jdelasoie Date: Wed, 7 Nov 2018 10:15:32 +0100 Subject: [PATCH 04/14] Update shortcodes/epfl_google_forms/view.php Co-Authored-By: LuluTchab --- shortcodes/epfl_google_forms/view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shortcodes/epfl_google_forms/view.php b/shortcodes/epfl_google_forms/view.php index c9ed583e..c92a8092 100644 --- a/shortcodes/epfl_google_forms/view.php +++ b/shortcodes/epfl_google_forms/view.php @@ -4,7 +4,7 @@ $height = get_query_var('epfl_google_forms_height'); ?> -
+
From 82ff41acab57ed49c894dd75afe4a95ccc3c1081 Mon Sep 17 00:00:00 2001 From: GregLeBarbar Date: Thu, 8 Nov 2018 16:25:46 +0100 Subject: [PATCH 05/14] use crop_large instead crop (too short) (#137) --- shortcodes/custom_teasers/view.php | 2 +- shortcodes/epfl_card/view.php | 2 +- shortcodes/epfl_cover/view.php | 2 +- shortcodes/page_teaser/view.php | 2 +- shortcodes/post_teaser/view.php | 2 +- shortcodes/schools/view.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shortcodes/custom_teasers/view.php b/shortcodes/custom_teasers/view.php index 100dbb17..4c0aa1ab 100644 --- a/shortcodes/custom_teasers/view.php +++ b/shortcodes/custom_teasers/view.php @@ -29,7 +29,7 @@ 'img-fluid', diff --git a/shortcodes/epfl_card/view.php b/shortcodes/epfl_card/view.php index f4775879..97992683 100755 --- a/shortcodes/epfl_card/view.php +++ b/shortcodes/epfl_card/view.php @@ -34,7 +34,7 @@ 'img-fluid', diff --git a/shortcodes/epfl_cover/view.php b/shortcodes/epfl_cover/view.php index b09d89d0..d0fd5669 100755 --- a/shortcodes/epfl_cover/view.php +++ b/shortcodes/epfl_cover/view.php @@ -8,7 +8,7 @@ 'img-fluid', diff --git a/shortcodes/page_teaser/view.php b/shortcodes/page_teaser/view.php index d9265248..6f2b2292 100644 --- a/shortcodes/page_teaser/view.php +++ b/shortcodes/page_teaser/view.php @@ -15,7 +15,7 @@ 'img-fluid']), + get_the_post_thumbnail($page, 'thumbnail_16_9_large', ['class' => 'img-fluid']), $page_url ); ?> diff --git a/shortcodes/post_teaser/view.php b/shortcodes/post_teaser/view.php index e4252314..fe5000d2 100644 --- a/shortcodes/post_teaser/view.php +++ b/shortcodes/post_teaser/view.php @@ -14,7 +14,7 @@ 'img-fluid']), + get_the_post_thumbnail($post, 'thumbnail_16_9_large', ['class' => 'img-fluid']), $post_url, false ); diff --git a/shortcodes/schools/view.php b/shortcodes/schools/view.php index 17767f1f..9e540e0d 100644 --- a/shortcodes/schools/view.php +++ b/shortcodes/schools/view.php @@ -11,7 +11,7 @@
- 'img-fluid']) ?> + 'img-fluid']) ?>

From ca85d8e84fff712347999f56e25d57763404f779 Mon Sep 17 00:00:00 2001 From: jdelasoie Date: Tue, 13 Nov 2018 10:58:23 +0100 Subject: [PATCH 06/14] Fix wrong context for translation (#136) --- shortcodes/epfl_publication/render.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shortcodes/epfl_publication/render.php b/shortcodes/epfl_publication/render.php index 8ecab86d..d12ed201 100644 --- a/shortcodes/epfl_publication/render.php +++ b/shortcodes/epfl_publication/render.php @@ -39,12 +39,12 @@ protected static function post_render() { Class ClassesInfoscience2018Render extends Infoscience2018Render { protected static function render_header_1($value) { - $translated_value = esc_html__($value, 'epfl'); + $translated_value = esc_html__($value, 'epfl-infoscience-search'); return '

'. $translated_value . '

'; } protected static function render_header_2($value) { - $translated_value = esc_html__($value, 'epfl'); + $translated_value = esc_html__($value, 'epfl-infoscience-search'); return '

'. $translated_value . '

'; } From a653430595230f38b6cddcd474e9c0252966b2ea Mon Sep 17 00:00:00 2001 From: GregLeBarbar Date: Tue, 13 Nov 2018 10:58:46 +0100 Subject: [PATCH 07/14] Crop quote image with square crop (#139) --- shortcodes/epfl_quote/view.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shortcodes/epfl_quote/view.php b/shortcodes/epfl_quote/view.php index 7b7830dc..dc2fa4f3 100644 --- a/shortcodes/epfl_quote/view.php +++ b/shortcodes/epfl_quote/view.php @@ -7,7 +7,15 @@
- <?php echo esc_attr($cite); ?> + 'img-fluid rounded-circle', + 'alt' => esc_attr($cite) + ] + ) ?>
From b8b2cad43b8596e7cb45f414d3f3231af2b266ed Mon Sep 17 00:00:00 2001 From: GregLeBarbar Date: Tue, 13 Nov 2018 11:03:44 +0100 Subject: [PATCH 08/14] shortcode 'highlight page' Improve image width (#140) * Improve image width * Improve image width --- shortcodes/page_highlight/view.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/shortcodes/page_highlight/view.php b/shortcodes/page_highlight/view.php index f7a10c42..969f4f4c 100644 --- a/shortcodes/page_highlight/view.php +++ b/shortcodes/page_highlight/view.php @@ -17,9 +17,12 @@
- An image description - + + An image description +
From e88ad268e021de825c23a93b882e6784ee75570c Mon Sep 17 00:00:00 2001 From: jdelasoie Date: Tue, 13 Nov 2018 11:06:49 +0100 Subject: [PATCH 09/14] Fix people html (#138) * Add default avatar picture if missing * Add missing classes * Rework style and fix image url * Add comment on inline style --- .../defaults/person-avatar-default-small.png | Bin 0 -> 4781 bytes shortcodes/epfl_people/view.php | 21 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 assets/images/defaults/person-avatar-default-small.png diff --git a/assets/images/defaults/person-avatar-default-small.png b/assets/images/defaults/person-avatar-default-small.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae45fc789fdc781cbf2debaeac0a5a57c25505f GIT binary patch literal 4781 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 Hu0mjf9aQ{r literal 0 HcmV?d00001 diff --git a/shortcodes/epfl_people/view.php b/shortcodes/epfl_people/view.php index 47ec7ba9..f6a90282 100644 --- a/shortcodes/epfl_people/view.php +++ b/shortcodes/epfl_people/view.php @@ -48,17 +48,8 @@
- - <?php echo esc_attr($person->prenom) ?> <?php echo esc_attr($person->nom) ?> - -
- email): ?> - email) ?> - - - +41 21 69 - -
+ + <?php echo esc_attr($person->prenom) ?> <?php echo esc_attr($person->nom) ?>

prenom) ?> nom) ?>

@@ -71,6 +62,14 @@
+
+ email): ?> + email) ?> + + + +41 21 69 + +
From 79b3eb5bf4b4d115fb21f437b76ee1bef8af8b66 Mon Sep 17 00:00:00 2001 From: GregLeBarbar Date: Tue, 13 Nov 2018 16:32:07 +0100 Subject: [PATCH 10/14] Shortcode epfl_links_group: Add margin (#141) * Add margin * delete white line --- shortcodes/epfl_links_group/view.php | 36 +++++++++++++++------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/shortcodes/epfl_links_group/view.php b/shortcodes/epfl_links_group/view.php index 51f09188..e123c50d 100644 --- a/shortcodes/epfl_links_group/view.php +++ b/shortcodes/epfl_links_group/view.php @@ -4,21 +4,23 @@ $title = get_query_var('epfl_links_group_title'); $is_links_teaser = ("" !== $main_url); ?> -
- - +
+
+ + +
\ No newline at end of file From 4b11810434c099da6cb84c9011f78f5161c94ae3 Mon Sep 17 00:00:00 2001 From: GregLeBarbar Date: Tue, 13 Nov 2018 16:32:30 +0100 Subject: [PATCH 11/14] add recommended size (#142) --- languages/fr_FR.mo | Bin 2275 -> 2367 bytes languages/fr_FR.po | 46 +++++++++++++--------- shortcodes/custom_highlight/shortcake.php | 1 + shortcodes/custom_teasers/shortcake.php | 1 + shortcodes/hero/shortcake.php | 1 + shortcodes/schools/shortcake.php | 1 + 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/languages/fr_FR.mo b/languages/fr_FR.mo index 6229b264ffdf06acf95bc1c93ab414f8fb4150f9..84a0c34e710f83e164884c0fd8c3df241dc1e98e 100644 GIT binary patch delta 740 zcmYk)y-(Xf7{~F8W08bF+a$b~HV26JC8jD+l!bwXp+iH}wGpwZLWozULm_`6l%vz4bfo?i)&$yPvxw zV$3+UIaHKy7{?Rr#WQ@2SLos`cHliGuz{~J9yKP7?@;q9*or%-dApb~X3Ol+Xkp+B z4&yOC!E1bke^3ehMFnV}7D^Ch05hohFR=^rO$*pgzk-^-flqN8xy&I|lJ(8U=D=4Z zc~i$2jZ;*>??fNNYt$DtkVhsJGo}x_P&?vb0q0R)yx;T~mB=L~@fT{RZ?J{+!}JCr zMw%&{KuyRamszB0!vbnY-lL9a6}1xwIE0_j;sq+PJ7f(L^x24-mJ z%k#+bhecbZNeqSmh6eSHj-XQ=ijsQH-4l3DCej-$IN3zE9#EbIH7DDy{Zr8@{q+N< z5*c{oFR#{W{z}O&*>bJ;!ME$>O@GdMucmSvUT!uQIPPiOdttrlx!iPc?%IdWO#RM% h8y#ONmaA3Yu7z=mE2W=DzAgE-IvPg%KTtmY`5(=9Q;7fo delta 675 zcmXxiPbh<79Ki8s@5Y$TpZPa7Y@|rj`>teG4ociiw2Pax11pr}L`ylky$L5I#6?=p zE?guoC@B=KJ5MRTzwPz3_x(J-?fw0p-}Ah?^nTQ2UcHV@#c1UUaJg+tb>k1p*wd6M z!+mVRQ>?-(bl?Nl;WL(F4#zN$UL3U-^QO>6oJPsZU@fS1CZ&9_jh(oQ)p(7S_=M8H z7fOK~%0k~Ld3LHbpvy9Z9^xoU-U#|Jj(k*#TLmr_;*3%&OlVfEp_9ovO2G}Pci{ob zPHvH()EhSAC(23u;v`l%i#wgMTt#VQ3uVDWloLKjQq&!`v%Y#{QiFMv1Q%^f=RR(3 z456GvFUrmbu>(gjh$)nYHjonP*ox0k8oohk;NFT~P&WLIeb#F(6p;5T3&?*#hCC!k z{y(Id7OqBfNUOE^%!JlfE+-`;V6JLyp88@?Sk|9C(dKMspW{N;`-A#GEMoNNhOWED m\n" "Language-Team: \n" "Language: fr_FR\n" @@ -47,8 +47,9 @@ msgid "Primary" msgstr "" #: functions.php:56 +#, fuzzy msgid "Footer" -msgstr "" +msgstr "Pied de page" #: functions.php:197 msgid "Par défaut" @@ -136,13 +137,19 @@ 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 "" @@ -150,26 +157,26 @@ msgid "" "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 "" @@ -186,7 +193,7 @@ msgstr "" msgid "Url" msgstr "URL" -#: shortcodes/custom_teasers/shortcake.php:64 +#: shortcodes/custom_teasers/shortcake.php:65 msgid "Custom teasers" msgstr "" @@ -236,8 +243,9 @@ 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" @@ -255,11 +263,12 @@ msgstr "Information & inscription" #: shortcodes/epfl_memento/view.php:131 #, fuzzy 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:48 msgid "The last news" @@ -272,7 +281,7 @@ msgstr "Actualités" #: 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:33 shortcodes/page_highlight/view.php:45 +#: shortcodes/page_highlight/view.php:36 shortcodes/page_highlight/view.php:48 msgid "Read more" msgstr "En savoir plus" @@ -280,11 +289,11 @@ msgstr "En savoir plus" msgid "All news" msgstr "Toutes les actualités" -#: shortcodes/epfl_people/view.php:66 +#: shortcodes/epfl_people/view.php:57 msgid "Position" msgstr "Fonction" -#: shortcodes/epfl_people/view.php:70 +#: shortcodes/epfl_people/view.php:61 msgid "Office" msgstr "Bureau" @@ -319,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" @@ -352,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 "" diff --git a/shortcodes/custom_highlight/shortcake.php b/shortcodes/custom_highlight/shortcake.php index 829f1f54..cde0861a 100644 --- a/shortcodes/custom_highlight/shortcake.php +++ b/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'), diff --git a/shortcodes/custom_teasers/shortcake.php b/shortcodes/custom_teasers/shortcake.php index e78d1661..ab9e763e 100644 --- a/shortcodes/custom_teasers/shortcake.php +++ b/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') ) ] ); diff --git a/shortcodes/hero/shortcake.php b/shortcodes/hero/shortcake.php index 73f31495..be98b502 100644 --- a/shortcodes/hero/shortcake.php +++ b/shortcodes/hero/shortcake.php @@ -26,6 +26,7 @@ function hero() { 'libraryType' => array( 'image' ), 'addButton' => esc_html__( 'Select Image', 'epfl' ), 'frameTitle' => esc_html__( 'Select Image', 'epfl' ), + 'description' => esc_html__('Recommended image size: 1920x1080', 'epfl') ) ]; diff --git a/shortcodes/schools/shortcake.php b/shortcodes/schools/shortcake.php index a2121c0b..0a940ef7 100644 --- a/shortcodes/schools/shortcake.php +++ b/shortcodes/schools/shortcake.php @@ -33,6 +33,7 @@ function schools() { 'libraryType' => array( 'image' ), 'addButton' => esc_html__( 'Select Image', 'epfl' ), 'frameTitle' => esc_html__( 'Select Image', 'epfl' ), + 'description' => esc_html__('Recommended image size: 1920x1080', 'epfl') ) ] ); From cfdbc6e2ce71b3bb634f916373561d9e4e7dfab2 Mon Sep 17 00:00:00 2001 From: jdelasoie Date: Tue, 13 Nov 2018 16:35:38 +0100 Subject: [PATCH 12/14] Set full container in all case; allow to add a gray wrapper (#143) --- shortcodes/epfl_card/view.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/shortcodes/epfl_card/view.php b/shortcodes/epfl_card/view.php index 97992683..cc184e59 100755 --- a/shortcodes/epfl_card/view.php +++ b/shortcodes/epfl_card/view.php @@ -1,5 +1,6 @@ - 1): ?> -
+ +
- - 1): ?>
- From ec5d59d483e3bf29327b80da211a35e4ac2a969b Mon Sep 17 00:00:00 2001 From: jdelasoie Date: Tue, 13 Nov 2018 20:14:18 +0100 Subject: [PATCH 13/14] Simplify renderer to align the feed in center (#144) --- shortcodes/epfl_social_feed/view.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/shortcodes/epfl_social_feed/view.php b/shortcodes/epfl_social_feed/view.php index d716a5fa..bb990e34 100644 --- a/shortcodes/epfl_social_feed/view.php +++ b/shortcodes/epfl_social_feed/view.php @@ -1,7 +1,7 @@
- 1): ?> -