From c522ab932a245198dec0ec9d719294e32d99c997 Mon Sep 17 00:00:00 2001 From: Boris SCHAPIRA Date: Mon, 25 Jun 2018 15:30:17 +0200 Subject: [PATCH] Multiple speakrs talks --- _data/speakers.yml | 40 +++++++++++++++---- _includes/conferences.html | 8 +++- _includes/schema.html | 2 +- _includes/speakers.html | 2 +- _sass/base/_typo.scss | 2 +- _sass/ui-componants/_conference.scss | 4 ++ _talks/conferences/chrome-ux-report.md | 2 +- _talks/conferences/lightning-fast-ux.md | 2 +- ...organizing-business-for-web-performance.md | 10 +++-- 9 files changed, 54 insertions(+), 18 deletions(-) diff --git a/_data/speakers.yml b/_data/speakers.yml index 979ab0a3..204ba3b1 100644 --- a/_data/speakers.yml +++ b/_data/speakers.yml @@ -26,16 +26,42 @@ stephanie: Inconnue bio: >- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Primum in nostrane potestate est, quid meminerimus? Itaque rursus eadem ratione, qua sum paulo ante usus, haerebitis. -roundtable: - name: Table ronde - image: /assets/images/speakers/roundtable.jpg +lesfurets: + name: LesFurets.com + image: /assets/images/speakers/lesfurets.jpg en_US: alt: >- - Several people + LesFurets.com logo bio: >- - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Primum in nostrane potestate est, quid meminerimus? Itaque rursus eadem ratione, qua sum paulo ante usus, haerebitis. + LesFurets.com is a French comparison site published by Courtanet. It enables users to compare rates, warranties and services for automobile, health, two-wheeler, home and loan insurance. fr_FR: alt: >- - Plusieurs silhouettes + Logo de LesFurets.com bio: >- - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Primum in nostrane potestate est, quid meminerimus? Itaque rursus eadem ratione, qua sum paulo ante usus, haerebitis. + LesFurets.com est un site de comparaison français édité par la société Courtanet. Il permet de comparer les tarifs, les garanties et les services d'assurance automobile, santé, deux roues, habitation et emprunteur. +ouestfrance: + name: Ouest France Multimédia + image: /assets/images/speakers/ouestfrance.jpg + en_US: + alt: >- + Ouest France logo + bio: >- + Ouest-France Multimédia is a subsidiary of Ouest-France. The company is dedicated to providing services and managing Ouest-France's web portals organized by sector: automotive, real estate, employment, internships & block release training and the maville.com network. + fr_FR: + alt: >- + Logo Ouest France + bio: >- + Ouest-France Multimédia est une filiale de Ouest-France. Elle est dédiée aux prestations de services et gestion des portails web de Ouest-France organisés par secteur : automobile, immobilier, emploi, stages-alternance, et le réseau maville.com. +lequipe: + name: L'équipe + image: /assets/images/speakers/lequipe.jpg + en_US: + alt: >- + L'Équipe logo + bio: >- + The L'Équipe Interactive site, launched in 2000, is the leading French sports information site with over 2.3 million unique visitors in May 2007 and 230 million page views. + fr_FR: + alt: >- + Logo l'Équipe + bio: >- + Le site L'Équipe interactif, lancé en 2000, est le premier site d'informations sportives français avec plus de 2,3 M de visiteurs uniques en mai 2007 et 230 M de pages vues. diff --git a/_includes/conferences.html b/_includes/conferences.html index 0355bdb8..5e7afccc 100644 --- a/_includes/conferences.html +++ b/_includes/conferences.html @@ -25,7 +25,7 @@

{% endif %} - {% for names in conference.speaker %} + {% for names in conference.speakers %} {% assign speaker = site.data.speakers[names] %} {% if include.locale == "en_US" and speaker.en_US %} {% assign speakatim = speaker.en_US %} @@ -38,7 +38,11 @@

{{ speaker.name }}

