From e173bf4940d269941225752935a30c0770b4df7f Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Sat, 28 May 2022 17:17:09 +0100 Subject: [PATCH 1/2] Add warning about Katacoda shutdown --- data/i18n/en/en.toml | 3 +++ layouts/docs/baseof.html | 5 +++++ layouts/partials/katacoda-removal.html | 7 +++++++ 3 files changed, 15 insertions(+) create mode 100644 layouts/partials/katacoda-removal.html diff --git a/data/i18n/en/en.toml b/data/i18n/en/en.toml index 6c57982f9b..3d164e1841 100644 --- a/data/i18n/en/en.toml +++ b/data/i18n/en/en.toml @@ -96,6 +96,9 @@ other = "email address" [javascript_required] other = "JavaScript must be [enabled](https://www.enable-javascript.com/) to view this content" +[katacoda_removal_warning] +other = """This online tutorial on this page uses functionality that will [not be available](https://www.oreilly.com/online-learning/leveraging-katacoda-technology.html) past .""" + [latest_release] other = "Latest Release:" diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html index 846073bcf1..31082fb8f7 100644 --- a/layouts/docs/baseof.html +++ b/layouts/docs/baseof.html @@ -24,6 +24,11 @@ {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} {{ block "deprecated" . }} {{ partial "deprecation-warning.html" . }} + {{ end }} + {{ if .HasShortcode "kat-button" }} + {{ block "katacoda-removal" . }} + {{ partial "katacoda-removal.html" . }} + {{ end }} {{ end }} {{ block "main" . }}{{ end }} {{- if .HasShortcode "thirdparty-content" -}} diff --git a/layouts/partials/katacoda-removal.html b/layouts/partials/katacoda-removal.html new file mode 100644 index 0000000000..87ff83b417 --- /dev/null +++ b/layouts/partials/katacoda-removal.html @@ -0,0 +1,7 @@ +
+
+

+ {{ T "katacoda_removal_warning" | markdownify }} +

+
+
From a7c5ec8eda8546dc8847487fb6a9ec10d5eef565 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Sun, 29 May 2022 14:17:54 +0100 Subject: [PATCH 2/2] Extend Katacoda removal warning Also cover HTML-based interactive tutorials that do not launch Katacoda from a button. This commit only updates the English localization. --- .../configure-java-microservice-interactive.html | 2 +- .../kubernetes-basics/create-cluster/cluster-interactive.html | 2 +- .../kubernetes-basics/deploy-app/deploy-interactive.html | 2 +- .../kubernetes-basics/explore/explore-interactive.html | 2 +- .../tutorials/kubernetes-basics/expose/expose-interactive.html | 2 +- .../tutorials/kubernetes-basics/scale/scale-interactive.html | 2 +- .../tutorials/kubernetes-basics/update/update-interactive.html | 2 +- layouts/docs/baseof.html | 2 +- layouts/shortcodes/katacoda-tutorial.html | 1 + 9 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 layouts/shortcodes/katacoda-tutorial.html diff --git a/content/en/docs/tutorials/configuration/configure-java-microservice/configure-java-microservice-interactive.html b/content/en/docs/tutorials/configuration/configure-java-microservice/configure-java-microservice-interactive.html index bb926a1d19..fd3db09a42 100644 --- a/content/en/docs/tutorials/configuration/configure-java-microservice/configure-java-microservice-interactive.html +++ b/content/en/docs/tutorials/configuration/configure-java-microservice/configure-java-microservice-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/content/en/docs/tutorials/kubernetes-basics/create-cluster/cluster-interactive.html b/content/en/docs/tutorials/kubernetes-basics/create-cluster/cluster-interactive.html index 5301c6b7a1..2649ce4f94 100644 --- a/content/en/docs/tutorials/kubernetes-basics/create-cluster/cluster-interactive.html +++ b/content/en/docs/tutorials/kubernetes-basics/create-cluster/cluster-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive.html index 915304f912..d8a525a6d5 100644 --- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive.html +++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/content/en/docs/tutorials/kubernetes-basics/explore/explore-interactive.html b/content/en/docs/tutorials/kubernetes-basics/explore/explore-interactive.html index ad79ec5d7f..82b5f4bb33 100644 --- a/content/en/docs/tutorials/kubernetes-basics/explore/explore-interactive.html +++ b/content/en/docs/tutorials/kubernetes-basics/explore/explore-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/content/en/docs/tutorials/kubernetes-basics/expose/expose-interactive.html b/content/en/docs/tutorials/kubernetes-basics/expose/expose-interactive.html index 2b5d3aa365..ce5eeb455f 100644 --- a/content/en/docs/tutorials/kubernetes-basics/expose/expose-interactive.html +++ b/content/en/docs/tutorials/kubernetes-basics/expose/expose-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/content/en/docs/tutorials/kubernetes-basics/scale/scale-interactive.html b/content/en/docs/tutorials/kubernetes-basics/scale/scale-interactive.html index 3fedf79782..ad01e64c02 100644 --- a/content/en/docs/tutorials/kubernetes-basics/scale/scale-interactive.html +++ b/content/en/docs/tutorials/kubernetes-basics/scale/scale-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/content/en/docs/tutorials/kubernetes-basics/update/update-interactive.html b/content/en/docs/tutorials/kubernetes-basics/update/update-interactive.html index 2e70d61d74..99184ddb3e 100644 --- a/content/en/docs/tutorials/kubernetes-basics/update/update-interactive.html +++ b/content/en/docs/tutorials/kubernetes-basics/update/update-interactive.html @@ -11,7 +11,7 @@ weight: 20 - +{{< katacoda-tutorial >}}
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html index 31082fb8f7..6a6f699056 100644 --- a/layouts/docs/baseof.html +++ b/layouts/docs/baseof.html @@ -25,7 +25,7 @@ {{ block "deprecated" . }} {{ partial "deprecation-warning.html" . }} {{ end }} - {{ if .HasShortcode "kat-button" }} + {{ if or ( .HasShortcode "kat-button" ) ( .HasShortcode "katacoda-tutorial" ) }} {{ block "katacoda-removal" . }} {{ partial "katacoda-removal.html" . }} {{ end }} diff --git a/layouts/shortcodes/katacoda-tutorial.html b/layouts/shortcodes/katacoda-tutorial.html new file mode 100644 index 0000000000..a17b4871a2 --- /dev/null +++ b/layouts/shortcodes/katacoda-tutorial.html @@ -0,0 +1 @@ +