From a276661f0a154938b4d7885e97979780253891a5 Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 17 Feb 2020 12:44:04 +0800 Subject: [PATCH] feat(home): improve default behavior of hiddenFromHomePage --- archetypes/default.md | 17 ++++++------- exampleSite/config.toml | 2 ++ exampleSite/content/posts/emoji-support.md | 23 +++++++---------- exampleSite/content/posts/markdown-syntax.md | 25 +++++++------------ exampleSite/content/posts/placeholder-text.md | 24 +++++++----------- exampleSite/content/posts/rich-content.md | 24 +++++++----------- exampleSite/zh/config.toml | 2 ++ .../content/posts/Basic-Markdown-Preview.md | 24 +++++++----------- layouts/_default/summary.html | 16 ++++-------- layouts/index.html | 6 ++++- layouts/partials/post/share.html | 2 +- layouts/posts/single.html | 10 ++++---- 12 files changed, 73 insertions(+), 102 deletions(-) diff --git a/archetypes/default.md b/archetypes/default.md index 51a441a0..4468df5e 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,25 +1,24 @@ --- -author: "" -author_link: "" title: "{{ replace .TranslationBaseName "-" " " | title }}" date: {{ .Date }} lastmod: {{ .Date }} draft: true +author: "" +authorLink: "" description: "" -show_in_homepage: true -description_as_summary: false license: "" tags: [] categories: [] +hiddenFromHomePage: false -featured_image: "" -featured_image_preview: "" +featuredImage: "" +featuredImagePreview: "" -comment: true toc: false -auto_collapse_toc: true +autoCollapseToc: true math: false +comment: true --- - \ No newline at end of file + diff --git a/exampleSite/config.toml b/exampleSite/config.toml index e97785a4..aa6ab22e 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -151,6 +151,8 @@ dateFormatToUse = "2006-01-02" enable = true # special amount of posts in each home posts page paginate = 6 + # default behavior when you don't set "hiddenFromHomePage" in front matter + defaultHiddenFromHomePage = false # Social Info in home page [params.social] diff --git a/exampleSite/content/posts/emoji-support.md b/exampleSite/content/posts/emoji-support.md index eb1ecb58..2ca9c8ad 100644 --- a/exampleSite/content/posts/emoji-support.md +++ b/exampleSite/content/posts/emoji-support.md @@ -1,29 +1,24 @@ --- -author: "Hugo Authors" -author_link: "https://gohugo.io/" title: "Emoji Support" date: 2019-10-01T17:55:28+08:00 lastmod: 2019-10-01T17:55:28+08:00 draft: false +author: "Hugo Authors" +authorLink: "https://gohugo.io/" description: "Guide to emoji usage in Hugo" -show_in_homepage: true -description_as_summary: false license: "" -tags: [ - "emoji", -] -categories: [ - "theme", -] +tags: ["emoji"] +categories: ["theme"] +hiddenFromHomePage: false -featured_image: /images/emoji.jpg -featured_image_preview: "" +featuredImage: /images/emoji.jpg +featuredImagePreview: "" -comment: true toc: false -auto_collapse_toc: true +autoCollapseToc: true math: false +comment: true --- Emoji can be enabled in a Hugo project in a number of ways. diff --git a/exampleSite/content/posts/markdown-syntax.md b/exampleSite/content/posts/markdown-syntax.md index 59f53908..87549411 100644 --- a/exampleSite/content/posts/markdown-syntax.md +++ b/exampleSite/content/posts/markdown-syntax.md @@ -1,31 +1,24 @@ --- -author: "Hugo Authors" -author_link: "https://gohugo.io/" title: "Markdown Syntax Guide" date: 2019-12-01T21:57:40+08:00 lastmod: 2020-01-01T16:45:40+08:00 draft: false +author: "Hugo Authors" +authorLink: "https://gohugo.io/" description: "Sample article showcasing basic Markdown syntax and formatting for HTML elements." -show_in_homepage: true -description_as_summary: false license: "" -tags: [ - "markdown", - "css", - "html", -] -categories: [ - "theme", -] +tags: ["markdown", "css", "html"] +categories: ["theme"] +hiddenFromHomePage: false -featured_image: /images/markdown.png -featured_image_preview: "" +featuredImage: /images/markdown.png +featuredImagePreview: "" -comment: true toc: true -auto_collapse_toc: true +autoCollapseToc: true math: true +comment: true --- This article offers a sample of basic Markdown syntax that can be used in Hugo content files, also it shows whether basic HTML elements are decorated with CSS in a Hugo theme. diff --git a/exampleSite/content/posts/placeholder-text.md b/exampleSite/content/posts/placeholder-text.md index 7fcc7905..559af7d9 100644 --- a/exampleSite/content/posts/placeholder-text.md +++ b/exampleSite/content/posts/placeholder-text.md @@ -1,30 +1,24 @@ --- -author: "Hugo Authors" -author_link: "https://gohugo.io/" title: "Placeholder Text" date: 2019-08-01T18:02:41+08:00 lastmod: 2019-08-01T18:02:41+08:00 draft: false +author: "Hugo Authors" +authorLink: "https://gohugo.io/" description: "Lorem Ipsum Dolor Si Amet" -show_in_homepage: true -description_as_summary: false license: "" -tags: [ - "markdown", - "text", -] -categories: [ - "theme", -] +tags: ["markdown", "text"] +categories: ["theme"] +hiddenFromHomePage: false -featured_image: "" -featured_image_preview: "" +featuredImage: "" +featuredImagePreview: "" -comment: true toc: false -auto_collapse_toc: true +autoCollapseToc: true math: false +comment: true --- Lorem est tota propiore conpellat pectoribus de diff --git a/exampleSite/content/posts/rich-content.md b/exampleSite/content/posts/rich-content.md index f26c862d..c6f069a1 100644 --- a/exampleSite/content/posts/rich-content.md +++ b/exampleSite/content/posts/rich-content.md @@ -1,30 +1,24 @@ --- -author: "Hugo Authors" -author_link: "https://gohugo.io/" title: "Rich Content" date: 2019-09-01T18:06:32+08:00 lastmod: 2019-09-01T18:06:32+08:00 draft: false +author: "Hugo Authors" +authorLink: "https://gohugo.io/" description: "A brief description of Hugo Shortcodes" -show_in_homepage: true -description_as_summary: false license: "" -tags: [ - "shortcodes", - "privacy", -] -categories: [ - "theme", -] +tags: ["shortcodes", "privacy"] +categories: ["theme"] +hiddenFromHomePage: false -featured_image: /images/hugo.png -featured_image_preview: "" +featuredImage: /images/hugo.png +featuredImagePreview: "" -comment: true toc: false -auto_collapse_toc: true +autoCollapseToc: true math: false +comment: true --- Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-management/shortcodes/#use-hugo-s-built-in-shortcodes) for rich content, along with a [Privacy Config](https://gohugo.io/about/hugo-and-gdpr/) and a set of Simple Shortcodes that enable static and no-JS versions of various social media embeds. diff --git a/exampleSite/zh/config.toml b/exampleSite/zh/config.toml index b2c2a6ee..432dab3f 100644 --- a/exampleSite/zh/config.toml +++ b/exampleSite/zh/config.toml @@ -151,6 +151,8 @@ dateFormatToUse = "2006-01-02" enable = true # 主页每页显示文章数量 paginate = 6 + # 当你没有在文章前面设置 "hiddenFromHomePage" 时的默认行为 + defaultHiddenFromHomePage = false # 主页的社交信息设置 [params.social] diff --git a/exampleSite/zh/content/posts/Basic-Markdown-Preview.md b/exampleSite/zh/content/posts/Basic-Markdown-Preview.md index 6da58b87..1f402292 100644 --- a/exampleSite/zh/content/posts/Basic-Markdown-Preview.md +++ b/exampleSite/zh/content/posts/Basic-Markdown-Preview.md @@ -1,30 +1,24 @@ --- -author: "" -author_link: "" title: "Markdown 基本语法预览" date: 2019-08-25T16:22:42+08:00 lastmod: 2019-08-25T16:22:42+08:00 draft: false +author: "" +authorLink: "" description: "这是一篇用于预览 Markdown 基本语法的文章。" -show_in_homepage: true -description_as_summary: false license: "" -tags: [ - "Hugo", - "主题", -] -categories: [ - "预览", -] +tags: ["Hugo", "主题"] +categories: ["预览"] -featured_image: "" -featured_image_preview: "" +featuredImage: "" +featuredImagePreview: "" +hiddenFromHomePage: false -comment: true toc: true -auto_collapse_toc: true +autoCollapseToc: true math: true +comment: true --- 这是一篇用于预览 :(fab fa-markdown): Markdown 基本语法的文章。 diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index cc11c2dd..eb1db715 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,8 +1,8 @@
{{- /* Featured image */ -}} - {{- with .Params.featured_image -}} + {{- with .Params.featuredImage -}}
- {{- $image := $.Params.featured_image_preview | default . -}} + {{- $image := $.Params.featuredImagePreview | default . -}} {{- partial "hook/image" $image -}}
{{- end -}} @@ -15,8 +15,8 @@ {{- /* Meta */ -}}
{{- $author := .Params.author | default .Site.Author.name -}} - {{- $author_link := .Params.author_link | default .Site.Author.link | default .Site.BaseURL -}} - @@ -39,13 +39,7 @@ {{- /* Summary content */ -}}
- {{- if .Params.description_as_summary -}} -

