From 74ece659471d6869709d61a634f782153f49d6f5 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Sun, 3 Nov 2019 07:11:05 -0600 Subject: [PATCH 1/2] Add Velocity slides --- slides/index.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/slides/index.yaml b/slides/index.yaml index c98a0d1a..788d3b1f 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -5,6 +5,7 @@ speaker: jpetazzo title: Deploying and scaling applications with Kubernetes attend: https://conferences.oreilly.com/velocity/vl-eu/public/schedule/detail/79109 + slides: https://velocity-2019-11.container.training/ - date: 2019-11-13 country: fr From 8320534a5c10272ca9f68a1256baccfce4a85329 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Sun, 3 Nov 2019 07:42:24 -0600 Subject: [PATCH 2/2] Add prefix to slide numbers --- slides/intro-fullday.yml | 2 ++ slides/intro-selfpaced.yml | 2 ++ slides/kadm-fullday.yml | 2 ++ slides/kadm-twodays.yml | 2 ++ slides/kube-fullday.yml | 2 ++ slides/kube-halfday.yml | 2 ++ slides/kube-selfpaced.yml | 2 ++ slides/kube-twodays.yml | 2 ++ slides/markmaker.py | 3 ++- slides/swarm-fullday.yml | 2 ++ slides/swarm-halfday.yml | 2 ++ slides/swarm-selfpaced.yml | 2 ++ slides/swarm-video.yml | 2 ++ slides/workshop.html | 1 + 14 files changed, 27 insertions(+), 1 deletion(-) diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index b137fb59..a0e31be0 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -9,6 +9,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml index 5ebc32c5..14c494b3 100644 --- a/slides/intro-selfpaced.yml +++ b/slides/intro-selfpaced.yml @@ -9,6 +9,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - in-person diff --git a/slides/kadm-fullday.yml b/slides/kadm-fullday.yml index 18d0a334..9e63d8eb 100644 --- a/slides/kadm-fullday.yml +++ b/slides/kadm-fullday.yml @@ -10,6 +10,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced - static-pods-exercise diff --git a/slides/kadm-twodays.yml b/slides/kadm-twodays.yml index 2c5d4c66..ac78d49f 100644 --- a/slides/kadm-twodays.yml +++ b/slides/kadm-twodays.yml @@ -11,6 +11,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml index 06049482..47449152 100644 --- a/slides/kube-fullday.yml +++ b/slides/kube-fullday.yml @@ -10,6 +10,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml index 4a4856b2..1cbc5337 100644 --- a/slides/kube-halfday.yml +++ b/slides/kube-halfday.yml @@ -10,6 +10,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced diff --git a/slides/kube-selfpaced.yml b/slides/kube-selfpaced.yml index e4823caa..3cf05c7f 100644 --- a/slides/kube-selfpaced.yml +++ b/slides/kube-selfpaced.yml @@ -10,6 +10,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - in-person diff --git a/slides/kube-twodays.yml b/slides/kube-twodays.yml index b8666817..992c7d68 100644 --- a/slides/kube-twodays.yml +++ b/slides/kube-twodays.yml @@ -10,6 +10,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced diff --git a/slides/markmaker.py b/slides/markmaker.py index dd50291f..37cbf6bc 100755 --- a/slides/markmaker.py +++ b/slides/markmaker.py @@ -80,7 +80,7 @@ def flatten(titles): def generatefromyaml(manifest, filename): - manifest = yaml.load(manifest) + manifest = yaml.safe_load(manifest) markdown, titles = processchapter(manifest["chapters"], filename) logging.debug("Found {} titles.".format(len(titles))) @@ -111,6 +111,7 @@ def generatefromyaml(manifest, filename): html = html.replace("@@GITREPO@@", manifest["gitrepo"]) html = html.replace("@@SLIDES@@", manifest["slides"]) html = html.replace("@@TITLE@@", manifest["title"].replace("\n", " ")) + html = html.replace("@@SLIDENUMBERPREFIX@@", manifest.get("slidenumberprefix", "")) return html diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml index 8f30665d..279be3d1 100644 --- a/slides/swarm-fullday.yml +++ b/slides/swarm-fullday.yml @@ -9,6 +9,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced - snap diff --git a/slides/swarm-halfday.yml b/slides/swarm-halfday.yml index a80a0733..30029a95 100644 --- a/slides/swarm-halfday.yml +++ b/slides/swarm-halfday.yml @@ -9,6 +9,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - self-paced - snap diff --git a/slides/swarm-selfpaced.yml b/slides/swarm-selfpaced.yml index 2510eed5..36e1d353 100644 --- a/slides/swarm-selfpaced.yml +++ b/slides/swarm-selfpaced.yml @@ -8,6 +8,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - in-person - btp-auto diff --git a/slides/swarm-video.yml b/slides/swarm-video.yml index 0d361a40..02c1e6b2 100644 --- a/slides/swarm-video.yml +++ b/slides/swarm-video.yml @@ -8,6 +8,8 @@ gitrepo: github.com/jpetazzo/container.training slides: http://container.training/ +#slidenumberprefix: "#SomeHashTag — " + exclude: - in-person - btp-auto diff --git a/slides/workshop.html b/slides/workshop.html index ffb378ce..96f56b04 100644 --- a/slides/workshop.html +++ b/slides/workshop.html @@ -28,6 +28,7 @@ var slideshow = remark.create({ ratio: '16:9', highlightSpans: true, + slideNumberFormat: '@@SLIDENUMBERPREFIX@@%current%/%total%', excludedClasses: [@@EXCLUDE@@] });