From 8a3dad32069f98241788c31aa7b3b8c61fca88b8 Mon Sep 17 00:00:00 2001 From: AJ Bowen Date: Wed, 27 Feb 2019 11:27:25 -0800 Subject: [PATCH 1/5] Indicate rescheduled workshops; specify that slides are in English --- slides/index.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/slides/index.yaml b/slides/index.yaml index 1eb15fd0..55a40e59 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -11,7 +11,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, rdegez" - title: Déployer ses applications avec Kubernetes (in French) + title: Déployer ses applications avec Kubernetes (delivered in French; slides in English) lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ @@ -20,7 +20,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, alexbuisine" - title: Bien démarrer avec les conteneurs (in French) + title: Bien démarrer avec les conteneurs (delivered in French; slides in English) lang: fr attend: https://enix.io/fr/services/formation/bien-demarrer-avec-les-conteneurs/ @@ -37,7 +37,7 @@ city: Montréal event: Elapse Technologies speaker: jpetazzo - title: Getting Started With Docker And Containers + title: Getting Started With Docker And Containers (rescheduled for June 2019) attend: http://elapsetech.com/formation/docker-101 - date: 2019-02-26 @@ -45,7 +45,7 @@ city: Montréal event: Elapse Technologies speaker: jpetazzo - title: Getting Started With Kubernetes And Orchestration + title: Getting Started With Kubernetes And Orchestration (rescheduled for June 2019) attend: http://elapsetech.com/formation/kubernetes-101 - date: 2019-02-28 @@ -54,7 +54,7 @@ lang: fr event: Elapse Technologies speaker: jpetazzo - title: Bien démarrer avec Docker et les conteneurs (in French) + title: Bien démarrer avec Docker et les conteneurs (in French) (rescheduled for June 2019) attend: http://elapsetech.com/formation/docker-101 - date: 2019-03-01 @@ -63,7 +63,7 @@ lang: fr event: Elapse Technologies speaker: jpetazzo - title: Bien démarrer avec Docker et l'orchestration (in French) + title: Bien démarrer avec Docker et l'orchestration (in French) (rescheduled for June 2019) attend: http://elapsetech.com/formation/kubernetes-101 - date: [2019-01-07, 2019-01-08] @@ -71,7 +71,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, alexbuisine" - title: Bien démarrer avec les conteneurs (in French) + title: Bien démarrer avec les conteneurs (delivered in French; slides in English) lang: fr attend: https://enix.io/fr/services/formation/bien-demarrer-avec-les-conteneurs/ slides: https://intro-2019-01.container.training @@ -81,7 +81,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, rdegez" - title: Déployer ses applications avec Kubernetes (in French) + title: Déployer ses applications avec Kubernetes (delivered in French; slides in English) lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ slides: http://decembre2018.container.training @@ -169,7 +169,7 @@ city: Paris event: ENIX SAS speaker: jpetazzo - title: Déployer ses applications avec Kubernetes (in French) + title: Déployer ses applications avec Kubernetes (delivered in French; slides in English) lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ slides: https://septembre2018.container.training From d877844a5e1009c22d69882ab5709957769f2db5 Mon Sep 17 00:00:00 2001 From: AJ Bowen Date: Wed, 27 Feb 2019 12:21:39 -0800 Subject: [PATCH 2/5] Add 'status' yaml field; only display 'slides' link if slides field is present; only display 'attend' link if attend field is present --- slides/index.py | 7 +++++-- slides/index.yaml | 28 ++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/slides/index.py b/slides/index.py index 8b2627fa..33caca57 100755 --- a/slides/index.py +++ b/slides/index.py @@ -18,7 +18,10 @@ TEMPLATE=""" {{ item.title }} {% if item.slides %}{% endif %} - + {% if item.attend %} + {% else %} +

{{ item.status }}

