From 73026b951c5a308f3890c3646c88b6c9a72804b8 Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Fri, 25 Sep 2015 16:49:58 -0500 Subject: Refactored non-partials to use single partial for all content --- layouts/404.html | 35 +---------------------- layouts/_default/list.html | 22 +-------------- layouts/_default/single.html | 46 +----------------------------- layouts/_default/terms.html | 41 +-------------------------- layouts/gallery/single.html | 15 +--------- layouts/index.html | 51 +--------------------------------- layouts/page/single.html | 15 +--------- layouts/partials/404/single.html | 35 +++++++++++++++++++++++ layouts/partials/_default/list.html | 24 ++++++++++++++++ layouts/partials/_default/single.html | 46 ++++++++++++++++++++++++++++++ layouts/partials/_default/terms.html | 41 +++++++++++++++++++++++++++ layouts/partials/extra/pagination.html | 42 +++++++++++++++------------- layouts/partials/gallery/list.html | 16 +++++++++++ layouts/partials/gallery/single.html | 15 ++++++++++ layouts/partials/homepage/single.html | 51 ++++++++++++++++++++++++++++++++++ layouts/partials/page/single.html | 15 ++++++++++ layouts/section/gallery.html | 16 +---------- 17 files changed, 273 insertions(+), 253 deletions(-) create mode 100644 layouts/partials/404/single.html create mode 100644 layouts/partials/_default/list.html create mode 100644 layouts/partials/_default/single.html create mode 100644 layouts/partials/_default/terms.html create mode 100644 layouts/partials/gallery/list.html create mode 100644 layouts/partials/gallery/single.html create mode 100644 layouts/partials/homepage/single.html create mode 100644 layouts/partials/page/single.html diff --git a/layouts/404.html b/layouts/404.html index d6201d1..79caadc 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,35 +1,2 @@ -{{ partial "core/html-start.html" . }} - -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
-
-
-
-
-

404

-
- -
-

- The requested page was not found! Try searching the site for - another page! -

-
- -
- {{ partial "core/search.html" . }} -
-
-
-
-
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "404/single.html" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index ffd64cd..a6cb2a8 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,22 +1,2 @@ -{{ partial "core/html-start.html" . }} -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
-
- {{ range .Paginator.Pages }} -
- {{ partial "post/page-item.html" . }} -
- {{ end }} -
- {{ partial "extra/pagination.html" . }} -
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "_default/list.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index c94f328..a6cb2a8 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,46 +1,2 @@ -{{ partial "core/html-start.html" . }} - -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
-
-
- {{ with .Params.image }} - - {{ end }} -
-
-

{{ .Title }}

- - | - {{ partial "post/categories.html" . }} - | - {{ partial "post/tags.html" . }} -
- -
- -
- {{ with .Params.redirect }} -

If you are not redirected automatically, follow the link.

- {{ else }} - {{ .Content }} - {{ end }} -
- -
-

{{ .Site.Copyright | markdownify }}

-
-
-
-
-
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "_default/list.html" . }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 0af8669..5e0cf1f 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,41 +1,2 @@ - -{{ partial "core/html-start.html" . }} - -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
-
-
-
-
-

{{ .Title }}

-
- -
- -
-
-
    - {{ $baseUrl := .Site.BaseURL }} - {{ $data := .Data }} - {{ range $key, $value := .Data.Terms.Alphabetical }} -
  • - {{ $value.Name }} {{ $value.Count }} -
    • - {{ end }} -
-
-
-
-
-
-
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "_default/terms.html" . }} diff --git a/layouts/gallery/single.html b/layouts/gallery/single.html index eff71bf..3a080fe 100644 --- a/layouts/gallery/single.html +++ b/layouts/gallery/single.html @@ -1,15 +1,2 @@ -{{ partial "core/html-start.html" . }} -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
- {{ partial "gallery/item" . }} -
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "gallery/single.html" . }} diff --git a/layouts/index.html b/layouts/index.html index 01567b0..1677aee 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,51 +1,2 @@ -{{ partial "core/html-start.html" . }} - -{{ partial "core/head.html" . }} - - -
- {{ with .Site.Params.Header }} - {{ partial "homepage/header-scrolling.html" . }} - {{ end }} - -
-
-
-

-
    -
  • {{ partial "homepage/svg-face.html" . }}
    • -
  • About Me
    • -
-

-
- -
- {{ range .Site.Params.Cells.List }} - {{ partial "homepage/cell.html" . }} - {{ end }} -
- - {{ with .Site.Params.Footer }} -
-
    - {{ range .List }} -
  • - - - -
    • -
  • |
    • - {{ end }} -
  • {{ $.Site.Copyright | markdownify }}
    • -
-
- {{ end }} -
-
-
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "homepage/single.html" . }} diff --git a/layouts/page/single.html b/layouts/page/single.html index 5d933bc..e9f1c9c 100644 --- a/layouts/page/single.html +++ b/layouts/page/single.html @@ -1,15 +1,2 @@ -{{ partial "core/html-start.html" . }} -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
- {{ .Content }} -
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "page/single.html" . }} diff --git a/layouts/partials/404/single.html b/layouts/partials/404/single.html new file mode 100644 index 0000000..d6201d1 --- /dev/null +++ b/layouts/partials/404/single.html @@ -0,0 +1,35 @@ +{{ partial "core/html-start.html" . }} + +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+
+
+
+
+

