hugo

commit 2fa851e6500752c0cea1da5cfdfc6d99e0a81a71
parent 21dbfa1f111ca2f066e06af68f267932ce6cf04f
Author: Joe Mooring <joe.mooring@veriphor.com>
Date:   Fri, 31 Jul 2020 07:35:22 -0400

Fix ellipsis display logic in pagination template

Closes #7523

Diffstat:
M
tpl/tplimpl/embedded/templates.autogen.go
 | 
3
+--
M
tpl/tplimpl/embedded/templates/pagination.html
 | 
3
+--

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
@@ -260,8 +260,7 @@ if (!doNotTrack) {
   {{- $shouldEllipse := false -}}
   {{- range $pag.Pagers -}}
   {{- $right := sub .TotalPages .PageNumber -}}
-  {{- $showNumber := or (le .PageNumber 3) (eq $right 0) -}}
-  {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 2)) (lt .PageNumber (add $pag.PageNumber 2))) -}}
+  {{- $showNumber := or (eq .TotalPages 5) (le .PageNumber 3) (eq $right 0) -}}
   {{- if $showNumber -}}
     {{- $ellipsed = false -}}
     {{- $shouldEllipse = false -}}
diff --git a/tpl/tplimpl/embedded/templates/pagination.html b/tpl/tplimpl/embedded/templates/pagination.html
@@ -13,8 +13,7 @@
   {{- $shouldEllipse := false -}}
   {{- range $pag.Pagers -}}
   {{- $right := sub .TotalPages .PageNumber -}}
-  {{- $showNumber := or (le .PageNumber 3) (eq $right 0) -}}
-  {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 2)) (lt .PageNumber (add $pag.PageNumber 2))) -}}
+  {{- $showNumber := or (eq .TotalPages 5) (le .PageNumber 3) (eq $right 0) -}}
   {{- if $showNumber -}}
     {{- $ellipsed = false -}}
     {{- $shouldEllipse = false -}}