diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-06-16 15:43:50 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-06-18 09:09:56 +0200 |
| commit | fc045e12a953aac88b942c25b958c5c0554b252b (patch) | |
| tree | ad8e171d0730f55eb9a531c1a9f0a8dfb51065ad /output/layout.go | |
| parent | 9679023f2b0d7c55b70f23fd94603f301a841079 (diff) | |
Rename taxonomy kinds from taxonomy to term, taxonomyTerm to taxonomy
And we have taken great measures to limit potential site breakage:
* For `disableKinds` and `outputs` we try to map from old to new values if possible, if not we print an ERROR that can be toggled off if not relevant.
* The layout lookup is mostly compatible with more options for the new `term` kind.
That leaves:
* Where queries in site.Pages using taxonomy/taxonomyTerm Kind values as filter.
* Other places where these kind value are used in the templates (classes etc.)
Fixes #6911
Fixes #7395
Diffstat (limited to 'output/layout.go')
| -rw-r--r-- | output/layout.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/output/layout.go b/output/layout.go index 09ac7b2f6..4dd37b7b1 100644 --- a/output/layout.go +++ b/output/layout.go @@ -160,20 +160,22 @@ func resolvePageTemplate(d LayoutDescriptor, f Format) []string { } b.addSectionType() b.addKind() - case "taxonomy": + case "term": + b.addKind() if d.Section != "" { b.addLayoutVariations(d.Section) } - b.addKind() + b.addLayoutVariations("taxonomy") + b.addTypeVariations("taxonomy") b.addSectionType() - - case "taxonomyTerm": + case "taxonomy": if d.Section != "" { b.addLayoutVariations(d.Section + ".terms") } - b.addTypeVariations("taxonomy") b.addSectionType() b.addLayoutVariations("terms") + // For legacy reasons this is deliberately put last. + b.addKind() case "404": b.addLayoutVariations("404") b.addTypeVariations("") |