- {{- .Params.description -}} -

- {{- else -}} - {{- partial "hook/content.html" .Summary | safeHTML -}} - {{- end -}} + {{- partial "hook/content.html" .Summary | safeHTML -}}
{{- /* Footer */ -}} diff --git a/layouts/index.html b/layouts/index.html index a668db1d..0d3779e5 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -9,7 +9,11 @@ {{- if .Site.Params.home.posts.enable -}} {{- /* Paginate */ -}} {{- $paginator := where .Site.RegularPages "Type" "posts" -}} - {{- $paginator = where $paginator "Params.show_in_homepage" "!=" false -}} + {{- if ne .Site.Params.home.posts.mode.defaultHiddenFromHomePage false -}} + {{- $paginator = where $paginator "Params.hiddenfromhomepage" "!=" true -}} + {{- else -}} + {{- $paginator = where $paginator "Params.hiddenfromhomepage" false -}} + {{- end -}} {{- with .Site.Params.home.posts.paginate -}} {{- $paginator = $.Paginate $paginator . -}} {{- else -}} diff --git a/layouts/partials/post/share.html b/layouts/partials/post/share.html index fa77aa99..d0482b4b 100644 --- a/layouts/partials/post/share.html +++ b/layouts/partials/post/share.html @@ -64,7 +64,7 @@ {{- /* Share on Weibo */ -}} {{- if .Params.Share.Weibo | default .Site.Params.Share.Weibo | eq true -}} - + {{- end -}} diff --git a/layouts/posts/single.html b/layouts/posts/single.html index 90a0a678..a94ec3b1 100644 --- a/layouts/posts/single.html +++ b/layouts/posts/single.html @@ -9,8 +9,8 @@
{{- $author := .Params.author | default .Site.Author.name -}} - {{- $author_link := .Params.author_link | default .Site.Author.link | default .Site.BaseURL -}} -   {{- with .Params.categories -}} @@ -39,7 +39,7 @@
{{- /* Featured image */ -}} - {{- with .Params.featured_image -}} + {{- with .Params.featuredImage -}}
{{- partial "hook/image" . -}}
@@ -49,8 +49,8 @@ {{- if or .Params.toc (and .Site.Params.toc (ne .Params.toc false)) -}}

{{ T "toc" }}

- {{- $globalAutoCollapseToc := .Site.Params.auto_collapse_toc | default true }} -
+ {{- $globalAutoCollapseToc := .Site.Params.autoCollapseToc | default true }} +
{{- .TableOfContents -}}