From 71303db06b9b229e730297336cd0fce8fe2fbf6e Mon Sep 17 00:00:00 2001 From: Karen Bradshaw Date: Tue, 18 Aug 2020 16:52:24 -0400 Subject: [PATCH] use docsy page edit/issue setup setting feedback buttons, primary color setting update i18n with issue string remove local edit page string --- assets/scss/_variables_project.scss | 2 ++ config.toml | 8 ++++- i18n/en.toml | 10 ++---- layouts/blog/baseof.html | 1 - layouts/docs/baseof.html | 2 +- layouts/partials/docs/content-page.html | 9 ----- layouts/partials/git-info.html | 48 ------------------------- layouts/partials/toc.html | 8 +++++ 8 files changed, 21 insertions(+), 67 deletions(-) delete mode 100644 layouts/partials/git-info.html create mode 100644 layouts/partials/toc.html diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss index da42c07367..9030d61dc9 100644 --- a/assets/scss/_variables_project.scss +++ b/assets/scss/_variables_project.scss @@ -11,3 +11,5 @@ Add styles or override variables from the theme here. */ @import "base"; @import "tablet"; @import "desktop"; + +$primary: #3371e3; \ No newline at end of file diff --git a/config.toml b/config.toml index 0915eeb4c3..f5425257d9 100644 --- a/config.toml +++ b/config.toml @@ -112,6 +112,8 @@ copyright_linux = "Copyright © 2020 The Linux Foundation ®." version_menu = "Versions" time_format_blog = "Monday, January 02, 2006" +time_format_default = "January 02, 2006 at 3:04 PM PST" + description = "Production-Grade Container Orchestration" showedit = true @@ -124,9 +126,13 @@ docsbranch = "master" deprecated = false currentUrl = "https://kubernetes.io/docs/home/" nextUrl = "https://kubernetes-io-vnext-staging.netlify.com/" -githubWebsiteRepo = "github.com/kubernetes/website" + +# See codenew shortcode githubWebsiteRaw = "raw.githubusercontent.com/kubernetes/website" +# GitHub repository link for editing a page and opening issues. +github_repo = "https://github.com/kubernetes/website" + # param for displaying an announcement block on every page. # See /i18n/en.toml for message text and title. announcement = true diff --git a/i18n/en.toml b/i18n/en.toml index 79145e3dd9..dd6e7545a4 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -150,12 +150,6 @@ other = """The Linux Foundation ®. All rights reserved. The Linux Foundation [main_documentation_license] other = """The Kubernetes Authors | Documentation Distributed under CC BY 4.0""" -[main_edit_this_page] -other = "Edit This Page" - -[main_github_create_an_issue] -other = "Create an Issue" - [main_github_invite] other = "Interested in hacking on the core Kubernetes code base?" @@ -195,6 +189,9 @@ other = "Objectives" [options_heading] other = "Options" +[post_create_issue] +other = "Create an issue" + [prerequisites_heading] other = "Before you begin" @@ -207,7 +204,6 @@ other = "Subscribe" [synopsis_heading] other = "Synopsis" - [thirdparty_message] other = """This section links to third party projects that provide functionality required by Kubernetes. The Kubernetes project authors aren't responsible for these projects. This page follows CNCF website guidelines by listing projects alphabetically. To add a project to this list, read the content guide before submitting a change.""" diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html index 704968d73e..f208811236 100644 --- a/layouts/blog/baseof.html +++ b/layouts/blog/baseof.html @@ -37,7 +37,6 @@
{{ partial "blog-meta-links.html" . }} - {{ partial "toc.html" . }}
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html index 04ca30871b..ec0b4d575a 100644 --- a/layouts/docs/baseof.html +++ b/layouts/docs/baseof.html @@ -25,7 +25,7 @@ {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} {{ partial "feedback.html" .Site.Params.ui.feedback }} {{ end }} - {{ partial "git-info.html" . }} +
{{ partial "page-meta-lastmod.html" . }}
{{ if (.Site.DisqusShortname) }}
{{ partial "disqus-comment.html" . }} diff --git a/layouts/partials/docs/content-page.html b/layouts/partials/docs/content-page.html index 38a1f205cb..02430aa9d3 100644 --- a/layouts/partials/docs/content-page.html +++ b/layouts/partials/docs/content-page.html @@ -1,12 +1,3 @@ -{{ 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 }} -

- - Edit This Page - -

-{{- end -}} {{ if not .page.Params.notitle }}

{{ .page.Title }}

{{ $desc := .page.Description }} diff --git a/layouts/partials/git-info.html b/layouts/partials/git-info.html deleted file mode 100644 index 3b7b5ed396..0000000000 --- a/layouts/partials/git-info.html +++ /dev/null @@ -1,48 +0,0 @@ - diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html new file mode 100644 index 0000000000..a57cad567b --- /dev/null +++ b/layouts/partials/toc.html @@ -0,0 +1,8 @@ +{{ partial "page-meta-links.html" . }} +{{ if not .Params.notoc }} +{{ with .TableOfContents }} +{{ if ge (len .) 100 }} +{{ . }} +{{ end }} +{{ end }} +{{ end }} \ No newline at end of file