From 8b572561cd077ba7c186a4624a6dce38afd5c17c Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me> Date: Sun, 8 Oct 2023 11:42:45 -0400 Subject: [PATCH] Moved pagination into its own partial --- layouts/_default/list.html | 16 ++-------------- layouts/news/list.html | 16 ++-------------- layouts/partials/paginator.html | 7 +++++++ layouts/projects/list.html | 16 ++-------------- layouts/resource/list.html | 16 ++-------------- layouts/taxonomy/list.html | 16 ++-------------- layouts/taxonomy/tag.html | 16 ++-------------- 7 files changed, 19 insertions(+), 84 deletions(-) create mode 100644 layouts/partials/paginator.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 09bd28cde..00a055046 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,13 +3,7 @@ {{ $paginator := .Paginate ( where .Pages ".Draft" "!=" true )}} <div class='row'> <div class='col-md-8'> - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} {{ range $index, $element := $paginator.Pages }} <article class='post'> @@ -49,13 +43,7 @@ {{ end }} -<div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> -</div> +{{ partial "paginator.html" . }} </div> {{ partial "side_menu_list.html" . }} diff --git a/layouts/news/list.html b/layouts/news/list.html index 7c3766d19..de0b3b753 100644 --- a/layouts/news/list.html +++ b/layouts/news/list.html @@ -3,13 +3,7 @@ {{ $paginator := .Paginate (where .Data.Pages ".Section" "news") }} <div class='row'> <div class='col-md-8'> - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} {{ range $index, $element := $paginator.Pages }} <article class='post'> @@ -49,13 +43,7 @@ {{ end }} -<div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> -</div> +{{ partial "paginator.html" . }} </div> {{ partial "side_menu_list.html" . }} diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html new file mode 100644 index 000000000..c16c9676d --- /dev/null +++ b/layouts/partials/paginator.html @@ -0,0 +1,7 @@ +<div class='extra-pagination inner'> + <nav class='pagination' role='pagination'> + {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} + <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> + {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} + </nav> +</div> diff --git a/layouts/projects/list.html b/layouts/projects/list.html index ea653cc68..686e7faae 100644 --- a/layouts/projects/list.html +++ b/layouts/projects/list.html @@ -3,13 +3,7 @@ {{ $paginator := .Paginate (where .Data.Pages ".Section" "projects") }} <div class='row'> <div class='col-md-8'> - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} {{ range $index, $element := $paginator.Pages }} <article class='post'> @@ -49,13 +43,7 @@ {{ end }} -<div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> -</div> +{{ partial "paginator.html" . }} </div> {{ partial "side_menu_list.html" . }} diff --git a/layouts/resource/list.html b/layouts/resource/list.html index c8abc90df..7ab135e1c 100644 --- a/layouts/resource/list.html +++ b/layouts/resource/list.html @@ -3,13 +3,7 @@ {{ $paginator := .Paginate (where .Data.Pages ".Section" "resource") }} <div class='row'> <div class='col-md-8'> - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} {{ range $index, $element := $paginator.Pages }} <article class='post'> @@ -49,13 +43,7 @@ {{ end }} -<div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> -</div> +{{ partial "paginator.html" . }} </div> {{ partial "side_menu_list.html" . }} diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html index 2f808e5ad..4b77b0e5c 100644 --- a/layouts/taxonomy/list.html +++ b/layouts/taxonomy/list.html @@ -3,13 +3,7 @@ {{ $paginator := .Paginate .Data.Pages }} <div class='row'> <div class='col-md-8'> - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} {{ range $index, $element := $paginator.Pages }} <article class='post'> @@ -23,13 +17,7 @@ {{ end }} - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} </div> {{ partial "side_menu_taxonomy.html" . }} diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html index 1d1dc40ba..957f1f86d 100644 --- a/layouts/taxonomy/tag.html +++ b/layouts/taxonomy/tag.html @@ -3,13 +3,7 @@ {{ $paginator := .Paginate .Data.Pages }} <div class='row'> <div class='col-md-8'> - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> + {{ partial "paginator.html" . }} {{ range $index, $element := $paginator.Pages }} <article class='post'> @@ -49,13 +43,7 @@ {{ end }} - <div class='extra-pagination inner'> - <nav class='pagination' role='pagination'> - {{ if .Paginator.HasNext }}<a href="{{ .Paginator.Next.URL }}" class="newer-posts">↠Newer Posts</a>{{ end }} - <span class='page-number'>Page {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}</span> - {{ if .Paginator.HasPrev }}<a href="{{ .Paginator.Prev.URL }}" class="older-posts">Older Posts →</a>{{ end }} - </nav> - </div> +{{ partial "paginator.html" . }} </div> {{ partial "side_menu_taxonomy.html" . }} -- GitLab