From 805dc65ccb31a9e13457d5ef28d08f0595836724 Mon Sep 17 00:00:00 2001 From: BBaoVanC Date: Fri, 6 May 2022 21:14:42 -0500 Subject: [PATCH] Split duplicated `.page-list` div into separate partial --- layouts/_default/list.html | 14 +------------- layouts/_default/single.html | 8 +------- layouts/authors/term.html | 18 ++++-------------- layouts/categories/term.html | 14 +------------- layouts/index.html | 14 +------------- layouts/partials/latest-posts.html | 12 +----------- layouts/partials/page-list.html | 13 +++++++++++++ layouts/series/term.html | 22 ++++------------------ layouts/tags/term.html | 14 +------------- layouts/taxonomy/term.html | 14 +------------- 10 files changed, 28 insertions(+), 115 deletions(-) create mode 100644 layouts/partials/page-list.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bcc7a82..3e96ad5 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -14,19 +14,7 @@ {{ end }} -
- {{ with .Paginator.Pages }} - - {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} -
+ {{ partial "page-list.html" .Paginator.Pages }} {{ partial "pagination.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b269aa0..9874658 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -79,13 +79,7 @@ {{ end }} diff --git a/layouts/authors/term.html b/layouts/authors/term.html index 6e77df1..f45b07e 100644 --- a/layouts/authors/term.html +++ b/layouts/authors/term.html @@ -7,21 +7,11 @@ {{ partial "post-metadata/author.html" . }} - {{ .Content }} + {{ with .Content }} + {{ . }} + {{ end }} -
- {{ with .Paginator.Pages }} - - {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} -
+ {{ partial "page-list.html" .Paginator.Pages }} {{ partial "pagination.html" . }} {{ end }} diff --git a/layouts/categories/term.html b/layouts/categories/term.html index 8fc31fa..569c37b 100644 --- a/layouts/categories/term.html +++ b/layouts/categories/term.html @@ -9,19 +9,7 @@ {{ . }} {{ end }} -
- {{ with .Paginator.Pages }} - - {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} -
+ {{ partial "page-list.html" .Paginator.Pages }} {{ partial "pagination.html" . }} {{ end }} diff --git a/layouts/index.html b/layouts/index.html index 3d97dd8..89340a8 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -13,19 +13,7 @@ {{ partial "rss-link.html" . }} - {{ with (.Paginate .Site.RegularPages).Pages }} -
- -
- {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} + {{ partial "page-list.html" (.Paginate .Site.RegularPages).Pages }} {{ partial "pagination.html" . }} diff --git a/layouts/partials/latest-posts.html b/layouts/partials/latest-posts.html index e6bdcd2..096160e 100644 --- a/layouts/partials/latest-posts.html +++ b/layouts/partials/latest-posts.html @@ -6,16 +6,6 @@ {{ with .Site.RegularPages | first 5 }} -
- -
- {{ else }} -
- {{ i18n "no_posts" }} -
+ {{ partial "page-list.html" . }} {{ end }} diff --git a/layouts/partials/page-list.html b/layouts/partials/page-list.html new file mode 100644 index 0000000..c93ddf5 --- /dev/null +++ b/layouts/partials/page-list.html @@ -0,0 +1,13 @@ +
+ {{ with . }} + + {{ else }} +
+ {{ i18n "no_posts" }} +
+ {{ end }} +
diff --git a/layouts/series/term.html b/layouts/series/term.html index 5acb511..17a2469 100644 --- a/layouts/series/term.html +++ b/layouts/series/term.html @@ -11,24 +11,10 @@ {{ . }} {{ end }} -
- {{ with .Paginator.Pages.Reverse }} - - {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} -
+ {{ with .Paginator.Pages.Reverse }} + {{ partial "page-list.html" . }} + {{ end }} + {{ partial "pagination.html" . }} {{ end }} diff --git a/layouts/tags/term.html b/layouts/tags/term.html index 1876b4f..eb01e8b 100644 --- a/layouts/tags/term.html +++ b/layouts/tags/term.html @@ -9,19 +9,7 @@ {{ . }} {{ end }} -
- {{ with .Paginator.Pages }} - - {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} -
+ {{ partial "page-list.html" .Paginator.Pages }} {{ partial "pagination.html" . }} {{ end }} diff --git a/layouts/taxonomy/term.html b/layouts/taxonomy/term.html index cf40d14..4e08ec1 100644 --- a/layouts/taxonomy/term.html +++ b/layouts/taxonomy/term.html @@ -9,19 +9,7 @@ {{ . }} {{ end }} -
- {{ with .Paginator.Pages }} - - {{ else }} -
- {{ i18n "no_posts" }} -
- {{ end }} -
+ {{ partial "page-list.html" .Paginator.Pages }} {{ partial "pagination.html" . }} {{ end }}