From 19a1901a7ac7b756aa6d106f44e575ecd2c810ac Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Thu, 16 Apr 2020 20:47:57 +0800 Subject: Progress button adjustment --- layouts/_default/list.html | 4 +--- layouts/_default/single.html | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'layouts/_default') diff --git a/layouts/_default/list.html b/layouts/_default/list.html index ef083bc..aabe09b 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -32,9 +32,7 @@ {{ partial "sidebar.html" . }}
- -
- +
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e7b9278..aca0bf6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -33,9 +33,7 @@ {{ partial "sidebar.html" . }}
- -
- +
-- cgit v1.2.3 From 7323b2d24082ab7b6fdae94abd09099822651f9b Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 18 Apr 2020 11:15:11 +0800 Subject: Fix missing translation --- layouts/_default/archives.html | 2 +- layouts/_default/tag.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'layouts/_default') diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 62114b2..d4459ff 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,6 +1,6 @@ {{ define "main" }}
- 文章总数：{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} + {{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index 5aef22f..06fdfde 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -1,6 +1,6 @@ {{ define "main" }}
- 拥有标签 {{ .Title }} 的文章： + {{ i18n "tagsCurrentTag" . }}
{{ range .Paginator.Pages }} -- cgit v1.2.3 From b8a0c1dacdbffbb8f9d3f9fdb92bebf2655d59df Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 18 Apr 2020 11:25:08 +0800 Subject: Fix summary style not working in tags page --- layouts/_default/tag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts/_default') diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index 06fdfde..4373558 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -11,7 +11,7 @@
{{ partial "post-meta.html" . }}
-
+
{{ .Summary }}
-- cgit v1.2.3 From d53b6ab5ec8d5648201efc6308306e0c222b65fd Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 18 Apr 2020 18:08:13 +0800 Subject: Smart pagination --- layouts/_default/archives.html | 58 ++++++++++++++++++++++++++++++++++++-- layouts/_default/list.html | 58 ++++++++++++++++++++++++++++++++++++-- layouts/_default/tag.html | 63 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 168 insertions(+), 11 deletions(-) (limited to 'layouts/_default') diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index d4459ff..dab458f 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -14,9 +14,61 @@
{{ end }} + +{{ $offsetLinks := 2 }} +{{ $maxLinks := (add (mul $offsetLinks 2) 1) }} +{{ $lowerLimit := (add $offsetLinks 1) }} +{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }} {{ if gt $paginator.TotalPages 1 }} - + {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e459763..567e577 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -17,9 +17,61 @@ {{ end }} + +{{ $offsetLinks := 2 }} +{{ $maxLinks := (add (mul $offsetLinks 2) 1) }} +{{ $lowerLimit := (add $offsetLinks 1) }} +{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }} {{ if gt $paginator.TotalPages 1 }} - + {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index 4373558..dd15f58 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -3,7 +3,8 @@ {{ i18n "tagsCurrentTag" . }} -{{ range .Paginator.Pages }} +{{ $paginator := .Paginator }} +{{ range $paginator.Pages }}

{{ .Title }} @@ -19,9 +20,61 @@

{{ end }} -{{ if gt .Paginator.TotalPages 1 }} - + +{{ $offsetLinks := 2 }} +{{ $maxLinks := (add (mul $offsetLinks 2) 1) }} +{{ $lowerLimit := (add $offsetLinks 1) }} +{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }} +{{ if gt $paginator.TotalPages 1 }} + {{ end }} + {{ end }} \ No newline at end of file -- cgit v1.2.3