Skip to content

Commit

Permalink
Multiple speakrs talks
Browse files Browse the repository at this point in the history
  • Loading branch information
borisschapira committed Jun 25, 2018
1 parent 09b77be commit c522ab9
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 18 deletions.
40 changes: 33 additions & 7 deletions _data/speakers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
8 changes: 6 additions & 2 deletions _includes/conferences.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h3>
</p>
{% 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 %}
Expand All @@ -38,7 +38,11 @@ <h3>
<figcaption class="sr-only">{{ speaker.name }}</figcaption>
</figure>
<h3 class="conference-speaker-name">
<span class="text-xs">{% t Présenté par %}</span><br>
{% unless conference.speakers | size > 1 %}
<span class="text-xs">{% t Présenté par %}</span><br>
{% else %}
<span class="text-xs">Avec la participation de</span><br>
{% endunless %}
{% capture person %}<em>{{ speaker.name }}</em>{% endcapture %}
{% if speaker.url %}
{% capture person %}<a href="{{ speaker.url }}">{{ person }}</a>{% endcapture %}
Expand Down
2 changes: 1 addition & 1 deletion _includes/schema.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
{
Expand Down
2 changes: 1 addition & 1 deletion _includes/speakers.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2 class="text-center">
</h2>
<div class="grid-4 text-center">
{% 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] %}
<figure class="person">
Expand Down
2 changes: 1 addition & 1 deletion _sass/base/_typo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ h2 {
h3 {
font-size: 1.25em;

.talks & {
.conference > & {
padding: 20px 0 20px 80px;
@include media('>=xlarge') {
padding-left: 0;
Expand Down
4 changes: 4 additions & 0 deletions _sass/ui-componants/_conference.scss
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down
2 changes: 1 addition & 1 deletion _talks/conferences/chrome-ux-report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
display-order: 1
speaker:
speakers:
- rick
fr_FR:
title: "Chrome UX Report"
Expand Down
2 changes: 1 addition & 1 deletion _talks/conferences/lightning-fast-ux.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
display-order: 2
speaker:
speakers:
- stephanie
fr_FR:
title: "L’UX au service de la performance de vos interfaces"
Expand Down
10 changes: 6 additions & 4 deletions _talks/conferences/organizing-business-for-web-performance.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
---
display-order: 3
speaker:
- roundtable
speakers:
- lesfurets
- ouestfrance
- lequipe
fr_FR:
title: "Organiser l'entreprise pour la Performance Web"
description: >-
<p>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.</p>
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: >-
<p>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.</p>
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.
---

0 comments on commit c522ab9

Please sign in to comment.