diff options
| -rw-r--r-- | i18n/en.toml | 5 | ||||
| -rw-r--r-- | i18n/zh.toml | 5 | ||||
| -rw-r--r-- | images/Apple-Devices-Preview.png | bin | 230071 -> 230508 bytes | |||
| -rw-r--r-- | layouts/partials/comments.html | 5 | ||||
| -rw-r--r-- | layouts/partials/paginator.html | 43 |
5 files changed, 31 insertions, 27 deletions
diff --git a/i18n/en.toml b/i18n/en.toml index ef58201..72c6641 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -28,6 +28,11 @@ other = "Categories" other = "More" # === Pagination === +# === partials/comments.html === +[valineLang] +other = "en" +# === partials/comments.html === + # === partials/footer.html === [powered] other = "Powered by %s" diff --git a/i18n/zh.toml b/i18n/zh.toml index b013145..6eba84b 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -28,6 +28,11 @@ other = "分类" other = "更多" # === Pagination === +# === partials/comments.html === +[valineLang] +other = "zh-cn" +# === partials/comments.html === + # === partials/footer.html === [powered] other = "由 %s 强力驱动" diff --git a/images/Apple-Devices-Preview.png b/images/Apple-Devices-Preview.png Binary files differindex d1bd34c..0e16388 100644 --- a/images/Apple-Devices-Preview.png +++ b/images/Apple-Devices-Preview.png diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index adf1292..0a19b5e 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -57,9 +57,7 @@ {{ .Site.Params.cdn.valine_js | safeHTML }} {{ else }} {{- $res := resources.Get "js/lib/valine/Valine.min.js" | resources.Minify -}} - {{ .Site.Params.cdn.fontawesome_free_css | safeHTML }} - {{ .Site.Params.cdn.fontawesome_free_css | safeHTML }} - <script src="{{ $res.RelPermalink }}"></script> + <script src="{{ $res.RelPermalink }}"></script> {{ end }} <script type="text/javascript"> new Valine({ @@ -73,6 +71,7 @@ placeholder: "{{ .Site.Params.valine.placeholder }}", visitor: "{{ .Site.Params.valine.visitor }}", recordIP: "{{ .Site.Params.valine.recordIP }}", + lang: "{{ T `valineLang` }}", }); </script> {{- end -}} diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html index 3e9da84..6b23e31 100644 --- a/layouts/partials/paginator.html +++ b/layouts/partials/paginator.html @@ -1,31 +1,26 @@ -{{ $pag := $.Paginator }} - -{{ if gt $pag.TotalPages 1 }} +{{ if gt $.paginator.TotalPages 1 -}} <ul class="pagination"> - {{ with $pag.First }} - {{ end }} - - {{ $.Scratch.Set "__paginator.ellipsed" false }} - {{ range $pag.Pagers }} - {{ $right := sub .TotalPages .PageNumber }} - {{ $showNumber := or (le .PageNumber 1) (eq $right 0) }} - {{ $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 3)) (lt .PageNumber (add $pag.PageNumber 3))) }} - {{ if $showNumber }} - {{ $.Scratch.Set "__paginator.ellipsed" false }} - {{ $.Scratch.Set "__paginator.shouldEllipse" false }} - {{ else }} - {{ $.Scratch.Set "__paginator.shouldEllipse" (not ($.Scratch.Get "__paginator.ellipsed") ) }} - {{ $.Scratch.Set "__paginator.ellipsed" true }} - {{ end }} - {{ if $showNumber }} - <li class="page-item {{ if eq . $pag }}active{{ end }}"> + {{- $.Scratch.Set "paginator.ellipsed" false -}} + {{ range $.paginator.Pagers -}} + {{ $right := sub .TotalPages .PageNumber -}} + {{ $showNumber := or (le .PageNumber 1) (eq $right 0) -}} + {{ $showNumber := or $showNumber (and (gt .PageNumber (sub $.paginator.PageNumber 3)) (lt .PageNumber (add $.paginator.PageNumber 3))) -}} + {{ if $showNumber -}} + {{ $.Scratch.Set "paginator.ellipsed" false -}} + {{ $.Scratch.Set "paginator.shouldEllipse" false -}} + {{ else -}} + {{ $.Scratch.Set "paginator.shouldEllipse" (not ($.Scratch.Get "paginator.ellipsed") ) -}} + {{ $.Scratch.Set "paginator.ellipsed" true -}} + {{ end -}} + {{ if $showNumber -}} + <li class="page-item {{ if eq . $.paginator }}active{{ end }}"> <span class="page-link"> <a href="{{ .URL }}">{{ .PageNumber }}</a> </span> </li> - {{ else if ($.Scratch.Get "__paginator.shouldEllipse") }} + {{- else if ($.Scratch.Get "paginator.shouldEllipse") -}} <li class="page-item "><span class="page-link" aria-hidden="true">…</span></li> - {{ end }} - {{ end }} + {{ end -}} + {{ end -}} </ul> -{{ end }}
\ No newline at end of file +{{- end }}
\ No newline at end of file |
