diff --git a/README.md b/README.md index 4828bf7c..81fcd222 100644 --- a/README.md +++ b/README.md @@ -479,22 +479,22 @@ These are the rest of the named parameters: ## Customization -If `partials/paige-head-last.html` exists in the site, it is included at the end of the head tag. -If `partials/paige-body-last.html` exists in the site, it is included at the end of the body tag. +If `partials/paige/head-last.html` exists in the site, it is included at the end of the head tag. +If `partials/paige/body-last.html` exists in the site, it is included at the end of the body tag. Most code is in partial templates that are included by the default layouts. -Elements can easily be added, changed, or removed by overriding the corresponding default layout or partial template. +Elements can be added, changed, or removed easily by overriding the corresponding default layout or partial template. For example, the default layouts `home.html`, `list.html`, `single.html`, `taxonomy.html`, and `term.html` -include the partial template `paige-article.html`, -which includes the partial templates -`paige-title.html`, `paige-description.html`, `paige-metadata.html`, `paige-toc.html`, and `paige-content.html`. -To change the page title for those default layouts, change `paige-title.html`. +include the partial template `paige/article.html`. +`paige/article.html` includes the partial templates `paige/metadata.html`, `paige/toc.html`, and `paige/content.html`. +`paige/metadata.html` includes the partial templates `paige/title.html`, `paige/description.html`, and `paige/other.html`. +To change the page title for those default layouts, change `paige/title.html`. To change the page title for `single.html`, -replace the use of `paige-article.html` in `single.html` with the use of -`paige-title.html`, `paige-description.html`, `paige-metadata.html`, `paige-toc.html`, and `paige-content.html`, -then replace that use of `paige-title.html` with your own design. +replace the use of `paige/article.html` in `single.html` with the use of +`paige/title.html`, `paige/description.html`, `paige/other.html`, `paige/toc.html`, and `paige/content.html`, +then replace that use of `paige/title.html` with your own design. ## Design diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0ffbfd43..95945f28 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,22 +2,22 @@ {{ $rtl := eq .Language.LanguageDirection "rtl" }} {{ $lang := .Site.LanguageCode | default .Site.Language.Lang }} - {{ partial "paige-head.html" . }} + {{ partial "paige/head.html" . }}
- {{ partial "paige-header.html" . }} + {{ partial "paige/header.html" . }}
{{ block "main" . }}{{ end }}
- {{ partial "paige-footer.html" . }} + {{ partial "paige/footer.html" . }}
- {{ partial "paige-script.html" . }} + {{ partial "paige/script.html" . }} {{ if templates.Exists "partials/paige-body-last.html" }} - {{ partial "paige-body-last.html" . }} + {{ partial "paige/body-last.html" . }} {{ end }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index dd117148..8807f309 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -1,6 +1,6 @@ {{ define "main" }}
- {{ partial "paige-metadata.html" . }} + {{ partial "paige/metadata.html" . }}
{{ with .Params.stretch }}
@@ -23,8 +23,8 @@ {{ end }}
- {{ partial "paige-toc.html" . }} - {{ partial "paige-content.html" . }} - {{ partial "paige-social.html" . }} + {{ partial "paige/toc.html" . }} + {{ partial "paige/content.html" . }} + {{ partial "paige/social.html" . }}
{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index d3746c3e..662661e7 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,6 @@ {{ define "main" }} {{ if not .Params.paige.show_full_pages }} -{{ partial "paige-article.html" . }} +{{ partial "paige/article.html" . }} {{ end }} -{{ partial "paige-pages.html" . }} +{{ partial "paige/pages.html" . }} {{ end }} diff --git a/layouts/_default/paige-search.html b/layouts/_default/paige-search.html index b5cda97f..9fb65016 100644 --- a/layouts/_default/paige-search.html +++ b/layouts/_default/paige-search.html @@ -1,4 +1,4 @@ {{ define "main" }} -{{ partial "paige-article.html" . }} -{{ partial "paige-search.html" . }} +{{ partial "paige/article.html" . }} +{{ partial "paige/search.html" . }} {{ end }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 444b8ec8..42155fa8 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -13,7 +13,7 @@ {{ $pages = $pages | first $limit }} {{ end }} {{ $pages = where $pages "Params.paige.hide_rss" "ne" true }} -{{ $title := partial "paige-func-title.html" . }} +{{ $title := partial "paige/func-title.html" . }} {{ printf "" | safeHTML }} @@ -42,7 +42,7 @@ {{ end }} {{ range $pages }} - {{ with partial "paige-func-authors.html" . }} + {{ with partial "paige/func-authors.html" . }} {{ . }} {{ end }} {{ if .Content }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d9323d1e..5cf5269e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,4 +1,4 @@ {{ define "main" }} -{{ partial "paige-article.html" . }} -{{ partial "paige-comments.html" . }} +{{ partial "paige/article.html" . }} +{{ partial "paige/comments.html" . }} {{ end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 0910bc33..7eaaca3c 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -1,5 +1,5 @@ {{ define "main" }} -{{ partial "paige-article.html" . }} +{{ partial "paige/article.html" . }} {{ if .Pages }}
    diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 0f13417c..8235f475 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -1,4 +1,4 @@ {{ define "main" }} -{{ partial "paige-article.html" . }} -{{ partial "paige-pages.html" . }} +{{ partial "paige/article.html" . }} +{{ partial "paige/pages.html" . }} {{ end }} diff --git a/layouts/partials/paige-article.html b/layouts/partials/paige-article.html deleted file mode 100644 index 302aca5a..00000000 --- a/layouts/partials/paige-article.html +++ /dev/null @@ -1,5 +0,0 @@ -
    - {{ partial "paige-metadata.html" . }} - {{ partial "paige-toc.html" . }} - {{ partial "paige-content.html" . }} -
    diff --git a/layouts/partials/paige-head.html b/layouts/partials/paige-head.html deleted file mode 100644 index 75c6c15a..00000000 --- a/layouts/partials/paige-head.html +++ /dev/null @@ -1,9 +0,0 @@ - - {{ partial "paige-meta.html" . }} - {{ partial "paige-func-title.html" . }} - {{ partial "paige-link.html" . }} - {{ partial "paige-style.html" . }} - {{ if templates.Exists "partials/paige-head-last.html" }} - {{ partial "paige-head-last.html" . }} - {{ end }} - diff --git a/layouts/partials/paige-metadata.html b/layouts/partials/paige-metadata.html deleted file mode 100644 index 5e30dc07..00000000 --- a/layouts/partials/paige-metadata.html +++ /dev/null @@ -1,5 +0,0 @@ -
    - {{ partial "paige-title.html" . }} - {{ partial "paige-description.html" . }} - {{ partial "paige-other.html" . }} -
    diff --git a/layouts/partials/paige/article.html b/layouts/partials/paige/article.html new file mode 100644 index 00000000..420f83a6 --- /dev/null +++ b/layouts/partials/paige/article.html @@ -0,0 +1,5 @@ +
    + {{ partial "paige/metadata.html" . }} + {{ partial "paige/toc.html" . }} + {{ partial "paige/content.html" . }} +
    diff --git a/layouts/partials/paige-comments.html b/layouts/partials/paige/comments.html similarity index 100% rename from layouts/partials/paige-comments.html rename to layouts/partials/paige/comments.html diff --git a/layouts/partials/paige-content.html b/layouts/partials/paige/content.html similarity index 100% rename from layouts/partials/paige-content.html rename to layouts/partials/paige/content.html diff --git a/layouts/partials/paige-description.html b/layouts/partials/paige/description.html similarity index 100% rename from layouts/partials/paige-description.html rename to layouts/partials/paige/description.html diff --git a/layouts/partials/paige-footer.html b/layouts/partials/paige/footer.html similarity index 100% rename from layouts/partials/paige-footer.html rename to layouts/partials/paige/footer.html diff --git a/layouts/partials/paige-func-authors.html b/layouts/partials/paige/func-authors.html similarity index 100% rename from layouts/partials/paige-func-authors.html rename to layouts/partials/paige/func-authors.html diff --git a/layouts/partials/paige-func-title.html b/layouts/partials/paige/func-title.html similarity index 100% rename from layouts/partials/paige-func-title.html rename to layouts/partials/paige/func-title.html diff --git a/layouts/partials/paige/head.html b/layouts/partials/paige/head.html new file mode 100644 index 00000000..7ac7e1db --- /dev/null +++ b/layouts/partials/paige/head.html @@ -0,0 +1,9 @@ + + {{ partial "paige/meta.html" . }} + {{ partial "paige/func-title.html" . }} + {{ partial "paige/link.html" . }} + {{ partial "paige/style.html" . }} + {{ if templates.Exists "partials/paige-head-last.html" }} + {{ partial "paige/head-last.html" . }} + {{ end }} + diff --git a/layouts/partials/paige-header.html b/layouts/partials/paige/header.html similarity index 59% rename from layouts/partials/paige-header.html rename to layouts/partials/paige/header.html index cbd801ac..fda0a11d 100644 --- a/layouts/partials/paige-header.html +++ b/layouts/partials/paige/header.html @@ -1,5 +1,5 @@ {{ if .Site.Menus.main }}
    - {{ partial "paige-menu.html" . }} + {{ partial "paige/menu.html" . }}
    {{ end }} diff --git a/layouts/partials/paige-link.html b/layouts/partials/paige/link.html similarity index 97% rename from layouts/partials/paige-link.html rename to layouts/partials/paige/link.html index 14d1280c..a924c02c 100644 --- a/layouts/partials/paige-link.html +++ b/layouts/partials/paige/link.html @@ -30,7 +30,7 @@ {{ end }} {{ if .AlternativeOutputFormats }} -{{ $title := partial "paige-func-title.html" . }} +{{ $title := partial "paige/func-title.html" . }} {{ range .AlternativeOutputFormats }} {{ end }} diff --git a/layouts/partials/paige-menu.html b/layouts/partials/paige/menu.html similarity index 100% rename from layouts/partials/paige-menu.html rename to layouts/partials/paige/menu.html diff --git a/layouts/partials/paige-meta.html b/layouts/partials/paige/meta.html similarity index 94% rename from layouts/partials/paige-meta.html rename to layouts/partials/paige/meta.html index 6e121ef6..f5dc4841 100644 --- a/layouts/partials/paige-meta.html +++ b/layouts/partials/paige/meta.html @@ -1,5 +1,5 @@ -{{ with partial "paige-func-authors.html" . }} +{{ with partial "paige/func-authors.html" . }} {{ end }} {{ with .Description }} diff --git a/layouts/partials/paige/metadata.html b/layouts/partials/paige/metadata.html new file mode 100644 index 00000000..adc29870 --- /dev/null +++ b/layouts/partials/paige/metadata.html @@ -0,0 +1,5 @@ +
    + {{ partial "paige/title.html" . }} + {{ partial "paige/description.html" . }} + {{ partial "paige/other.html" . }} +
    diff --git a/layouts/partials/paige-other.html b/layouts/partials/paige/other.html similarity index 86% rename from layouts/partials/paige-other.html rename to layouts/partials/paige/other.html index caae5e18..2c69fa65 100644 --- a/layouts/partials/paige-other.html +++ b/layouts/partials/paige/other.html @@ -1,4 +1,4 @@ -{{ $authors := partial "paige-func-authors.html" . }} +{{ $authors := partial "paige/func-authors.html" . }} {{ if or $authors .PublishDate}}

    {{- with $authors }}{{ . }}{{ end -}} diff --git a/layouts/partials/paige-pages.html b/layouts/partials/paige/pages.html similarity index 86% rename from layouts/partials/paige-pages.html rename to layouts/partials/paige/pages.html index e4a2e0f3..6eef22c9 100644 --- a/layouts/partials/paige-pages.html +++ b/layouts/partials/paige/pages.html @@ -3,12 +3,12 @@ {{ $p := .Paginate .Pages }} {{ range $p.Pages }} {{ .Scratch.Set "paige_show_full_pages" true }} -{{ partial "paige-article.html" . }} +{{ partial "paige/article.html" . }} {{ end }} {{ if or $p.HasPrev $p.HasNext }}

    - {{ partial "paige-pagination.html" . }} + {{ partial "paige/pagination.html" . }}
    {{ end }} @@ -27,7 +27,7 @@ {{ if or $p.HasPrev $p.HasNext }}
    - {{ partial "paige-pagination.html" . }} + {{ partial "paige/pagination.html" . }}
    {{ end }} diff --git a/layouts/partials/paige-pagination.html b/layouts/partials/paige/pagination.html similarity index 100% rename from layouts/partials/paige-pagination.html rename to layouts/partials/paige/pagination.html diff --git a/layouts/partials/paige-script.html b/layouts/partials/paige/script.html similarity index 100% rename from layouts/partials/paige-script.html rename to layouts/partials/paige/script.html diff --git a/layouts/partials/paige-search.html b/layouts/partials/paige/search.html similarity index 100% rename from layouts/partials/paige-search.html rename to layouts/partials/paige/search.html diff --git a/layouts/partials/paige-social.html b/layouts/partials/paige/social.html similarity index 100% rename from layouts/partials/paige-social.html rename to layouts/partials/paige/social.html diff --git a/layouts/partials/paige-style.html b/layouts/partials/paige/style.html similarity index 100% rename from layouts/partials/paige-style.html rename to layouts/partials/paige/style.html diff --git a/layouts/partials/paige-title.html b/layouts/partials/paige/title.html similarity index 100% rename from layouts/partials/paige-title.html rename to layouts/partials/paige/title.html diff --git a/layouts/partials/paige-toc.html b/layouts/partials/paige/toc.html similarity index 100% rename from layouts/partials/paige-toc.html rename to layouts/partials/paige/toc.html