Merge commit '337d0c5f516ee085205e8abefdb7f87e6d33ca05'

This commit is contained in:
Bjørn Erik Pedersen
2018-01-31 11:08:08 +01:00
58 changed files with 1381 additions and 552 deletions

View File

@@ -220,131 +220,457 @@
],
"layouts": [
{
"Example": "AMP home, with theme \"demoTheme\".",
"OutputFormat": "AMP",
"Suffix": "html",
"Template Lookup Order": [
"layouts/index.amp.html",
"layouts/index.html",
"layouts/_default/list.amp.html",
"layouts/_default/list.html",
"demoTheme/layouts/index.amp.html",
"demoTheme/layouts/index.html",
"demoTheme/layouts/_default/list.amp.html",
"demoTheme/layouts/_default/list.html"
]
},
{
"Example": "AMP home, French language\".",
"OutputFormat": "AMP",
"Suffix": "html",
"Template Lookup Order": [
"layouts/index.fr.amp.html",
"layouts/index.amp.html",
"layouts/index.fr.html",
"layouts/index.html",
"layouts/_default/list.fr.amp.html",
"layouts/_default/list.amp.html",
"layouts/_default/list.fr.html",
"layouts/_default/list.html"
]
},
{
"Example": "RSS home, no theme.",
"OutputFormat": "RSS",
"Suffix": "xml",
"Template Lookup Order": [
"layouts/rss.xml",
"layouts/_default/rss.xml",
"layouts/_internal/_default/rss.xml"
]
},
{
"Example": "JSON home, no theme.",
"OutputFormat": "JSON",
"Suffix": "json",
"Template Lookup Order": [
"layouts/index.json.json",
"layouts/index.json",
"layouts/_default/list.json.json",
"layouts/_default/list.json"
]
},
{
"Example": "CSV regular, \"layout: demolayout\" in front matter.",
"OutputFormat": "CSV",
"Suffix": "csv",
"Template Lookup Order": [
"layouts/_default/demolayout.csv.csv",
"layouts/_default/demolayout.csv"
]
},
{
"Example": "JSON regular, \"type: demotype\" in front matter.",
"OutputFormat": "JSON",
"Suffix": "json",
"Template Lookup Order": [
"layouts/demotype/single.json.json",
"layouts/demotype/single.json",
"layouts/_default/single.json.json",
"layouts/_default/single.json"
]
},
{
"Example": "HTML regular.",
"Example": "Single page in \"posts\" section",
"Kind": "page",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/posts/single.html.html",
"layouts/posts/single.html",
"layouts/_default/single.html.html",
"layouts/_default/single.html"
]
},
{
"Example": "AMP regular.",
"Example": "Single page in \"posts\" section with layout set",
"Kind": "page",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/posts/demolayout.html.html",
"layouts/posts/single.html.html",
"layouts/posts/demolayout.html",
"layouts/posts/single.html",
"layouts/_default/demolayout.html.html",
"layouts/_default/single.html.html",
"layouts/_default/demolayout.html",
"layouts/_default/single.html"
]
},
{
"Example": "Single page in \"posts\" section with theme",
"Kind": "page",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/posts/single.html.html",
"demoTheme/layouts/posts/single.html.html",
"layouts/posts/single.html",
"demoTheme/layouts/posts/single.html",
"layouts/_default/single.html.html",
"demoTheme/layouts/_default/single.html.html",
"layouts/_default/single.html",
"demoTheme/layouts/_default/single.html"
]
},
{
"Example": "AMP single page",
"Kind": "page",
"OutputFormat": "AMP",
"Suffix": "html",
"Template Lookup Order": [
"layouts/posts/single.amp.html",
"layouts/posts/single.html",
"layouts/_default/single.amp.html",
"layouts/_default/single.html"
]
},
{
"Example": "Calendar blog section.",
"OutputFormat": "Calendar",
"Suffix": "ics",
"Example": "AMP single page, French language",
"Kind": "page",
"OutputFormat": "AMP",
"Suffix": "html",
"Template Lookup Order": [
"layouts/section/blog.calendar.ics",
"layouts/section/blog.ics",
"layouts/blog/list.calendar.ics",
"layouts/blog/list.ics",
"layouts/_default/section.calendar.ics",
"layouts/_default/section.ics",
"layouts/_default/list.calendar.ics",
"layouts/_default/list.ics"
"layouts/posts/single.fr.amp.html",
"layouts/posts/single.amp.html",
"layouts/posts/single.fr.html",
"layouts/posts/single.html",
"layouts/_default/single.fr.amp.html",
"layouts/_default/single.amp.html",
"layouts/_default/single.fr.html",
"layouts/_default/single.html"
]
},
{
"Example": "Calendar taxonomy list.",
"OutputFormat": "Calendar",
"Suffix": "ics",
"Example": "Home page",
"Kind": "home",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/taxonomy/tag.calendar.ics",
"layouts/taxonomy/tag.ics",
"layouts/_default/taxonomy.calendar.ics",
"layouts/_default/taxonomy.ics",
"layouts/_default/list.calendar.ics",
"layouts/_default/list.ics"
"layouts/page/index.html.html",
"layouts/page/home.html.html",
"layouts/page/list.html.html",
"layouts/page/index.html",
"layouts/page/home.html",
"layouts/page/list.html",
"layouts/index.html.html",
"layouts/home.html.html",
"layouts/list.html.html",
"layouts/index.html",
"layouts/home.html",
"layouts/list.html",
"layouts/_default/index.html.html",
"layouts/_default/home.html.html",
"layouts/_default/list.html.html",
"layouts/_default/index.html",
"layouts/_default/home.html",
"layouts/_default/list.html"
]
},
{
"Example": "Calendar taxonomy term.",
"OutputFormat": "Calendar",
"Suffix": "ics",
"Example": "Home page with type set",
"Kind": "home",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/taxonomy/tag.terms.calendar.ics",
"layouts/taxonomy/tag.terms.ics",
"layouts/_default/terms.calendar.ics",
"layouts/_default/terms.ics"
"layouts/demotype/index.html.html",
"layouts/demotype/home.html.html",
"layouts/demotype/list.html.html",
"layouts/demotype/index.html",
"layouts/demotype/home.html",
"layouts/demotype/list.html",
"layouts/index.html.html",
"layouts/home.html.html",
"layouts/list.html.html",
"layouts/index.html",
"layouts/home.html",
"layouts/list.html",
"layouts/_default/index.html.html",
"layouts/_default/home.html.html",
"layouts/_default/list.html.html",
"layouts/_default/index.html",
"layouts/_default/home.html",
"layouts/_default/list.html"
]
},
{
"Example": "Home page with layout set",
"Kind": "home",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/page/demolayout.html.html",
"layouts/page/index.html.html",
"layouts/page/home.html.html",
"layouts/page/list.html.html",
"layouts/page/demolayout.html",
"layouts/page/index.html",
"layouts/page/home.html",
"layouts/page/list.html",
"layouts/demolayout.html.html",
"layouts/index.html.html",
"layouts/home.html.html",
"layouts/list.html.html",
"layouts/demolayout.html",
"layouts/index.html",
"layouts/home.html",
"layouts/list.html",
"layouts/_default/demolayout.html.html",
"layouts/_default/index.html.html",
"layouts/_default/home.html.html",
"layouts/_default/list.html.html",
"layouts/_default/demolayout.html",
"layouts/_default/index.html",
"layouts/_default/home.html",
"layouts/_default/list.html"
]
},
{
"Example": "Home page with theme",
"Kind": "home",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/page/index.html.html",
"demoTheme/layouts/page/index.html.html",
"layouts/page/home.html.html",
"demoTheme/layouts/page/home.html.html",
"layouts/page/list.html.html",
"demoTheme/layouts/page/list.html.html",
"layouts/page/index.html",
"demoTheme/layouts/page/index.html",
"layouts/page/home.html",
"demoTheme/layouts/page/home.html",
"layouts/page/list.html",
"demoTheme/layouts/page/list.html",
"layouts/index.html.html",
"demoTheme/layouts/index.html.html",
"layouts/home.html.html",
"demoTheme/layouts/home.html.html",
"layouts/list.html.html",
"demoTheme/layouts/list.html.html",
"layouts/index.html",
"demoTheme/layouts/index.html",
"layouts/home.html",
"demoTheme/layouts/home.html",
"layouts/list.html",
"demoTheme/layouts/list.html",
"layouts/_default/index.html.html",
"demoTheme/layouts/_default/index.html.html",
"layouts/_default/home.html.html",
"demoTheme/layouts/_default/home.html.html",
"layouts/_default/list.html.html",
"demoTheme/layouts/_default/list.html.html",
"layouts/_default/index.html",
"demoTheme/layouts/_default/index.html",
"layouts/_default/home.html",
"demoTheme/layouts/_default/home.html",
"layouts/_default/list.html",
"demoTheme/layouts/_default/list.html"
]
},
{
"Example": "AMP home, French language\"",
"Kind": "home",
"OutputFormat": "AMP",
"Suffix": "html",
"Template Lookup Order": [
"layouts/page/index.fr.amp.html",
"layouts/page/home.fr.amp.html",
"layouts/page/list.fr.amp.html",
"layouts/page/index.amp.html",
"layouts/page/home.amp.html",
"layouts/page/list.amp.html",
"layouts/page/index.fr.html",
"layouts/page/home.fr.html",
"layouts/page/list.fr.html",
"layouts/page/index.html",
"layouts/page/home.html",
"layouts/page/list.html",
"layouts/index.fr.amp.html",
"layouts/home.fr.amp.html",
"layouts/list.fr.amp.html",
"layouts/index.amp.html",
"layouts/home.amp.html",
"layouts/list.amp.html",
"layouts/index.fr.html",
"layouts/home.fr.html",
"layouts/list.fr.html",
"layouts/index.html",
"layouts/home.html",
"layouts/list.html",
"layouts/_default/index.fr.amp.html",
"layouts/_default/home.fr.amp.html",
"layouts/_default/list.fr.amp.html",
"layouts/_default/index.amp.html",
"layouts/_default/home.amp.html",
"layouts/_default/list.amp.html",
"layouts/_default/index.fr.html",
"layouts/_default/home.fr.html",
"layouts/_default/list.fr.html",
"layouts/_default/index.html",
"layouts/_default/home.html",
"layouts/_default/list.html"
]
},
{
"Example": "JSON home",
"Kind": "home",
"OutputFormat": "JSON",
"Suffix": "json",
"Template Lookup Order": [
"layouts/page/index.json.json",
"layouts/page/home.json.json",
"layouts/page/list.json.json",
"layouts/page/index.json",
"layouts/page/home.json",
"layouts/page/list.json",
"layouts/index.json.json",
"layouts/home.json.json",
"layouts/list.json.json",
"layouts/index.json",
"layouts/home.json",
"layouts/list.json",
"layouts/_default/index.json.json",
"layouts/_default/home.json.json",
"layouts/_default/list.json.json",
"layouts/_default/index.json",
"layouts/_default/home.json",
"layouts/_default/list.json"
]
},
{
"Example": "RSS home",
"Kind": "home",
"OutputFormat": "RSS",
"Suffix": "xml",
"Template Lookup Order": [
"layouts/page/index.rss.xml",
"layouts/page/home.rss.xml",
"layouts/page/rss.xml",
"layouts/page/list.rss.xml",
"layouts/page/index.xml",
"layouts/page/home.xml",
"layouts/page/list.xml",
"layouts/index.rss.xml",
"layouts/home.rss.xml",
"layouts/rss.xml",
"layouts/list.rss.xml",
"layouts/index.xml",
"layouts/home.xml",
"layouts/list.xml",
"layouts/_default/index.rss.xml",
"layouts/_default/home.rss.xml",
"layouts/_default/rss.xml",
"layouts/_default/list.rss.xml",
"layouts/_default/index.xml",
"layouts/_default/home.xml",
"layouts/_default/list.xml",
"layouts/_internal/_default/rss.xml"
]
},
{
"Example": "Section list for \"posts\" section",
"Kind": "section",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/posts/posts.html.html",
"layouts/posts/section.html.html",
"layouts/posts/list.html.html",
"layouts/posts/posts.html",
"layouts/posts/section.html",
"layouts/posts/list.html",
"layouts/section/posts.html.html",
"layouts/section/section.html.html",
"layouts/section/list.html.html",
"layouts/section/posts.html",
"layouts/section/section.html",
"layouts/section/list.html",
"layouts/_default/posts.html.html",
"layouts/_default/section.html.html",
"layouts/_default/list.html.html",
"layouts/_default/posts.html",
"layouts/_default/section.html",
"layouts/_default/list.html"
]
},
{
"Example": "Section list for \"posts\" section with type set to \"blog\"",
"Kind": "section",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/blog/posts.html.html",
"layouts/blog/section.html.html",
"layouts/blog/list.html.html",
"layouts/blog/posts.html",
"layouts/blog/section.html",
"layouts/blog/list.html",
"layouts/posts/posts.html.html",
"layouts/posts/section.html.html",
"layouts/posts/list.html.html",
"layouts/posts/posts.html",
"layouts/posts/section.html",
"layouts/posts/list.html",
"layouts/section/posts.html.html",
"layouts/section/section.html.html",
"layouts/section/list.html.html",
"layouts/section/posts.html",
"layouts/section/section.html",
"layouts/section/list.html",
"layouts/_default/posts.html.html",
"layouts/_default/section.html.html",
"layouts/_default/list.html.html",
"layouts/_default/posts.html",
"layouts/_default/section.html",
"layouts/_default/list.html"
]
},
{
"Example": "Section list for \"posts\" section with layout set to \"demoLayout\"",
"Kind": "section",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/posts/demolayout.html.html",
"layouts/posts/posts.html.html",
"layouts/posts/section.html.html",
"layouts/posts/list.html.html",
"layouts/posts/demolayout.html",
"layouts/posts/posts.html",
"layouts/posts/section.html",
"layouts/posts/list.html",
"layouts/section/demolayout.html.html",
"layouts/section/posts.html.html",
"layouts/section/section.html.html",
"layouts/section/list.html.html",
"layouts/section/demolayout.html",
"layouts/section/posts.html",
"layouts/section/section.html",
"layouts/section/list.html",
"layouts/_default/demolayout.html.html",
"layouts/_default/posts.html.html",
"layouts/_default/section.html.html",
"layouts/_default/list.html.html",
"layouts/_default/demolayout.html",
"layouts/_default/posts.html",
"layouts/_default/section.html",
"layouts/_default/list.html"
]
},
{
"Example": "Taxonomy list in categories",
"Kind": "taxonomy",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/categories/category.html.html",
"layouts/categories/taxonomy.html.html",
"layouts/categories/list.html.html",
"layouts/categories/category.html",
"layouts/categories/taxonomy.html",
"layouts/categories/list.html",
"layouts/taxonomy/category.html.html",
"layouts/taxonomy/taxonomy.html.html",
"layouts/taxonomy/list.html.html",
"layouts/taxonomy/category.html",
"layouts/taxonomy/taxonomy.html",
"layouts/taxonomy/list.html",
"layouts/category/category.html.html",
"layouts/category/taxonomy.html.html",
"layouts/category/list.html.html",
"layouts/category/category.html",
"layouts/category/taxonomy.html",
"layouts/category/list.html",
"layouts/_default/category.html.html",
"layouts/_default/taxonomy.html.html",
"layouts/_default/list.html.html",
"layouts/_default/category.html",
"layouts/_default/taxonomy.html",
"layouts/_default/list.html"
]
},
{
"Example": "Taxonomy term in categories",
"Kind": "taxonomyTerm",
"OutputFormat": "HTML",
"Suffix": "html",
"Template Lookup Order": [
"layouts/categories/category.terms.html.html",
"layouts/categories/terms.html.html",
"layouts/categories/list.html.html",
"layouts/categories/category.terms.html",
"layouts/categories/terms.html",
"layouts/categories/list.html",
"layouts/taxonomy/category.terms.html.html",
"layouts/taxonomy/terms.html.html",
"layouts/taxonomy/list.html.html",
"layouts/taxonomy/category.terms.html",
"layouts/taxonomy/terms.html",
"layouts/taxonomy/list.html",
"layouts/category/category.terms.html.html",
"layouts/category/terms.html.html",
"layouts/category/list.html.html",
"layouts/category/category.terms.html",
"layouts/category/terms.html",
"layouts/category/list.html",
"layouts/_default/category.terms.html.html",
"layouts/_default/terms.html.html",
"layouts/_default/list.html.html",
"layouts/_default/category.terms.html",
"layouts/_default/terms.html",
"layouts/_default/list.html"
]
}
]
@@ -1427,7 +1753,7 @@
],
"Examples": [
[
"{{chomp \"\u003cp\u003eBlockhead\u003c/p\u003e\\n\" }}",
"{{chomp \"\u003cp\u003eBlockhead\u003c/p\u003e\\n\" | safeHTML }}",
"\u003cp\u003eBlockhead\u003c/p\u003e"
]
]