github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

output: Fix docshelper template lookup order for AMP pages

Browse source 
Fixes #12797
This commit is contained in:
Joe Mooring 2024-08-26 07:27:43 -07:00 committed by Bjørn Erik Pedersen
parent 371246de25
commit 1ecd0596a3
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/data/docs.yaml
View file

@ -1865,7 +1865,7 @@ output:
- layouts/_default/demolayout-baseof.html - layouts/_default/demolayout-baseof.html
- layouts/_default/single-baseof.html - layouts/_default/single-baseof.html
- layouts/_default/baseof.html - layouts/_default/baseof.html
- Example: AMP single page - Example: AMP single page in "posts" section
Kind: page Kind: page
OutputFormat: amp OutputFormat: amp
Suffix: html Suffix: html
@ -1874,17 +1874,17 @@ output:
- layouts/posts/single.html - layouts/posts/single.html
- layouts/_default/single.amp.html - layouts/_default/single.amp.html
- layouts/_default/single.html - layouts/_default/single.html
- Example: AMP single page, French language - Example: AMP single page in "posts" section, French language
Kind: page Kind: page
OutputFormat: html OutputFormat: amp
Suffix: html Suffix: html
Template Lookup Order: Template Lookup Order:
- layouts/posts/single.fr.html.html - layouts/posts/single.fr.amp.html
- layouts/posts/single.html.html - layouts/posts/single.amp.html
- layouts/posts/single.fr.html - layouts/posts/single.fr.html
- layouts/posts/single.html - layouts/posts/single.html
- layouts/_default/single.fr.html.html - layouts/_default/single.fr.amp.html
- layouts/_default/single.html.html - layouts/_default/single.amp.html
- layouts/_default/single.fr.html - layouts/_default/single.fr.html
- layouts/_default/single.html - layouts/_default/single.html
- Example: Home page - Example: Home page

4
output/docshelper.go
View file

@ -46,8 +46,8 @@ func createLayoutExamples() any {
{"Base template for single page in \"posts\" section", layouts.LayoutDescriptor{Baseof: true, Kind: "page", Type: "posts", OutputFormatName: "html", Suffix: "html"}}, {"Base template for single page in \"posts\" section", layouts.LayoutDescriptor{Baseof: true, Kind: "page", Type: "posts", OutputFormatName: "html", Suffix: "html"}},
{"Single page in \"posts\" section with layout set to \"demolayout\"", layouts.LayoutDescriptor{Kind: "page", Type: "posts", Layout: demoLayout, OutputFormatName: "html", Suffix: "html"}}, {"Single page in \"posts\" section with layout set to \"demolayout\"", layouts.LayoutDescriptor{Kind: "page", Type: "posts", Layout: demoLayout, OutputFormatName: "html", Suffix: "html"}},
{"Base template for single page in \"posts\" section with layout set to \"demolayout\"", layouts.LayoutDescriptor{Baseof: true, Kind: "page", Type: "posts", Layout: demoLayout, OutputFormatName: "html", Suffix: "html"}}, {"Base template for single page in \"posts\" section with layout set to \"demolayout\"", layouts.LayoutDescriptor{Baseof: true, Kind: "page", Type: "posts", Layout: demoLayout, OutputFormatName: "html", Suffix: "html"}},
{"AMP single page", layouts.LayoutDescriptor{Kind: "page", Type: "posts", OutputFormatName: "amp", Suffix: "html"}}, {"AMP single page in \"posts\" section", layouts.LayoutDescriptor{Kind: "page", Type: "posts", OutputFormatName: "amp", Suffix: "html"}},
{"AMP single page, French language", layouts.LayoutDescriptor{Kind: "page", Type: "posts", Lang: "fr", OutputFormatName: "html", Suffix: "html"}}, {"AMP single page in \"posts\" section, French language", layouts.LayoutDescriptor{Kind: "page", Type: "posts", Lang: "fr", OutputFormatName: "amp", Suffix: "html"}},
// Typeless pages get "page" as type // Typeless pages get "page" as type
{"Home page", layouts.LayoutDescriptor{Kind: "home", Type: "page", OutputFormatName: "html", Suffix: "html"}}, {"Home page", layouts.LayoutDescriptor{Kind: "home", Type: "page", OutputFormatName: "html", Suffix: "html"}},
{"Base template for home page", layouts.LayoutDescriptor{Baseof: true, Kind: "home", Type: "page", OutputFormatName: "html", Suffix: "html"}}, {"Base template for home page", layouts.LayoutDescriptor{Baseof: true, Kind: "home", Type: "page", OutputFormatName: "html", Suffix: "html"}},