From 2f752b32ad41b46917bce82add15dc700d0d046e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 16 Nov 2022 11:06:35 +0100 Subject: [PATCH] fix: add missing navigation for pagination (#540) --- i18n/cs.yaml | 4 ++++ i18n/de.yaml | 4 ++++ i18n/en.yaml | 4 ++++ i18n/it.yaml | 4 ++++ i18n/ja.yaml | 4 ++++ i18n/zh-cn.yaml | 4 ++++ layouts/_default/taxonomy.html | 1 + layouts/_default/terms.html | 1 + layouts/partials/pagination.html | 22 ++++++++++++++++++++++ layouts/posts/list.html | 1 + src/sass/_base.scss | 26 ++++++++++++++++++++++++++ src/sass/_print.scss | 1 + 12 files changed, 76 insertions(+) create mode 100644 layouts/partials/pagination.html diff --git a/i18n/cs.yaml b/i18n/cs.yaml index 7853e4a..71dd8ed 100644 --- a/i18n/cs.yaml +++ b/i18n/cs.yaml @@ -47,3 +47,7 @@ language_switch_no_tranlation_prefix: "Stránka není přeložena:" propertylist_required: povinné propertylist_optional: volitené propertylist_default: výchozí + +pagination_page_prev: předchozí +pagination_page_next: další +pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}" diff --git a/i18n/de.yaml b/i18n/de.yaml index 83e8537..ae3dc99 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -47,3 +47,7 @@ language_switch_no_tranlation_prefix: "Seite nicht übersetzt:" propertylist_required: erforderlich propertylist_optional: optional propertylist_default: Standardwert + +pagination_page_prev: vorher +pagination_page_next: weiter +pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}" diff --git a/i18n/en.yaml b/i18n/en.yaml index 1807dc8..ff19ea4 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -47,3 +47,7 @@ language_switch_no_tranlation_prefix: "Page not translated:" propertylist_required: required propertylist_optional: optional propertylist_default: default + +pagination_page_prev: prev +pagination_page_next: next +pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}" diff --git a/i18n/it.yaml b/i18n/it.yaml index db535dc..ce7c40b 100644 --- a/i18n/it.yaml +++ b/i18n/it.yaml @@ -47,3 +47,7 @@ language_switch_no_tranlation_prefix: "Pagina non tradotta:" propertylist_required: richiesto propertylist_optional: opzionale propertylist_default: valore predefinito + +pagination_page_prev: precedente +pagination_page_next: prossimo +pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}" diff --git a/i18n/ja.yaml b/i18n/ja.yaml index c38b53e..506e7b4 100644 --- a/i18n/ja.yaml +++ b/i18n/ja.yaml @@ -47,3 +47,7 @@ language_switch_no_tranlation_prefix: "未翻訳のページ:" propertylist_required: 必須 propertylist_optional: 任意 propertylist_default: 既定値 + +pagination_page_prev: 前 +pagination_page_next: 次 +pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}" diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml index c9d7698..e6403ac 100644 --- a/i18n/zh-cn.yaml +++ b/i18n/zh-cn.yaml @@ -47,3 +47,7 @@ language_switch_no_tranlation_prefix: "页面未翻译：" propertylist_required: 需要 propertylist_optional: 可选 propertylist_default: 默认值 + +pagination_page_prev: 以前 +pagination_page_next: 下一个 +pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}" diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 5b32a6b..bb97e8e 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -31,6 +31,7 @@ {{ end }} + {{ partial "pagination.html" . }} {{ end }} {{ define "post-tag" }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index fa97887..2316ef5 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -28,4 +28,5 @@ {{ end }} + {{ partial "pagination.html" . }} {{ end }} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html new file mode 100644 index 0000000..aa615d8 --- /dev/null +++ b/layouts/partials/pagination.html @@ -0,0 +1,22 @@ +{{ $pag := $.Paginator }} + + + diff --git a/layouts/posts/list.html b/layouts/posts/list.html index 25a77eb..ca0ea73 100644 --- a/layouts/posts/list.html +++ b/layouts/posts/list.html @@ -29,6 +29,7 @@ {{ end }} + {{ partial "pagination.html" . }} {{ end }} {{ define "post-tag" }} diff --git a/src/sass/_base.scss b/src/sass/_base.scss index 9dec059..7a523a2 100644 --- a/src/sass/_base.scss +++ b/src/sass/_base.scss @@ -679,6 +679,32 @@ svg.gdoc-icon { } } +.gdoc-paging { + padding: $padding-16 0; + + &__item { + flex: 1 1 0; + + a:visited { + color: var(--link-color); + } + + a:hover, + a:visited:hover { + background: var(--link-color); + color: $gray-100; + } + + &--next { + text-align: right; + } + + &--prev { + text-align: left; + } + } +} + .gdoc-error { padding: $padding-96 $padding-16; margin: 0 auto; diff --git a/src/sass/_print.scss b/src/sass/_print.scss index a206f63..7f3d9f6 100644 --- a/src/sass/_print.scss +++ b/src/sass/_print.scss @@ -1,6 +1,7 @@ @media print { .gdoc-nav, .gdoc-footer .container span:not(:first-child), + .gdoc-paging, .editpage { display: none; }