Merge pull request #23032 from sftim/20200808_show_deprecation_warning

Tidy & fix deprecation warnings
This commit is contained in:
Kubernetes Prow Robot
2020-08-18 09:13:31 -07:00
committed by GitHub
11 changed files with 99 additions and 27 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
<head>
{{ partial "head.html" . }}
</head>
<body class="td-{{ .Kind }}">
<body class="td-{{ .Kind }}{{- if ne .Params.cid "" -}}{{- printf " cid-%s" (lower .Params.cid) -}}{{- end -}}">
<header>
{{ partial "navbar.html" . }}
</header>
@@ -27,7 +27,7 @@
</section>
{{ block "post-hero" . }}
{{ block "deprecated" . }}
{{ if .IsHome }}
{{ if or .IsHome ( eq .Params.cid "partners" ) ( eq .Params.cid "community" ) }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ end }}
+3
View File
@@ -27,6 +27,9 @@
{{ partial "blog-sidebar.html" . }}
</div>
<main class="col-12 col-md-9 col-xl-8 pl-md-5 pr-md-4" role="main">
{{ block "deprecated" . }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ with .CurrentSection.OutputFormats.Get "rss" -}}
<a class="btn btn-lg -bg-orange td-rss-button d-none d-lg-block" href="{{ .Permalink | safeURL }}" target="_blank">
RSS <i class="fa fa-rss ml-2 "></i>
+1
View File
@@ -12,6 +12,7 @@
<section id="mainContent">
<div class="main-section">
<div class="content">
{{ partial "deprecation-warning.html" . }}
<div class="case-studies">
{{ range $featured }}
{{ template "case-study-featured-block" (dict "ctx" $ "page" .) }}
+1
View File
@@ -5,6 +5,7 @@
</head>
<body>
{{ partial "navbar.html" . }}
{{ partial "deprecation-warning.html" . }}
{{ block "main" . }}{{ end }}
{{ partialCached "footer.html" . }}
<!-- Disabling this as elements queries do not appear to exist on case studies -->
+4 -1
View File
@@ -4,7 +4,7 @@
{{ partial "head.html" . }}
<title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
</head>
<body class="td-{{ .Kind }}">
<body class="td-{{ .Kind }} td-documentation">
<header>
{{ partial "navbar.html" . }}
{{ partial "announcement.html" . }}
@@ -25,6 +25,9 @@
</div>
<main class="col-12 col-md-9 col-xl-8 pl-md-5" role="main">
{{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
{{ block "deprecated" . }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ block "main" . }}{{ end }}
{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
{{ partial "feedback.html" .Site.Params.ui.feedback }}
-3
View File
@@ -14,9 +14,6 @@
{{- range $pages }}
{{- if or (.Params.deprecated) (eq .Params.class "gridPage") (.Params.case_study_styles) (.Params.css) (.Params.js) }}
{{ .URL }}
{{- if .Params.deprecated }}
Link: </css/deprecation-warning.css>; rel=preload; as=style
{{- end -}}
{{- if eq .Params.class "gridPage" }}
Link: </css/gridpage.css>; rel=preload; as=style
{{- end -}}
-3
View File
@@ -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 }}">
+10 -12
View File
@@ -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 }}
+2
View File
@@ -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 }}