mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-30 22:39:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Consider root and current section's content type if set in front matter"

Browse Source 
This reverts commit c790029e1d.
This commit is contained in:
Bjørn Erik Pedersen
2018-07-09 10:29:18 +02:00
parent 5dc1f95b63
commit 179de5f5bc
5 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
output/layout.go
View File

@@ -35,12 +35,6 @@ type LayoutDescriptor struct {
Kind string
Lang string
Layout string
// Any potential type set in the page's current section and the root section
// it lives in.
TypeFirstSection string
TypeCurrentSection string
// LayoutOverride indicates what we should only look for the above layout.
LayoutOverride bool
}
@@ -133,14 +127,6 @@ func resolvePageTemplate(d LayoutDescriptor, f Format) []string {
b.addTypeVariations(d.Type)
}
if d.TypeCurrentSection != "" {
b.addTypeVariations(d.TypeCurrentSection)
}
if d.TypeFirstSection != "" {
b.addTypeVariations(d.TypeFirstSection)
}
switch d.Kind {
case "page":
b.addLayoutVariations("single")

9
output/layout_test.go
View File

@@ -90,13 +90,8 @@ func TestLayout(t *testing.T) {
[]string{"_default/mylayout.amp.html", "_default/single.amp.html", "_default/mylayout.html", "_default/single.html"}, 4},
{"Page with layout and type", LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype"}, "", ampType,
[]string{"myttype/mylayout.amp.html", "myttype/single.amp.html", "myttype/mylayout.html"}, 8},
{"Page with layout and type with subtype", LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype/mysubtype", TypeCurrentSection: "cst"}, "", ampType,
[]string{"myttype/mysubtype/mylayout.amp.html", "myttype/mysubtype/single.amp.html", "myttype/mysubtype/mylayout.html"}, 12},
{"Page with type in section", LayoutDescriptor{Kind: "page", TypeCurrentSection: "cst"}, "", ampType,
[]string{"cst/single.amp.html", "cst/single.html", "_default/single.amp.html", "_default/single.html"}, 4},
{"Page with type in root section", LayoutDescriptor{Kind: "page", TypeFirstSection: "cst"}, "", ampType,
[]string{"cst/single.amp.html", "cst/single.html", "_default/single.amp.html", "_default/single.html"}, 4},
{"Page with layout and type with subtype", LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype/mysubtype"}, "", ampType,
[]string{"myttype/mysubtype/mylayout.amp.html", "myttype/mysubtype/single.amp.html", "myttype/mysubtype/mylayout.html"}, 8},
// RSS
{"RSS Home", LayoutDescriptor{Kind: "home"}, "", RSSFormat,
[]string{"index.rss.xml", "home.rss.xml", "rss.xml"}, 15},