+ {% endif %} Scheduled {{ item.prettydate }} at {{ item.event }} in {{item.city }}. @@ -32,7 +35,7 @@ TEMPLATE=""" {% for item in past_workshops[:5] %} {{ item.title }} - + {% if item.slides %}{% endif %} {% if item.video %}{% endif %} diff --git a/slides/index.yaml b/slides/index.yaml index 55a40e59..ce169163 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -1,3 +1,19 @@ +- date: 2019-06-18 + country: ca + city: Montréal + event: Elapse Technologies + title: Getting Started With Kubernetes And Orchestration + speaker: jpetazzo + status: coming soon + +- date: 2019-06-17 + country: ca + city: Montréal + event: Elapse Technologies + title: Getting Started With Docker And Containers + speaker: jpetazzo + status: coming soon + - date: 2019-04-28 country: us city: Chicago, IL @@ -38,7 +54,7 @@ event: Elapse Technologies speaker: jpetazzo title: Getting Started With Docker And Containers (rescheduled for June 2019) - attend: http://elapsetech.com/formation/docker-101 + status: rescheduled - date: 2019-02-26 country: ca @@ -46,7 +62,7 @@ event: Elapse Technologies speaker: jpetazzo title: Getting Started With Kubernetes And Orchestration (rescheduled for June 2019) - attend: http://elapsetech.com/formation/kubernetes-101 + status: rescheduled - date: 2019-02-28 country: ca @@ -54,8 +70,8 @@ lang: fr event: Elapse Technologies speaker: jpetazzo - title: Bien démarrer avec Docker et les conteneurs (in French) (rescheduled for June 2019) - attend: http://elapsetech.com/formation/docker-101 + title: Bien démarrer avec Docker et les conteneurs (in French) + status: cancelled - date: 2019-03-01 country: ca @@ -63,8 +79,8 @@ lang: fr event: Elapse Technologies speaker: jpetazzo - title: Bien démarrer avec Docker et l'orchestration (in French) (rescheduled for June 2019) - attend: http://elapsetech.com/formation/kubernetes-101 + title: Bien démarrer avec Docker et l'orchestration (in French) + status: cancelled - date: [2019-01-07, 2019-01-08] country: fr From ad809140008cd7a1d9ed2cad0913bb52d6c81100 Mon Sep 17 00:00:00 2001 From: AJ Bowen Date: Wed, 27 Feb 2019 12:25:26 -0800 Subject: [PATCH 3/5] Also display 'status' for past events if there is no 'slides' field and 'status' field is present --- slides/index.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slides/index.py b/slides/index.py index 33caca57..43c25478 100755 --- a/slides/index.py +++ b/slides/index.py @@ -35,7 +35,10 @@ TEMPLATE=""" {% for item in past_workshops[:5] %} {{ item.title }} - {% if item.slides %}{% endif %} + {% if item.slides %} + {% else %} +

{{ item.status }}

+ {% endif %} {% if item.video %}{% endif %} From 1fb0ec7580284c6f767d43988a306d9ee1a779a8 Mon Sep 17 00:00:00 2001 From: AJ Bowen Date: Wed, 27 Feb 2019 12:30:23 -0800 Subject: [PATCH 4/5] Keep the attend URL handy to facilitate future updates --- slides/index.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index ce169163..dab41b85 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -5,6 +5,7 @@ title: Getting Started With Kubernetes And Orchestration speaker: jpetazzo status: coming soon + hidden: http://elapsetech.com/formation/kubernetes-101 - date: 2019-06-17 country: ca @@ -13,6 +14,7 @@ title: Getting Started With Docker And Containers speaker: jpetazzo status: coming soon + hidden: http://elapsetech.com/formation/docker-101 - date: 2019-04-28 country: us From e16c1d982ad4cb9c208b0ebebfd16f8181720498 Mon Sep 17 00:00:00 2001 From: AJ Bowen Date: Wed, 27 Feb 2019 12:56:13 -0800 Subject: [PATCH 5/5] Add a note to specify that slides are always in English --- slides/index.py | 1 + slides/index.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/slides/index.py b/slides/index.py index 43c25478..2e59ae59 100755 --- a/slides/index.py +++ b/slides/index.py @@ -10,6 +10,7 @@ TEMPLATE="""
+ {% if coming_soon %} diff --git a/slides/index.yaml b/slides/index.yaml index dab41b85..b2e7467f 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -29,7 +29,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, rdegez" - title: Déployer ses applications avec Kubernetes (delivered in French; slides in English) + title: Déployer ses applications avec Kubernetes (in French) lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ @@ -38,7 +38,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, alexbuisine" - title: Bien démarrer avec les conteneurs (delivered in French; slides in English) + title: Bien démarrer avec les conteneurs (in French) lang: fr attend: https://enix.io/fr/services/formation/bien-demarrer-avec-les-conteneurs/ @@ -89,7 +89,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, alexbuisine" - title: Bien démarrer avec les conteneurs (delivered in French; slides in English) + title: Bien démarrer avec les conteneurs (in French) lang: fr attend: https://enix.io/fr/services/formation/bien-demarrer-avec-les-conteneurs/ slides: https://intro-2019-01.container.training @@ -99,7 +99,7 @@ city: Paris event: ENIX SAS speaker: "jpetazzo, rdegez" - title: Déployer ses applications avec Kubernetes (delivered in French; slides in English) + title: Déployer ses applications avec Kubernetes lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ slides: http://decembre2018.container.training @@ -187,7 +187,7 @@ city: Paris event: ENIX SAS speaker: jpetazzo - title: Déployer ses applications avec Kubernetes (delivered in French; slides in English) + title: Déployer ses applications avec Kubernetes lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ slides: https://septembre2018.container.training
{{ title }}
Note: while some workshops are delivered in French, slides are always in English.
Coming soon near you