- {% t Présenté par %}
+ {% unless conference.speakers | size > 1 %} + {% t Présenté par %}
+ {% else %} + Avec la participation de
+ {% endunless %} {% capture person %}{{ speaker.name }}{% endcapture %} {% if speaker.url %} {% capture person %}{{ person }}{% endcapture %} diff --git a/_includes/schema.html b/_includes/schema.html index 89e2d064..1dc3694f 100644 --- a/_includes/schema.html +++ b/_includes/schema.html @@ -60,7 +60,7 @@ "performer": [ {% for conference in site.talks %} {% unless forloop.first %},{% endunless %} - {% for names in conference.speaker %} + {% for names in conference.speakers %} {% assign speaker = site.data.speakers[names] %} {% unless forloop.first or forloop.last %},{% endunless %} { diff --git a/_includes/speakers.html b/_includes/speakers.html index 7c74a0d8..967bc227 100644 --- a/_includes/speakers.html +++ b/_includes/speakers.html @@ -10,7 +10,7 @@

{% for conference in include.conferences %} - {% for names in conference.speaker %} + {% for names in conference.speakers %} {% capture conf-url %}{% unless include.shorturl %}{{ page.baseurl | default:site.baseurl }}/{{ "programme" | t: include.locale }}{% endunless %}#{{conference.slug}}{% endcapture %} {% assign speaker = site.data.speakers[names] %}
diff --git a/_sass/base/_typo.scss b/_sass/base/_typo.scss index 104b1898..2705ac3f 100644 --- a/_sass/base/_typo.scss +++ b/_sass/base/_typo.scss @@ -44,7 +44,7 @@ h2 { h3 { font-size: 1.25em; - .talks & { + .conference > & { padding: 20px 0 20px 80px; @include media('>=xlarge') { padding-left: 0; diff --git a/_sass/ui-componants/_conference.scss b/_sass/ui-componants/_conference.scss index 6a133567..c3972cfd 100644 --- a/_sass/ui-componants/_conference.scss +++ b/_sass/ui-componants/_conference.scss @@ -1,5 +1,9 @@ .conference { &-speaker { + p { + margin: 0; + } + &-pic { max-width: 6em; float: left; margin: .5em 1em 0 0; overflow: hidden; border-radius: 50%; diff --git a/_talks/conferences/chrome-ux-report.md b/_talks/conferences/chrome-ux-report.md index 5a7f88dd..67261b83 100644 --- a/_talks/conferences/chrome-ux-report.md +++ b/_talks/conferences/chrome-ux-report.md @@ -1,6 +1,6 @@ --- display-order: 1 -speaker: +speakers: - rick fr_FR: title: "Chrome UX Report" diff --git a/_talks/conferences/lightning-fast-ux.md b/_talks/conferences/lightning-fast-ux.md index af1e5e9c..585995f0 100644 --- a/_talks/conferences/lightning-fast-ux.md +++ b/_talks/conferences/lightning-fast-ux.md @@ -1,6 +1,6 @@ --- display-order: 2 -speaker: +speakers: - stephanie fr_FR: title: "L’UX au service de la performance de vos interfaces" diff --git a/_talks/conferences/organizing-business-for-web-performance.md b/_talks/conferences/organizing-business-for-web-performance.md index a4817418..c2cb7a0b 100644 --- a/_talks/conferences/organizing-business-for-web-performance.md +++ b/_talks/conferences/organizing-business-for-web-performance.md @@ -1,13 +1,15 @@ --- display-order: 3 -speaker: - - roundtable +speakers: + - lesfurets + - ouestfrance + - lequipe fr_FR: title: "Organiser l'entreprise pour la Performance Web" description: >- -

Indicant pueri, in quibus ut in speculis natura cernitur. Qui bonum omne in virtute ponit, is potest dicere perfici beatam vitam perfectione virtutis; Quorum altera prosunt, nocent altera. Scientiam pollicentur, quam non erat mirum sapientiae cupido patria esse cariorem. Quae quidem sapientes sequuntur duce natura tamquam videntes; Moriatur, inquit. Nec tamen ullo modo summum pecudis bonum et hominis idem mihi videri potest. Maximus dolor, inquit, brevis est.

+ Insufler une culture de la performance Web en entrepris n'est pas une chose aisée. Les managers doivent imaginer les modalités de l'organisation des projets (équipes transverses ou équipes spécialisées, champions…), définir les budgets, faire adhérer leurs équipes à de nouvelles valeurs en utilisant divers leviers de motivation. Plusieurs acteurs français se réuniront lors d'une table rond pour confronter leurs retours. en_US: title: "Organizing Business for Web Performance" description: >- -

Indicant pueri, in quibus ut in speculis natura cernitur. Qui bonum omne in virtute ponit, is potest dicere perfici beatam vitam perfectione virtutis; Quorum altera prosunt, nocent altera. Scientiam pollicentur, quam non erat mirum sapientiae cupido patria esse cariorem. Quae quidem sapientes sequuntur duce natura tamquam videntes; Moriatur, inquit. Nec tamen ullo modo summum pecudis bonum et hominis idem mihi videri potest. Maximus dolor, inquit, brevis est.

+ Building a Web performance culture in the workplace is not easy. Managers must imagine how projects are organized (transversal or specialized teams, champions, etc.), define budgets, make their teams adhere to new values by using various motivational leverage. Several French actors will exchange during this roundtable to compare their experiences. ---