From 43d6a500ff4d6e0000890e8eb74664badd727c06 Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Mon, 26 Aug 2024 07:27:43 -0700 Subject: [PATCH] output: Fix docshelper template lookup order for AMP pages Fixes #12797 --- docs/data/docs.yaml | 14 +++++++------- output/docshelper.go | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/data/docs.yaml b/docs/data/docs.yaml index 7ac76ee3919..8d97c21e067 100644 --- a/docs/data/docs.yaml +++ b/docs/data/docs.yaml @@ -1865,7 +1865,7 @@ output: - layouts/_default/demolayout-baseof.html - layouts/_default/single-baseof.html - layouts/_default/baseof.html - - Example: AMP single page + - Example: AMP single page in "posts" section Kind: page OutputFormat: amp Suffix: html @@ -1874,17 +1874,17 @@ output: - layouts/posts/single.html - layouts/_default/single.amp.html - layouts/_default/single.html - - Example: AMP single page, French language + - Example: AMP single page in "posts" section, French language Kind: page - OutputFormat: html + OutputFormat: amp Suffix: html Template Lookup Order: - - layouts/posts/single.fr.html.html - - layouts/posts/single.html.html + - layouts/posts/single.fr.amp.html + - layouts/posts/single.amp.html - layouts/posts/single.fr.html - layouts/posts/single.html - - layouts/_default/single.fr.html.html - - layouts/_default/single.html.html + - layouts/_default/single.fr.amp.html + - layouts/_default/single.amp.html - layouts/_default/single.fr.html - layouts/_default/single.html - Example: Home page diff --git a/output/docshelper.go b/output/docshelper.go index f7f3b0c4aa2..0f2a0eff6dc 100644 --- a/output/docshelper.go +++ b/output/docshelper.go @@ -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"}}, {"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"}}, - {"AMP single page", 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", layouts.LayoutDescriptor{Kind: "page", Type: "posts", OutputFormatName: "amp", 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 {"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"}},