From 0b79915d233dba7a0c35b597a93803afafad213f Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Sun, 19 Jun 2022 00:30:22 -0400
Subject: themes/default/layouts/_default/taxonomy: Connect links with
 pagination

Cleanup some white space.
---
 Makefile                                           |  2 +-
 .../layouts/_default/home.archive-tags.html        | 15 +++++++--
 themes/default/layouts/_default/taxonomy.html      | 38 +++++++++++-----------
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 5c7ca1d..09ce88e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ server:
 test:
 	validatornu \
 	public/index.html \
-  public/default/index.html
+	public/default/index.html
 
 icons:
 	rm -rf static/icons
diff --git a/themes/default/layouts/_default/home.archive-tags.html b/themes/default/layouts/_default/home.archive-tags.html
index 9d9d83a..7fec925 100644
--- a/themes/default/layouts/_default/home.archive-tags.html
+++ b/themes/default/layouts/_default/home.archive-tags.html
@@ -20,22 +20,31 @@
   )
 }}
 
+{{- $page  := 1 -}}
+{{- $count := 0 -}}
+
 <item-list>
   {{ range $taxonomy := .Site.Taxonomies }}
     {{ range $tag, $article := $taxonomy }}
       <h1><a href="{{ $.Site.BaseURL }}/tags/{{ $tag }}/">#{{ $tag }}</a></h1>
       <ul>
-        {{ range $article.Pages }}
+        {{ range $article.Pages -}}
+        {{- $count = add $count 1 -}}
           <li>
             <a
               title="{{ partial "title.html" . }}"
-              href="{{ $.Site.BaseURL }}/tags/{{ $tag }}/#{{ partial "card-id.html" . }}">
+              href="{{ .Site.BaseURL }}/tags/{{ $tag }}/{{ if gt $page 1 }}page/{{ $page }}/{{ end }}#{{ partial "card-id.html" . }}">
               <span><code>{{ .Date.Format "02 Jan 2006" }}</code></span>
               <span>{{ partial "title.html" . }}</span>
               <span>@{{ partial "author-user.html" . }}</span>
             </a>
           </li>
-        {{ end }}
+        {{ if eq (mod $count $.Paginator.PageSize) 0 }}
+          {{ $page = add $page 1 }}
+        {{- end -}}
+        {{- end -}}
+       {{- $page  = 1 -}}
+       {{- $count = 0 -}}
       </ul>
     {{ end }}
   {{ end }}
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index a48b594..97b9bd1 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -22,31 +22,31 @@
       )
     }}
 
-    {{ $page  := 1 }}
-    {{ $count := 0 }}
+    {{- $page  := 1 -}}
+    {{- $count := 0 -}}
 
     {{ range .Paginator.Pages }}
     {{ $title := lower .Title }}
       <item-list>
         <h1><a href="{{ .Site.BaseURL }}/tags/{{ $title }}">#{{ .Title }}</a></h1>
         <ul>
-          {{ range .Pages }}
-          {{ $count = add $count 1 }}
-            <li>
-              <a
-                title="{{ partial "title.html" . }}"
-                href="{{ .Site.BaseURL }}/tags/{{ $title }}/{{ if gt $page 1 }}page/{{ $page }}/{{ end }}#{{ partial "card-id.html" . }}">
-                <span><code>{{ .Date.Format "02 Jan 2006" }}</code></span>
-                <span>{{ partial "title.html" . }}</span>
-                <span>@{{ partial "author-user.html" . }}</span>
-              </a>
-            </li>
-            {{ if eq (mod $count $.Paginator.PageSize) 0 }}
-              {{ $page = add $page 1 }}
-            {{ end }}
-           {{ end }}
-           {{ $page  = 1 }}
-           {{ $count = 0 }}
+        {{ range .Pages }}
+        {{- $count = add $count 1 -}}
+          <li>
+            <a
+              title="{{ partial "title.html" . }}"
+              href="{{ .Site.BaseURL }}/tags/{{ $title }}/{{ if gt $page 1 }}page/{{ $page }}/{{ end }}#{{ partial "card-id.html" . }}">
+              <span><code>{{ .Date.Format "02 Jan 2006" }}</code></span>
+              <span>{{ partial "title.html" . }}</span>
+              <span>@{{ partial "author-user.html" . }}</span>
+            </a>
+          </li>
+        {{ if eq (mod $count $.Paginator.PageSize) 0 }}
+          {{ $page = add $page 1 }}
+        {{- end -}}
+        {{- end -}}
+        {{- $page  = 1 -}}
+        {{- $count = 0 -}}
         </ul>
       </item-list>
     {{ end }}
-- 
cgit v1.2.3