From edc508fa62c02db92a74ce7e38533f2fc8415904 Mon Sep 17 00:00:00 2001 From: Dmitry Kolosov Date: Sat, 21 May 2022 14:51:30 +0300 Subject: [PATCH] fix single page menu urls, update example sites #151 --- exampleSite/content/about-subpage.md | 23 ++++++++------- exampleSite/content/about-subpage2.md | 24 +++++++++++++++ exampleSite/content/about.md | 20 ++++++------- .../content/about-subpage.md | 24 +++++++++++++++ .../content/about-subpage.pl.md | 24 +++++++++++++++ .../content/about-subpage2.md | 24 +++++++++++++++ .../content/about-subpage2.pl.md | 24 +++++++++++++++ exampleSiteMultilingual/content/about.md | 29 ++++++++++++++----- exampleSiteMultilingual/content/about.pl.md | 29 ++++++++++++++----- layouts/_default/single.html | 2 +- 10 files changed, 187 insertions(+), 36 deletions(-) create mode 100644 exampleSite/content/about-subpage2.md create mode 100644 exampleSiteMultilingual/content/about-subpage.md create mode 100644 exampleSiteMultilingual/content/about-subpage.pl.md create mode 100644 exampleSiteMultilingual/content/about-subpage2.md create mode 100644 exampleSiteMultilingual/content/about-subpage2.pl.md diff --git a/exampleSite/content/about-subpage.md b/exampleSite/content/about-subpage.md index 1d1dc16..f499aa6 100644 --- a/exampleSite/content/about-subpage.md +++ b/exampleSite/content/about-subpage.md @@ -1,23 +1,24 @@ --- -title: "Subpage" -description: "Just a subpage of about" +title: "About subpage" +description: "About subpage" date: "2019-02-28" author: "Hugo Authors" slug: /about/subpage menu: about: - identifier: about - name: About - title: About - url: /about + identifier: about-subpage-s + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ weight: 1 subpage: - identifier: subpage + identifier: about-subpage2-s parent: about - name: Subpage - title: Subpage - url: /about/subpage/ + name: Second About subpage + title: Second About subpage + url: /about/subpage2/ weight: 10 --- -Just a subpage of About. +About subpage diff --git a/exampleSite/content/about-subpage2.md b/exampleSite/content/about-subpage2.md new file mode 100644 index 0000000..7963032 --- /dev/null +++ b/exampleSite/content/about-subpage2.md @@ -0,0 +1,24 @@ +--- +title: "Second About subpage" +description: "Second About subpage" +date: "2019-02-28" +author: "Hugo Authors" +slug: /about/subpage2 +menu: + about: + identifier: about-subpage-s2 + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage: + identifier: about-subpage2-s2 + parent: about + name: Second About subpage + title: Second About subpage + url: /about/subpage2/ + weight: 10 +--- + +Second About subpage diff --git a/exampleSite/content/about.md b/exampleSite/content/about.md index 627e661..6040fc8 100644 --- a/exampleSite/content/about.md +++ b/exampleSite/content/about.md @@ -2,22 +2,22 @@ title: "About" description: "Hugo, the world’s fastest framework for building websites" date: "2019-02-28" -aliases: - - "about-us" - - "about-hugo" - - "contact" +aliases: ["about-us","about-hugo","contact"] author: "Hugo Authors" menu: about: - name: About - title: About - url: /about + identifier: about-subpage + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ weight: 1 subpage: + identifier: about-subpage2 parent: about - name: Subpage - title: Subpage - url: /about/subpage + name: Second About subpage + title: Second About subpage + url: /about/subpage2/ weight: 10 --- diff --git a/exampleSiteMultilingual/content/about-subpage.md b/exampleSiteMultilingual/content/about-subpage.md new file mode 100644 index 0000000..413f0ea --- /dev/null +++ b/exampleSiteMultilingual/content/about-subpage.md @@ -0,0 +1,24 @@ +--- +title: "About Subpage" +description: "About Subpage" +date: "2019-02-28" +author: "Hugo Authors" +slug: /about/subpage +menu: + subpage: + identifier: about-subpage-s + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage2: + identifier: about-subpage2-s + parent: about + name: Second About Subpage + title: Second About Subpage + url: /about/subpage2/ + weight: 10 +--- + +About subpage diff --git a/exampleSiteMultilingual/content/about-subpage.pl.md b/exampleSiteMultilingual/content/about-subpage.pl.md new file mode 100644 index 0000000..413f0ea --- /dev/null +++ b/exampleSiteMultilingual/content/about-subpage.pl.md @@ -0,0 +1,24 @@ +--- +title: "About Subpage" +description: "About Subpage" +date: "2019-02-28" +author: "Hugo Authors" +slug: /about/subpage +menu: + subpage: + identifier: about-subpage-s + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage2: + identifier: about-subpage2-s + parent: about + name: Second About Subpage + title: Second About Subpage + url: /about/subpage2/ + weight: 10 +--- + +About subpage diff --git a/exampleSiteMultilingual/content/about-subpage2.md b/exampleSiteMultilingual/content/about-subpage2.md new file mode 100644 index 0000000..372dced --- /dev/null +++ b/exampleSiteMultilingual/content/about-subpage2.md @@ -0,0 +1,24 @@ +--- +title: "Second About Subpage" +description: "Second About Subpage" +date: "2019-02-28" +author: "Hugo Authors" +slug: /about/subpage2 +menu: + subpage: + identifier: about-subpage-s2 + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage2: + identifier: about-subpage2-s2 + parent: about + name: Second About Subpage + title: Second About Subpage + url: /about/subpage2/ + weight: 10 +--- + +Second About subpage diff --git a/exampleSiteMultilingual/content/about-subpage2.pl.md b/exampleSiteMultilingual/content/about-subpage2.pl.md new file mode 100644 index 0000000..372dced --- /dev/null +++ b/exampleSiteMultilingual/content/about-subpage2.pl.md @@ -0,0 +1,24 @@ +--- +title: "Second About Subpage" +description: "Second About Subpage" +date: "2019-02-28" +author: "Hugo Authors" +slug: /about/subpage2 +menu: + subpage: + identifier: about-subpage-s2 + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage2: + identifier: about-subpage2-s2 + parent: about + name: Second About Subpage + title: Second About Subpage + url: /about/subpage2/ + weight: 10 +--- + +Second About subpage diff --git a/exampleSiteMultilingual/content/about.md b/exampleSiteMultilingual/content/about.md index a412806..0c2f335 100644 --- a/exampleSiteMultilingual/content/about.md +++ b/exampleSiteMultilingual/content/about.md @@ -1,10 +1,25 @@ -+++ -title = "About" -description = "Hugo, the world’s fastest framework for building websites" -date = "2019-02-28" -aliases = ["about-us","about-hugo","contact"] -author = "Hugo Authors" -+++ +--- +title: "About" +description: "Hugo, the world’s fastest framework for building websites" +date: "2019-02-28" +aliases: ["about-us","about-hugo","contact"] +author: "Hugo Authors" +menu: + subpage: + identifier: about-subpage + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage2: + identifier: about-subpage2 + parent: about + name: Second About Subpage + title: Second About Subpage + url: /about/subpage2/ + weight: 10 +--- Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows. diff --git a/exampleSiteMultilingual/content/about.pl.md b/exampleSiteMultilingual/content/about.pl.md index a412806..0c2f335 100644 --- a/exampleSiteMultilingual/content/about.pl.md +++ b/exampleSiteMultilingual/content/about.pl.md @@ -1,10 +1,25 @@ -+++ -title = "About" -description = "Hugo, the world’s fastest framework for building websites" -date = "2019-02-28" -aliases = ["about-us","about-hugo","contact"] -author = "Hugo Authors" -+++ +--- +title: "About" +description: "Hugo, the world’s fastest framework for building websites" +date: "2019-02-28" +aliases: ["about-us","about-hugo","contact"] +author: "Hugo Authors" +menu: + subpage: + identifier: about-subpage + parent: about + name: About Subpage + title: About Subpage + url: /about/subpage/ + weight: 1 + subpage2: + identifier: about-subpage2 + parent: about + name: Second About Subpage + title: Second About Subpage + url: /about/subpage2/ + weight: 10 +--- Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows. diff --git a/layouts/_default/single.html b/layouts/_default/single.html index a7905bc..88917da 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,7 +2,7 @@ {{ if .Menus }} {{ end }}