From 9bd9c28cae452b43b4fcece040d06728990c2c26 Mon Sep 17 00:00:00 2001 From: Arne Rief Date: Mon, 15 Jun 2026 17:30:13 +0200 Subject: Fix pagination langTranslate, HTML cleanup --- assets/css/list-navigation.css | 5 ----- i18n/de.toml | 2 +- i18n/en.toml | 2 +- layouts/_partials/list/pagination.html | 6 +++--- layouts/all-posts.html | 2 +- layouts/single.html | 2 ++ layouts/tags/list.html | 4 ++-- layouts/tags/term.html | 4 ++-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/assets/css/list-navigation.css b/assets/css/list-navigation.css index 64c3464..6c22214 100644 --- a/assets/css/list-navigation.css +++ b/assets/css/list-navigation.css @@ -6,10 +6,6 @@ margin: var(--margin-padding-Y-big); } -.pagination__current { - margin-bottom: 0; -} - .recent-posts__view-all-link, .tag-page__view-all-link { display: block; @@ -20,4 +16,3 @@ .tags-index__list > li { margin-bottom: var(--gap-small); } - diff --git a/i18n/de.toml b/i18n/de.toml index 7051518..908e600 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -28,7 +28,7 @@ page_current = "Aktuelle Seite" page_go_to = "Gehe zu Seite" page_navigation = "Seiten Navigation" page_next = "Nächste Seite" -page_position = "Seite {{ . }} von {{ . }}" +page_position = "Seite {{ .current }} von {{ .total }}" page_previous = "Vorherige Seite" # Posts diff --git a/i18n/en.toml b/i18n/en.toml index 826674e..2a82946 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -28,7 +28,7 @@ page_current = "Current page" page_go_to = "Go to page" page_navigation = "Page navigation" page_next = "Next page" -page_position = "Page {{ . }} of {{ . }}" +page_position = "Page {{ .current }} of {{ .total }}" page_previous = "Previous page" # Posts diff --git a/layouts/_partials/list/pagination.html b/layouts/_partials/list/pagination.html index dfe8178..75b5cae 100644 --- a/layouts/_partials/list/pagination.html +++ b/layouts/_partials/list/pagination.html @@ -11,9 +11,9 @@ {{- end }} -

- {{ lang.Translate "page_position" $paginator.PageNumber $paginator.TotalPages | default (printf "Page %d of %d" $paginator.PageNumber $paginator.TotalPages) }} -

+ + {{ lang.Translate "page_position" (dict "current" $paginator.PageNumber "total" $paginator.TotalPages) | default (printf "Page %d of %d" $paginator.PageNumber $paginator.TotalPages) }} + {{- if $paginator.HasNext }} +

{{ .Title }} diff --git a/layouts/single.html b/layouts/single.html index e1728d3..e9d83da 100644 --- a/layouts/single.html +++ b/layouts/single.html @@ -15,9 +15,11 @@ {{ .Content }} + {{- if ne .Params.excludeFromLists true }}
{{ partial "single/tags" . }} {{ partial "single/next-prev" . }}
+ {{- end }} {{- end }} diff --git a/layouts/tags/list.html b/layouts/tags/list.html index 87f74de..0a346a5 100644 --- a/layouts/tags/list.html +++ b/layouts/tags/list.html @@ -1,6 +1,6 @@ {{- /* List of All Tags */ -}} {{- define "main" }} -
+

{{ lang.Translate "tags_all" | default "All Tags" }} @@ -33,5 +33,5 @@

{{- end }}

-
+

{{- end }} diff --git a/layouts/tags/term.html b/layouts/tags/term.html index f4dfd73..8cd73f4 100644 --- a/layouts/tags/term.html +++ b/layouts/tags/term.html @@ -1,6 +1,6 @@ {{- /* List of All Articles for a Specific Tag */ -}} {{- define "main" }} -
+

@@ -38,5 +38,5 @@ -

+ {{- end }} -- cgit v1.2.3