404

+
+ +
+

+ The requested page was not found! Try searching the site for + another page! +

+
+ +
+ {{ partial "core/search.html" . }} +
+
+
+
+
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/_default/list.html b/layouts/partials/_default/list.html new file mode 100644 index 0000000..f65df9a --- /dev/null +++ b/layouts/partials/_default/list.html @@ -0,0 +1,24 @@ +{{ partial "core/html-start.html" . }} +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+
+ {{ if .IsNode }} + {{ range .Paginator.Pages }} +
+ {{ partial "post/page-item.html" . }} +
+ {{ end }} + {{ end }} +
+ {{ partial "extra/pagination.html" . }} +
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/_default/single.html b/layouts/partials/_default/single.html new file mode 100644 index 0000000..c94f328 --- /dev/null +++ b/layouts/partials/_default/single.html @@ -0,0 +1,46 @@ +{{ partial "core/html-start.html" . }} + +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+
+
+ {{ with .Params.image }} + + {{ end }} +
+
+

{{ .Title }}

+ + | + {{ partial "post/categories.html" . }} + | + {{ partial "post/tags.html" . }} +
+ +
+ +
+ {{ with .Params.redirect }} +

If you are not redirected automatically, follow the link.

+ {{ else }} + {{ .Content }} + {{ end }} +
+ +
+

{{ .Site.Copyright | markdownify }}

+
+
+
+
+
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/_default/terms.html b/layouts/partials/_default/terms.html new file mode 100644 index 0000000..0af8669 --- /dev/null +++ b/layouts/partials/_default/terms.html @@ -0,0 +1,41 @@ + +{{ partial "core/html-start.html" . }} + +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+
+
+
+
+

{{ .Title }}

+
+ +
+ +
+
+
    + {{ $baseUrl := .Site.BaseURL }} + {{ $data := .Data }} + {{ range $key, $value := .Data.Terms.Alphabetical }} +
  • + {{ $value.Name }} {{ $value.Count }} +
    • + {{ end }} +
+
+
+
+
+
+
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/extra/pagination.html b/layouts/partials/extra/pagination.html index b49849c..2fa4a82 100644 --- a/layouts/partials/extra/pagination.html +++ b/layouts/partials/extra/pagination.html @@ -1,21 +1,23 @@ - +{{ if .IsNode }} + +{{ end }} diff --git a/layouts/partials/gallery/list.html b/layouts/partials/gallery/list.html new file mode 100644 index 0000000..461ddba --- /dev/null +++ b/layouts/partials/gallery/list.html @@ -0,0 +1,16 @@ +{{ partial "core/html-start.html" . }} +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+ {{ partial "gallery/collection.html" . }} + {{ partial "extra/pagination.html" . }} +
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/gallery/single.html b/layouts/partials/gallery/single.html new file mode 100644 index 0000000..eff71bf --- /dev/null +++ b/layouts/partials/gallery/single.html @@ -0,0 +1,15 @@ +{{ partial "core/html-start.html" . }} +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+ {{ partial "gallery/item" . }} +
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/homepage/single.html b/layouts/partials/homepage/single.html new file mode 100644 index 0000000..01567b0 --- /dev/null +++ b/layouts/partials/homepage/single.html @@ -0,0 +1,51 @@ +{{ partial "core/html-start.html" . }} + +{{ partial "core/head.html" . }} + + +
+ {{ with .Site.Params.Header }} + {{ partial "homepage/header-scrolling.html" . }} + {{ end }} + +
+
+
+

+
    +
  • {{ partial "homepage/svg-face.html" . }}
    • +
  • About Me
    • +
+

+
+ +
+ {{ range .Site.Params.Cells.List }} + {{ partial "homepage/cell.html" . }} + {{ end }} +
+ + {{ with .Site.Params.Footer }} +
+
    + {{ range .List }} +
  • + + + +
    • +
  • |
    • + {{ end }} +
  • {{ $.Site.Copyright | markdownify }}
    • +
+
+ {{ end }} +
+
+
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/partials/page/single.html b/layouts/partials/page/single.html new file mode 100644 index 0000000..5d933bc --- /dev/null +++ b/layouts/partials/page/single.html @@ -0,0 +1,15 @@ +{{ partial "core/html-start.html" . }} +{{ partial "core/head.html" . }} + + + {{ partial "core/main-menu.html" . }} + +
+ {{ .Content }} +
+ + {{ partial "core/js.html" . }} + + +{{ partial "core/html-end.html" . }} + diff --git a/layouts/section/gallery.html b/layouts/section/gallery.html index 461ddba..03f86a3 100644 --- a/layouts/section/gallery.html +++ b/layouts/section/gallery.html @@ -1,16 +1,2 @@ -{{ partial "core/html-start.html" . }} -{{ partial "core/head.html" . }} - - - {{ partial "core/main-menu.html" . }} - -
- {{ partial "gallery/collection.html" . }} - {{ partial "extra/pagination.html" . }} -
- - {{ partial "core/js.html" . }} - - -{{ partial "core/html-end.html" . }} +{{ partial "gallery/list.html" . }} -- cgit v1.2.3