Merge pull request #23032 from sftim/20200808_show_deprecation_warning

Tidy & fix deprecation warnings

layouts/partials/css.html

@@ -21,9 +21,6 @@
 {{- if .Site.Params.announcement }}
 <link rel="stylesheet" href="{{ "css/announcement.css" | relURL }}">
 {{- end }}
-{{- if .Site.Params.deprecated }}
-<link rel="stylesheet" href="{{ "css/deprecation-warning.css" | relURL }}">
-{{- end }}
 
 {{- if or (eq .Params.class "gridPage") (eq .Params.class "gridPage gridPageHome") }}
   <link rel="stylesheet" href="{{ "css/gridpage.css" | relURL }}">

layouts/partials/deprecation-warning.html

@@ -1,14 +1,12 @@
-{{ if .Site.Param "deprecated" }}
-<section id="deprecationWarning">
-  <main>
-    <div class="content deprecation-warning">
-      <h3>
-        {{ T "deprecation_title" }} {{ .Param "version" }}
-      </h3>
-      <p> Kubernetes {{ .Param "version" }} {{ T "deprecation_warning" }}
-        <a href="{{ site.Params.currentUrl }}">{{ T "latest_version" }}</a>
-      </p>
-    </div>
-  </main>
+{{ if (.Site.Param "deprecated") }}
+<section id="deprecation-warning">
+  <div class="content deprecation-warning">
+    <h3>
+      {{ T "deprecation_title" }} {{ .Param "version" }}
+    </h3>
+    <p> Kubernetes {{ .Param "version" }} {{ T "deprecation_warning" }}
+      <a href="{{ site.Params.currentUrl }}">{{ T "latest_version" }}</a>
+    </p>
+  </div>
 </section>
 {{ end }}

layouts/partials/docs/content-page.html

@@ -1,3 +1,4 @@
+{{ if not (.Site.Param "deprecated") }}
 {{- $filepath := .page.File.Path }}
 {{- $editLink := printf "https://github.com/kubernetes/website/edit/master/content/%s/%s" .page.Language.Lang $filepath }}
 <p>
@@ -5,6 +6,7 @@
     Edit This Page
   </a>
 </p>
+{{- end -}}
 {{ if not .page.Params.notitle }}
   <h1>{{ .page.Title }}</h1>
   {{ $desc := .page.Description }}