diff options
| author | tdro <tdro@noreply.example.com> | 2022-06-19 00:30:22 -0400 |
|---|---|---|
| committer | tdro <tdro@noreply.example.com> | 2022-06-19 00:30:22 -0400 |
| commit | 0b79915d233dba7a0c35b597a93803afafad213f (patch) | |
| tree | af11ae8ba5d820f5608b6fe35923496ac3761fb9 | |
| parent | 89d853ea7a8e9258c848b32e035887ab3f9e6831 (diff) | |
| download | canory-0b79915d233dba7a0c35b597a93803afafad213f.tar.gz canory-0b79915d233dba7a0c35b597a93803afafad213f.tar.bz2 canory-0b79915d233dba7a0c35b597a93803afafad213f.zip | |
themes/default/layouts/_default/taxonomy: Connect links with pagination
Cleanup some white space.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | themes/default/layouts/_default/home.archive-tags.html | 15 | ||||
| -rw-r--r-- | themes/default/layouts/_default/taxonomy.html | 38 |
3 files changed, 32 insertions, 23 deletions
@@ -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 }} |