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

1013 lines
26 KiB
Go
Raw Normal View History

output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
// Copyright 2017-present The Hugo Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package output
import (
layout: Respect Type and Layout for list template selection This commit also has some other nice side-effects: * The layout logic is unified for all page types, which should make it less surprising * Page.Render now supports all types * The legacy "indexes" type is removed from the template lookup order. This is an undocumented type from early Hugo days. This means that having a template in, say, `/layouts/indexes/list.html` will no longer work. * The theme override logic is improved. As an example, an `index.html` in theme will now wn over a `_default/list.html` in the project, which most will expect. Fixes #3005 Fixes #3245
2018-01-13 11:21:42 -05:00
"fmt"
"reflect"
"strings"
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
"testing"
all: Update import paths to gohugoio/hugo
2017-06-13 12:42:45 -04:00
"github.com/gohugoio/hugo/media"
hugolib, output: Incorporate suffix and type in layout resolve And remove some now superflous and hard to maintain tests.
2017-03-07 11:26:22 -05:00
tests: Convert from testify to quicktest
2019-08-10 15:05:17 -04:00
qt "github.com/frankban/quicktest"
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"github.com/kylelemons/godebug/diff"
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
)
func TestLayout(t *testing.T) {
tests: Convert from testify to quicktest
2019-08-10 15:05:17 -04:00
c := qt.New(t)
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
media, hugolib: Support extension-less media types This change is motivated by Netlify's `_redirects` files, which is currently not possible to generate with Hugo. This commit adds a `Delimiter` field to media type, which defaults to ".", but can be blanked out. Fixes #3614
2017-06-20 02:45:52 -04:00
noExtNoDelimMediaType := media.TextType
media: Allow multiple file suffixes per media type Before this commit, `Suffix` on `MediaType` was used both to set a custom file suffix and as a way to augment the mediatype definition (what you see after the "+", e.g. "image/svg+xml"). This had its limitations. For one, it was only possible with one file extension per MIME type. Now you can specify multiple file suffixes using "suffixes", but you need to specify the full MIME type identifier: [mediaTypes] [mediaTypes."image/svg+xml"] suffixes = ["svg", "abc ] In most cases, it will be enough to just change: [mediaTypes] [mediaTypes."my/custom-mediatype"] suffix = "txt" To: [mediaTypes] [mediaTypes."my/custom-mediatype"] suffixes = ["txt"] Hugo will still respect values set in "suffix" if no value for "suffixes" is provided, but this will be removed in a future release. Note that you can still get the Media Type's suffix from a template: {{ $mediaType.Suffix }}. But this will now map to the MIME type filename. Fixes #4920
2018-07-10 05:55:22 -04:00
noExtNoDelimMediaType.Suffixes = nil
media, hugolib: Support extension-less media types This change is motivated by Netlify's `_redirects` files, which is currently not possible to generate with Hugo. This commit adds a `Delimiter` field to media type, which defaults to ".", but can be blanked out. Fixes #3614
2017-06-20 02:45:52 -04:00
noExtNoDelimMediaType.Delimiter = ""
noExtMediaType := media.TextType
media: Allow multiple file suffixes per media type Before this commit, `Suffix` on `MediaType` was used both to set a custom file suffix and as a way to augment the mediatype definition (what you see after the "+", e.g. "image/svg+xml"). This had its limitations. For one, it was only possible with one file extension per MIME type. Now you can specify multiple file suffixes using "suffixes", but you need to specify the full MIME type identifier: [mediaTypes] [mediaTypes."image/svg+xml"] suffixes = ["svg", "abc ] In most cases, it will be enough to just change: [mediaTypes] [mediaTypes."my/custom-mediatype"] suffix = "txt" To: [mediaTypes] [mediaTypes."my/custom-mediatype"] suffixes = ["txt"] Hugo will still respect values set in "suffix" if no value for "suffixes" is provided, but this will be removed in a future release. Note that you can still get the Media Type's suffix from a template: {{ $mediaType.Suffix }}. But this will now map to the MIME type filename. Fixes #4920
2018-07-10 05:55:22 -04:00
noExtMediaType.Suffixes = nil
media, hugolib: Support extension-less media types This change is motivated by Netlify's `_redirects` files, which is currently not possible to generate with Hugo. This commit adds a `Delimiter` field to media type, which defaults to ".", but can be blanked out. Fixes #3614
2017-06-20 02:45:52 -04:00
var (
ampType = Format{
Name: "AMP",
MediaType: media.HTMLType,
BaseName: "index",
}
layout: Respect Type and Layout for list template selection This commit also has some other nice side-effects: * The layout logic is unified for all page types, which should make it less surprising * Page.Render now supports all types * The legacy "indexes" type is removed from the template lookup order. This is an undocumented type from early Hugo days. This means that having a template in, say, `/layouts/indexes/list.html` will no longer work. * The theme override logic is improved. As an example, an `index.html` in theme will now wn over a `_default/list.html` in the project, which most will expect. Fixes #3005 Fixes #3245
2018-01-13 11:21:42 -05:00
htmlFormat = HTMLFormat
media, hugolib: Support extension-less media types This change is motivated by Netlify's `_redirects` files, which is currently not possible to generate with Hugo. This commit adds a `Delimiter` field to media type, which defaults to ".", but can be blanked out. Fixes #3614
2017-06-20 02:45:52 -04:00
noExtDelimFormat = Format{
Name: "NEM",
MediaType: noExtNoDelimMediaType,
BaseName: "_redirects",
}
media: Allow multiple file suffixes per media type Before this commit, `Suffix` on `MediaType` was used both to set a custom file suffix and as a way to augment the mediatype definition (what you see after the "+", e.g. "image/svg+xml"). This had its limitations. For one, it was only possible with one file extension per MIME type. Now you can specify multiple file suffixes using "suffixes", but you need to specify the full MIME type identifier: [mediaTypes] [mediaTypes."image/svg+xml"] suffixes = ["svg", "abc ] In most cases, it will be enough to just change: [mediaTypes] [mediaTypes."my/custom-mediatype"] suffix = "txt" To: [mediaTypes] [mediaTypes."my/custom-mediatype"] suffixes = ["txt"] Hugo will still respect values set in "suffix" if no value for "suffixes" is provided, but this will be removed in a future release. Note that you can still get the Media Type's suffix from a template: {{ $mediaType.Suffix }}. But this will now map to the MIME type filename. Fixes #4920
2018-07-10 05:55:22 -04:00
media, hugolib: Support extension-less media types This change is motivated by Netlify's `_redirects` files, which is currently not possible to generate with Hugo. This commit adds a `Delimiter` field to media type, which defaults to ".", but can be blanked out. Fixes #3614
2017-06-20 02:45:52 -04:00
noExt = Format{
Name: "NEX",
MediaType: noExtMediaType,
BaseName: "next",
}
)
hugolib, output: Incorporate suffix and type in layout resolve And remove some now superflous and hard to maintain tests.
2017-03-07 11:26:22 -05:00
for _, this := range []struct {
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
name string
layoutDescriptor LayoutDescriptor
layoutOverride string
format Format
expect []string
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
}{
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home",
LayoutDescriptor{Kind: "home"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index.amp.html",
"home.amp.html",
"list.amp.html",
"index.html",
"home.html",
"list.html",
"_default/index.amp.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"_default/home.amp.html",
"_default/list.amp.html",
"_default/index.html",
"_default/home.html",
"_default/list.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home baseof",
LayoutDescriptor{Kind: "home", Baseof: true},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index-baseof.amp.html",
"home-baseof.amp.html",
"list-baseof.amp.html",
"baseof.amp.html",
"index-baseof.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"home-baseof.html",
"list-baseof.html",
"baseof.html",
"_default/index-baseof.amp.html",
"_default/home-baseof.amp.html",
"_default/list-baseof.amp.html",
"_default/baseof.amp.html",
"_default/index-baseof.html",
"_default/home-baseof.html",
"_default/list-baseof.html",
"_default/baseof.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home, HTML",
LayoutDescriptor{Kind: "home"},
"", htmlFormat,
layout: Respect Type and Layout for list template selection This commit also has some other nice side-effects: * The layout logic is unified for all page types, which should make it less surprising * Page.Render now supports all types * The legacy "indexes" type is removed from the template lookup order. This is an undocumented type from early Hugo days. This means that having a template in, say, `/layouts/indexes/list.html` will no longer work. * The theme override logic is improved. As an example, an `index.html` in theme will now wn over a `_default/list.html` in the project, which most will expect. Fixes #3005 Fixes #3245
2018-01-13 11:21:42 -05:00
// We will eventually get to index.html. This looks stuttery, but makes the lookup logic easy to understand.
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index.html.html",
"home.html.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"list.html.html",
"index.html",
"home.html",
"list.html",
"_default/index.html.html",
"_default/home.html.html",
"_default/list.html.html",
"_default/index.html",
"_default/home.html",
"_default/list.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home, HTML, baseof",
LayoutDescriptor{Kind: "home", Baseof: true},
"", htmlFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index-baseof.html.html",
"home-baseof.html.html",
"list-baseof.html.html",
"baseof.html.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"index-baseof.html",
"home-baseof.html",
"list-baseof.html",
"baseof.html",
"_default/index-baseof.html.html",
"_default/home-baseof.html.html",
"_default/list-baseof.html.html",
"_default/baseof.html.html",
"_default/index-baseof.html",
"_default/home-baseof.html",
"_default/list-baseof.html",
"_default/baseof.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home, french language",
LayoutDescriptor{Kind: "home", Lang: "fr"},
"", ampType,
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
[]string{
"index.fr.amp.html",
"home.fr.amp.html",
"list.fr.amp.html",
"index.amp.html",
"home.amp.html",
"list.amp.html",
"index.fr.html",
"home.fr.html",
"list.fr.html",
"index.html",
"home.html",
"list.html",
"_default/index.fr.amp.html",
"_default/home.fr.amp.html",
"_default/list.fr.amp.html",
"_default/index.amp.html",
"_default/home.amp.html",
"_default/list.amp.html",
"_default/index.fr.html",
"_default/home.fr.html",
"_default/list.fr.html",
"_default/index.html",
"_default/home.html",
"_default/list.html",
},
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home, no ext or delim",
LayoutDescriptor{Kind: "home"},
"", noExtDelimFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index.nem",
"home.nem",
"list.nem",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"_default/index.nem",
"_default/home.nem",
"_default/list.nem",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home, no ext",
LayoutDescriptor{Kind: "home"},
"", noExt,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index.nex",
"home.nex",
"list.nex",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"_default/index.nex",
"_default/home.nex",
"_default/list.nex",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page, no ext or delim",
LayoutDescriptor{Kind: "page"},
"", noExtDelimFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{"_default/single.nem"},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Section",
LayoutDescriptor{Kind: "section", Section: "sect1"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"sect1/sect1.amp.html",
"sect1/section.amp.html",
"sect1/list.amp.html",
"sect1/sect1.html",
"sect1/section.html",
"sect1/list.html",
"section/sect1.amp.html",
"section/section.amp.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"section/list.amp.html",
"section/sect1.html",
"section/section.html",
"section/list.html",
"_default/sect1.amp.html",
"_default/section.amp.html",
"_default/list.amp.html",
"_default/sect1.html",
"_default/section.html",
"_default/list.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Section, baseof",
LayoutDescriptor{Kind: "section", Section: "sect1", Baseof: true},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"sect1/sect1-baseof.amp.html",
"sect1/section-baseof.amp.html",
"sect1/list-baseof.amp.html",
"sect1/baseof.amp.html",
"sect1/sect1-baseof.html",
"sect1/section-baseof.html",
"sect1/list-baseof.html",
"sect1/baseof.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"section/sect1-baseof.amp.html",
"section/section-baseof.amp.html",
"section/list-baseof.amp.html",
"section/baseof.amp.html",
"section/sect1-baseof.html",
"section/section-baseof.html",
"section/list-baseof.html",
"section/baseof.html",
"_default/sect1-baseof.amp.html",
"_default/section-baseof.amp.html",
"_default/list-baseof.amp.html",
"_default/baseof.amp.html",
"_default/sect1-baseof.html",
"_default/section-baseof.html",
"_default/list-baseof.html",
"_default/baseof.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Section, baseof, French, AMP",
LayoutDescriptor{Kind: "section", Section: "sect1", Lang: "fr", Baseof: true},
"", ampType,
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
[]string{
"sect1/sect1-baseof.fr.amp.html",
"sect1/section-baseof.fr.amp.html",
"sect1/list-baseof.fr.amp.html",
"sect1/baseof.fr.amp.html",
"sect1/sect1-baseof.amp.html",
"sect1/section-baseof.amp.html",
"sect1/list-baseof.amp.html",
"sect1/baseof.amp.html",
"sect1/sect1-baseof.fr.html",
"sect1/section-baseof.fr.html",
"sect1/list-baseof.fr.html",
"sect1/baseof.fr.html",
"sect1/sect1-baseof.html",
"sect1/section-baseof.html",
"sect1/list-baseof.html",
"sect1/baseof.html",
"section/sect1-baseof.fr.amp.html",
"section/section-baseof.fr.amp.html",
"section/list-baseof.fr.amp.html",
"section/baseof.fr.amp.html",
"section/sect1-baseof.amp.html",
"section/section-baseof.amp.html",
"section/list-baseof.amp.html",
"section/baseof.amp.html",
"section/sect1-baseof.fr.html",
"section/section-baseof.fr.html",
"section/list-baseof.fr.html",
"section/baseof.fr.html",
"section/sect1-baseof.html",
"section/section-baseof.html",
"section/list-baseof.html",
"section/baseof.html",
"_default/sect1-baseof.fr.amp.html",
"_default/section-baseof.fr.amp.html",
"_default/list-baseof.fr.amp.html",
"_default/baseof.fr.amp.html",
"_default/sect1-baseof.amp.html",
"_default/section-baseof.amp.html",
"_default/list-baseof.amp.html",
"_default/baseof.amp.html",
"_default/sect1-baseof.fr.html",
"_default/section-baseof.fr.html",
"_default/list-baseof.fr.html",
"_default/baseof.fr.html",
"_default/sect1-baseof.html",
"_default/section-baseof.html",
"_default/list-baseof.html",
"_default/baseof.html",
},
},
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Section with layout",
LayoutDescriptor{Kind: "section", Section: "sect1", Layout: "mylayout"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"sect1/mylayout.amp.html",
"sect1/sect1.amp.html",
"sect1/section.amp.html",
"sect1/list.amp.html",
"sect1/mylayout.html",
"sect1/sect1.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"sect1/section.html",
"sect1/list.html",
"section/mylayout.amp.html",
"section/sect1.amp.html",
"section/section.amp.html",
"section/list.amp.html",
"section/mylayout.html",
"section/sect1.html",
"section/section.html",
"section/list.html",
"_default/mylayout.amp.html",
"_default/sect1.amp.html",
"_default/section.amp.html",
"_default/list.amp.html",
"_default/mylayout.html",
"_default/sect1.html",
"_default/section.html",
"_default/list.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Term, French, AMP",
LayoutDescriptor{Kind: "term", Section: "tags", Lang: "fr"},
"", ampType,
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
[]string{
"term/term.fr.amp.html",
"term/tags.fr.amp.html",
"term/taxonomy.fr.amp.html",
"term/list.fr.amp.html",
"term/term.amp.html",
"term/tags.amp.html",
"term/taxonomy.amp.html",
"term/list.amp.html",
"term/term.fr.html",
"term/tags.fr.html",
"term/taxonomy.fr.html",
"term/list.fr.html",
"term/term.html",
"term/tags.html",
"term/taxonomy.html",
"term/list.html",
"taxonomy/term.fr.amp.html",
"taxonomy/tags.fr.amp.html",
"taxonomy/taxonomy.fr.amp.html",
"taxonomy/list.fr.amp.html",
"taxonomy/term.amp.html",
"taxonomy/tags.amp.html",
"taxonomy/taxonomy.amp.html",
"taxonomy/list.amp.html",
"taxonomy/term.fr.html",
"taxonomy/tags.fr.html",
"taxonomy/taxonomy.fr.html",
"taxonomy/list.fr.html",
"taxonomy/term.html",
"taxonomy/tags.html",
"taxonomy/taxonomy.html",
"taxonomy/list.html",
"tags/term.fr.amp.html",
"tags/tags.fr.amp.html",
"tags/taxonomy.fr.amp.html",
"tags/list.fr.amp.html",
"tags/term.amp.html",
"tags/tags.amp.html",
"tags/taxonomy.amp.html",
"tags/list.amp.html",
"tags/term.fr.html",
"tags/tags.fr.html",
"tags/taxonomy.fr.html",
"tags/list.fr.html",
"tags/term.html",
"tags/tags.html",
"tags/taxonomy.html",
"tags/list.html",
"_default/term.fr.amp.html",
"_default/tags.fr.amp.html",
"_default/taxonomy.fr.amp.html",
"_default/list.fr.amp.html",
"_default/term.amp.html",
"_default/tags.amp.html",
"_default/taxonomy.amp.html",
"_default/list.amp.html",
"_default/term.fr.html",
"_default/tags.fr.html",
"_default/taxonomy.fr.html",
"_default/list.fr.html",
"_default/term.html",
"_default/tags.html",
"_default/taxonomy.html",
"_default/list.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Term, baseof, French, AMP",
LayoutDescriptor{Kind: "term", Section: "tags", Lang: "fr", Baseof: true},
"", ampType,
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
[]string{
"term/term-baseof.fr.amp.html",
"term/tags-baseof.fr.amp.html",
"term/taxonomy-baseof.fr.amp.html",
"term/list-baseof.fr.amp.html",
"term/baseof.fr.amp.html",
"term/term-baseof.amp.html",
"term/tags-baseof.amp.html",
"term/taxonomy-baseof.amp.html",
"term/list-baseof.amp.html",
"term/baseof.amp.html",
"term/term-baseof.fr.html",
"term/tags-baseof.fr.html",
"term/taxonomy-baseof.fr.html",
"term/list-baseof.fr.html",
"term/baseof.fr.html",
"term/term-baseof.html",
"term/tags-baseof.html",
"term/taxonomy-baseof.html",
"term/list-baseof.html",
"term/baseof.html",
"taxonomy/term-baseof.fr.amp.html",
"taxonomy/tags-baseof.fr.amp.html",
"taxonomy/taxonomy-baseof.fr.amp.html",
"taxonomy/list-baseof.fr.amp.html",
"taxonomy/baseof.fr.amp.html",
"taxonomy/term-baseof.amp.html",
"taxonomy/tags-baseof.amp.html",
"taxonomy/taxonomy-baseof.amp.html",
"taxonomy/list-baseof.amp.html",
"taxonomy/baseof.amp.html",
"taxonomy/term-baseof.fr.html",
"taxonomy/tags-baseof.fr.html",
"taxonomy/taxonomy-baseof.fr.html",
"taxonomy/list-baseof.fr.html",
"taxonomy/baseof.fr.html",
"taxonomy/term-baseof.html",
"taxonomy/tags-baseof.html",
"taxonomy/taxonomy-baseof.html",
"taxonomy/list-baseof.html",
"taxonomy/baseof.html",
"tags/term-baseof.fr.amp.html",
"tags/tags-baseof.fr.amp.html",
"tags/taxonomy-baseof.fr.amp.html",
"tags/list-baseof.fr.amp.html",
"tags/baseof.fr.amp.html",
"tags/term-baseof.amp.html",
"tags/tags-baseof.amp.html",
"tags/taxonomy-baseof.amp.html",
"tags/list-baseof.amp.html",
"tags/baseof.amp.html",
"tags/term-baseof.fr.html",
"tags/tags-baseof.fr.html",
"tags/taxonomy-baseof.fr.html",
"tags/list-baseof.fr.html",
"tags/baseof.fr.html",
"tags/term-baseof.html",
"tags/tags-baseof.html",
"tags/taxonomy-baseof.html",
"tags/list-baseof.html",
"tags/baseof.html",
"_default/term-baseof.fr.amp.html",
"_default/tags-baseof.fr.amp.html",
"_default/taxonomy-baseof.fr.amp.html",
"_default/list-baseof.fr.amp.html",
"_default/baseof.fr.amp.html",
"_default/term-baseof.amp.html",
"_default/tags-baseof.amp.html",
"_default/taxonomy-baseof.amp.html",
"_default/list-baseof.amp.html",
"_default/baseof.amp.html",
"_default/term-baseof.fr.html",
"_default/tags-baseof.fr.html",
"_default/taxonomy-baseof.fr.html",
"_default/list-baseof.fr.html",
"_default/baseof.fr.html",
"_default/term-baseof.html",
"_default/tags-baseof.html",
"_default/taxonomy-baseof.html",
"_default/list-baseof.html",
"_default/baseof.html",
},
},
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Term",
LayoutDescriptor{Kind: "term", Section: "tags"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"term/term.amp.html",
"term/tags.amp.html",
"term/taxonomy.amp.html",
"term/list.amp.html",
"term/term.html",
"term/tags.html",
"term/taxonomy.html",
"term/list.html",
"taxonomy/term.amp.html",
"taxonomy/tags.amp.html",
"taxonomy/taxonomy.amp.html",
"taxonomy/list.amp.html",
"taxonomy/term.html",
"taxonomy/tags.html",
"taxonomy/taxonomy.html",
"taxonomy/list.html",
"tags/term.amp.html",
"tags/tags.amp.html",
"tags/taxonomy.amp.html",
"tags/list.amp.html",
"tags/term.html",
"tags/tags.html",
"tags/taxonomy.html",
"tags/list.html",
"_default/term.amp.html",
"_default/tags.amp.html",
"_default/taxonomy.amp.html",
"_default/list.amp.html",
"_default/term.html",
"_default/tags.html",
"_default/taxonomy.html",
"_default/list.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Taxonomy",
LayoutDescriptor{Kind: "taxonomy", Section: "categories"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"categories/categories.terms.amp.html",
"categories/terms.amp.html",
"categories/taxonomy.amp.html",
"categories/list.amp.html",
"categories/categories.terms.html",
"categories/terms.html",
"categories/taxonomy.html",
"categories/list.html",
"taxonomy/categories.terms.amp.html",
"taxonomy/terms.amp.html",
"taxonomy/taxonomy.amp.html",
"taxonomy/list.amp.html",
"taxonomy/categories.terms.html",
"taxonomy/terms.html",
"taxonomy/taxonomy.html",
"taxonomy/list.html",
"_default/categories.terms.amp.html",
"_default/terms.amp.html",
"_default/taxonomy.amp.html",
"_default/list.amp.html",
"_default/categories.terms.html",
"_default/terms.html",
"_default/taxonomy.html",
"_default/list.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page",
LayoutDescriptor{Kind: "page"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"_default/single.amp.html",
"_default/single.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page, baseof",
LayoutDescriptor{Kind: "page", Baseof: true},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"_default/single-baseof.amp.html",
"_default/baseof.amp.html",
"_default/single-baseof.html",
"_default/baseof.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page with layout",
LayoutDescriptor{Kind: "page", Layout: "mylayout"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"_default/mylayout.amp.html",
"_default/single.amp.html",
"_default/mylayout.html",
"_default/single.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page with layout, baseof",
LayoutDescriptor{Kind: "page", Layout: "mylayout", Baseof: true},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"_default/mylayout-baseof.amp.html",
"_default/single-baseof.amp.html",
"_default/baseof.amp.html",
"_default/mylayout-baseof.html",
"_default/single-baseof.html",
"_default/baseof.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page with layout and type",
LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"myttype/mylayout.amp.html",
"myttype/single.amp.html",
"myttype/mylayout.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"myttype/single.html",
"_default/mylayout.amp.html",
"_default/single.amp.html",
"_default/mylayout.html",
"_default/single.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page baseof with layout and type",
LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype", Baseof: true},
"", ampType,
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
[]string{
"myttype/mylayout-baseof.amp.html",
"myttype/single-baseof.amp.html",
"myttype/baseof.amp.html",
"myttype/mylayout-baseof.html",
"myttype/single-baseof.html",
"myttype/baseof.html",
"_default/mylayout-baseof.amp.html",
"_default/single-baseof.amp.html",
"_default/baseof.amp.html",
"_default/mylayout-baseof.html",
"_default/single-baseof.html",
"_default/baseof.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page baseof with layout and type in French",
LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype", Lang: "fr", Baseof: true},
"", ampType,
output: Add more layout lookup tests Add more tests to cover more cases and to help with documentation and discussion of template lookup order. Updates #7964
2020-11-24 15:49:06 -05:00
[]string{
"myttype/mylayout-baseof.fr.amp.html",
"myttype/single-baseof.fr.amp.html",
"myttype/baseof.fr.amp.html",
"myttype/mylayout-baseof.amp.html",
"myttype/single-baseof.amp.html",
"myttype/baseof.amp.html",
"myttype/mylayout-baseof.fr.html",
"myttype/single-baseof.fr.html",
"myttype/baseof.fr.html",
"myttype/mylayout-baseof.html",
"myttype/single-baseof.html",
"myttype/baseof.html",
"_default/mylayout-baseof.fr.amp.html",
"_default/single-baseof.fr.amp.html",
"_default/baseof.fr.amp.html",
"_default/mylayout-baseof.amp.html",
"_default/single-baseof.amp.html",
"_default/baseof.amp.html",
"_default/mylayout-baseof.fr.html",
"_default/single-baseof.fr.html",
"_default/baseof.fr.html",
"_default/mylayout-baseof.html",
"_default/single-baseof.html",
"_default/baseof.html",
},
},
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page with layout and type with subtype",
LayoutDescriptor{Kind: "page", Layout: "mylayout", Type: "myttype/mysubtype"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"myttype/mysubtype/mylayout.amp.html",
"myttype/mysubtype/single.amp.html",
"myttype/mysubtype/mylayout.html",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"myttype/mysubtype/single.html",
"_default/mylayout.amp.html",
"_default/single.amp.html",
"_default/mylayout.html",
"_default/single.html",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
hugolib, layout: Consolidate RSS template handling
2017-03-25 12:46:09 -04:00
// RSS
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"RSS Home",
LayoutDescriptor{Kind: "home"},
"", RSSFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index.rss.xml",
"home.rss.xml",
"rss.xml",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"list.rss.xml",
"index.xml",
"home.xml",
"list.xml",
"_default/index.rss.xml",
"_default/home.rss.xml",
"_default/rss.xml",
"_default/list.rss.xml",
"_default/index.xml",
"_default/home.xml",
"_default/list.xml",
"_internal/_default/rss.xml",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"RSS Home, baseof",
LayoutDescriptor{Kind: "home", Baseof: true},
"", RSSFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index-baseof.rss.xml",
"home-baseof.rss.xml",
"list-baseof.rss.xml",
"baseof.rss.xml",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"index-baseof.xml",
"home-baseof.xml",
"list-baseof.xml",
"baseof.xml",
"_default/index-baseof.rss.xml",
"_default/home-baseof.rss.xml",
"_default/list-baseof.rss.xml",
"_default/baseof.rss.xml",
"_default/index-baseof.xml",
"_default/home-baseof.xml",
"_default/list-baseof.xml",
"_default/baseof.xml",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"RSS Section",
LayoutDescriptor{Kind: "section", Section: "sect1"},
"", RSSFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"sect1/sect1.rss.xml",
"sect1/section.rss.xml",
"sect1/rss.xml",
"sect1/list.rss.xml",
"sect1/sect1.xml",
"sect1/section.xml",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"sect1/list.xml",
"section/sect1.rss.xml",
"section/section.rss.xml",
"section/rss.xml",
"section/list.rss.xml",
"section/sect1.xml",
"section/section.xml",
"section/list.xml",
"_default/sect1.rss.xml",
"_default/section.rss.xml",
"_default/rss.xml",
"_default/list.rss.xml",
"_default/sect1.xml",
"_default/section.xml",
"_default/list.xml",
"_internal/_default/rss.xml",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"RSS Term",
LayoutDescriptor{Kind: "term", Section: "tag"},
"", RSSFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"term/term.rss.xml",
"term/tag.rss.xml",
"term/taxonomy.rss.xml",
"term/rss.xml",
"term/list.rss.xml",
"term/term.xml",
"term/tag.xml",
"term/taxonomy.xml",
"term/list.xml",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"taxonomy/term.rss.xml",
"taxonomy/tag.rss.xml",
"taxonomy/taxonomy.rss.xml",
"taxonomy/rss.xml",
"taxonomy/list.rss.xml",
"taxonomy/term.xml",
"taxonomy/tag.xml",
"taxonomy/taxonomy.xml",
"taxonomy/list.xml",
"tag/term.rss.xml",
"tag/tag.rss.xml",
"tag/taxonomy.rss.xml",
"tag/rss.xml",
"tag/list.rss.xml",
"tag/term.xml",
"tag/tag.xml",
"tag/taxonomy.xml",
"tag/list.xml",
"_default/term.rss.xml",
"_default/tag.rss.xml",
"_default/taxonomy.rss.xml",
"_default/rss.xml",
"_default/list.rss.xml",
"_default/term.xml",
"_default/tag.xml",
"_default/taxonomy.xml",
"_default/list.xml",
"_internal/_default/rss.xml",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"RSS Taxonomy",
LayoutDescriptor{Kind: "taxonomy", Section: "tag"},
"", RSSFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"tag/tag.terms.rss.xml",
"tag/terms.rss.xml",
"tag/taxonomy.rss.xml",
"tag/rss.xml",
"tag/list.rss.xml",
"tag/tag.terms.xml",
"tag/terms.xml",
"tag/taxonomy.xml",
"tag/list.xml",
"taxonomy/tag.terms.rss.xml",
"taxonomy/terms.rss.xml",
"taxonomy/taxonomy.rss.xml",
"taxonomy/rss.xml",
"taxonomy/list.rss.xml",
"taxonomy/tag.terms.xml",
"taxonomy/terms.xml",
"taxonomy/taxonomy.xml",
"taxonomy/list.xml",
"_default/tag.terms.rss.xml",
"_default/terms.rss.xml",
"_default/taxonomy.rss.xml",
"_default/rss.xml",
"_default/list.rss.xml",
"_default/tag.terms.xml",
"_default/terms.xml",
"_default/taxonomy.xml",
"_default/list.xml",
"_internal/_default/rss.xml",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Home plain text",
LayoutDescriptor{Kind: "home"},
"", JSONFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"index.json.json",
"home.json.json",
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
"list.json.json",
"index.json",
"home.json",
"list.json",
"_default/index.json.json",
"_default/home.json.json",
"_default/list.json.json",
"_default/index.json",
"_default/home.json",
"_default/list.json",
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Page plain text",
LayoutDescriptor{Kind: "page"},
"", JSONFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"_default/single.json.json",
"_default/single.json",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Reserved section, shortcodes",
LayoutDescriptor{Kind: "section", Section: "shortcodes", Type: "shortcodes"},
"", ampType,
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
[]string{
"section/shortcodes.amp.html",
"section/section.amp.html",
"section/list.amp.html",
"section/shortcodes.html",
"section/section.html",
"section/list.html",
"_default/shortcodes.amp.html",
"_default/section.amp.html",
"_default/list.amp.html",
"_default/shortcodes.html",
"_default/section.html",
"_default/list.html",
},
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Reserved section, partials",
LayoutDescriptor{Kind: "section", Section: "partials", Type: "partials"},
"", ampType,
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
[]string{
"section/partials.amp.html",
"section/section.amp.html",
"section/list.amp.html",
"section/partials.html",
"section/section.html",
"section/list.html",
"_default/partials.amp.html",
"_default/section.amp.html",
"_default/list.amp.html",
"_default/partials.html",
"_default/section.html",
"_default/list.html",
},
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
},
And now finally fix the 404 templates Fixes #6795
2020-01-27 06:30:31 -05:00
// This is currently always HTML only
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"404, HTML",
LayoutDescriptor{Kind: "404"},
"", htmlFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"404.html.html",
"404.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"404, HTML baseof",
LayoutDescriptor{Kind: "404", Baseof: true},
"", htmlFormat,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"404-baseof.html.html",
"baseof.html.html",
"404-baseof.html",
"baseof.html",
"_default/404-baseof.html.html",
"_default/baseof.html.html",
"_default/404-baseof.html",
"_default/baseof.html",
},
},
{
all: Format code with gofumpt See https://github.com/mvdan/gofumpt
2020-12-02 07:23:25 -05:00
"Content hook",
LayoutDescriptor{Kind: "render-link", RenderingHook: true, Layout: "mylayout", Section: "blog"},
"", ampType,
output: Reformat TestLayout table
2020-10-07 09:09:28 -04:00
[]string{
"blog/_markup/render-link.amp.html",
"blog/_markup/render-link.html",
"_default/_markup/render-link.amp.html",
"_default/_markup/render-link.html",
},
},
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
} {
tests: Convert from testify to quicktest
2019-08-10 15:05:17 -04:00
c.Run(this.name, func(c *qt.C) {
Add support for theme composition and inheritance This commit adds support for theme composition and inheritance in Hugo. With this, it helps thinking about a theme as a set of ordered components: ```toml theme = ["my-shortcodes", "base-theme", "hyde"] ``` The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right. So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`. Hugo uses two different algorithms to merge the filesystems, depending on the file type: * For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files. * For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen. The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically. Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure: * `params` (global and per language) * `menu` (global and per language) * `outputformats` and `mediatypes` The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts. A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others. Fixes #4460 Fixes #4450
2018-03-01 09:01:25 -05:00
l := NewLayoutHandler()
hugolib, output: Incorporate suffix and type in layout resolve And remove some now superflous and hard to maintain tests.
2017-03-07 11:26:22 -05:00
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
layouts, err := l.For(this.layoutDescriptor, this.format)
hugolib, output: Incorporate suffix and type in layout resolve And remove some now superflous and hard to maintain tests.
2017-03-07 11:26:22 -05:00
tests: Convert from testify to quicktest
2019-08-10 15:05:17 -04:00
c.Assert(err, qt.IsNil)
output: Test all lookup permutations in TestLayout
2020-10-07 11:41:37 -04:00
c.Assert(layouts, qt.Not(qt.IsNil), qt.Commentf(this.layoutDescriptor.Kind))
if !reflect.DeepEqual(layouts, this.expect) {
r := strings.NewReplacer(
"[", "\t\"",
"]", "\",",
" ", "\",\n\t\"",
)
fmtGot := r.Replace(fmt.Sprintf("%v", layouts))
fmtExp := r.Replace(fmt.Sprintf("%v", this.expect))
c.Fatalf("got %d items, expected %d:\nGot:\n\t%v\nExpected:\n\t%v\nDiff:\n%s", len(layouts), len(this.expect), layouts, this.expect, diff.Diff(fmtExp, fmtGot))
layout: Respect Type and Layout for list template selection This commit also has some other nice side-effects: * The layout logic is unified for all page types, which should make it less surprising * Page.Render now supports all types * The legacy "indexes" type is removed from the template lookup order. This is an undocumented type from early Hugo days. This means that having a template in, say, `/layouts/indexes/list.html` will no longer work. * The theme override logic is improved. As an example, an `index.html` in theme will now wn over a `_default/list.html` in the project, which most will expect. Fixes #3005 Fixes #3245
2018-01-13 11:21:42 -05:00
}
hugolib, output: Incorporate suffix and type in layout resolve And remove some now superflous and hard to maintain tests.
2017-03-07 11:26:22 -05:00
})
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
}
output: Speed up layout calculations ``` BenchmarkLayout-4 4883 497 -89.82% benchmark old allocs new allocs delta BenchmarkLayout-4 18 1 -94.44% benchmark old bytes new bytes delta BenchmarkLayout-4 1624 32 -98.03% ```
2017-03-18 11:46:10 -04:00
}
func BenchmarkLayout(b *testing.B) {
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
2020-06-16 09:43:50 -04:00
descriptor := LayoutDescriptor{Kind: "taxonomy", Section: "categories"}
Add support for theme composition and inheritance This commit adds support for theme composition and inheritance in Hugo. With this, it helps thinking about a theme as a set of ordered components: ```toml theme = ["my-shortcodes", "base-theme", "hyde"] ``` The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right. So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`. Hugo uses two different algorithms to merge the filesystems, depending on the file type: * For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files. * For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen. The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically. Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure: * `params` (global and per language) * `menu` (global and per language) * `outputformats` and `mediatypes` The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts. A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others. Fixes #4460 Fixes #4450
2018-03-01 09:01:25 -05:00
l := NewLayoutHandler()
output: Speed up layout calculations ``` BenchmarkLayout-4 4883 497 -89.82% benchmark old allocs new allocs delta BenchmarkLayout-4 18 1 -94.44% benchmark old bytes new bytes delta BenchmarkLayout-4 1624 32 -98.03% ```
2017-03-18 11:46:10 -04:00
for i := 0; i < b.N; i++ {
output: Improve layout path construction
2020-10-15 14:54:47 -04:00
_, err := l.For(descriptor, HTMLFormat)
if err != nil {
panic(err)
}
}
}
func BenchmarkLayoutUncached(b *testing.B) {
for i := 0; i < b.N; i++ {
descriptor := LayoutDescriptor{Kind: "taxonomy", Section: "categories"}
l := NewLayoutHandler()
_, err := l.For(descriptor, HTMLFormat)
if err != nil {
panic(err)
}
output: Speed up layout calculations ``` BenchmarkLayout-4 4883 497 -89.82% benchmark old allocs new allocs delta BenchmarkLayout-4 18 1 -94.44% benchmark old bytes new bytes delta BenchmarkLayout-4 1624 32 -98.03% ```
2017-03-18 11:46:10 -04:00
}
output: Move layout logic to the output package
2017-03-06 05:20:30 -05:00
}
Reference in a new issue Copy permalink