Merge pull request #22536 from brianpursley/website-22497

Preserve relative path when switching from latest version of the documentation to an older version
pull/23029/head
Kubernetes Prow Robot 2020-08-26 14:49:02 -07:00 committed by GitHub
commit 390a4d8d9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions

View File

@ -1,4 +1,5 @@
{{ define "main" }} {{ define "main" }}
{{ partial "handle-version-switch-404.html" . }}
<div class="container-404"> <div class="container-404">
<h4> <h4>
Perhaps you were looking for: Perhaps you were looking for:

View File

@ -0,0 +1,11 @@
{{/*
If a 404 occurs and the referrer is a different version of the Kubernetes documentation,
don't show the regular 404 error page, but instead redirect to the site root
*/}}
<script type="text/javascript">
var sameBaseUrlRegExp = new RegExp("^" + location.protocol + "//" + location.host.replace(".", "\\.") + "/.*", "i");
var kubernetesDocumentationUrlRegExp = new RegExp("^https?://(.+\\.)?kubernetes.io/.*", "i");
if (!sameBaseUrlRegExp.test(document.referrer) && kubernetesDocumentationUrlRegExp.test(document.referrer)) {
location.replace("/");
}
</script>

View File

@ -2,7 +2,8 @@
{{ T "version_menu" }} {{ T "version_menu" }}
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
{{ $p := . }}
{{ range .Site.Params.versions }} {{ range .Site.Params.versions }}
<a class="dropdown-item" href="{{ .url }}">{{ .version }}</a> <a class="dropdown-item" href="{{ .url }}{{ $p.RelPermalink }}">{{ .version }}</a>
{{ end }} {{ end }}
</div> </div>