Update: patination to partial

4 files changed, 45 insertions, 75 deletions

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 91f194d..cf2eb71 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -34,31 +34,7 @@
   {{ end }}
 
   <!-- paginator nav -->
-  {{ if gt .Paginator.TotalPages 1 }}
-  <nav class="paginate-container">
-    <div class="pagination">
-      <ul>
-        {{ if .Paginator.HasPrev }}
-        <a href="{{ .Paginator.Prev.URL }}" class="previous_page">Prev</a>
-        {{ else }}
-        <span class="previous_page disabled">Prev</span>
-        {{ end }}
-
-        {{ range .Paginator.Pagers }}
-          <a href="{{ .URL }}">
-            {{ .PageNumber }}
-          </a>
-        {{ end }}
-
-        {{ if .Paginator.HasNext }}
-        <a href="{{ .Paginator.Next.URL }}" class="next_page">Next</a>
-        {{ else }}
-        <span class="next_page disabled">Next</span>
-        {{ end }}
-      </ul>
-    </div>
-  </nav>
-  {{ end }}
+  {{ partial "paginator.html" . }}
 
 
 </div>
diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html
new file mode 100644
index 0000000..89ce285
--- /dev/null
+++ b/layouts/partials/paginator.html
@@ -0,0 +1,42 @@
+{{ $pag := $.Paginator }}
+{{ if gt $pag.TotalPages 1 }}
+<nav class="paginate-container">
+  <div class="pagination">
+    <ul>
+      {{ if $pag.HasPrev }}
+      <a href="{{ $pag.Prev.URL }}" class="previous_page">Prev</a>
+      {{ else }}
+      <span class="previous_page disabled">Prev</span>
+      {{ end }}
+
+      {{ 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)))  }}
+          {{ 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 }}
+            {{ if eq . $pag }}
+              <em class="current selected" aria-current="true">{{ .PageNumber }}</em>
+            {{ else }}
+              <a href="{{ .URL }}">{{ .PageNumber }}</a>
+            {{ end }}
+          {{ else if ($.Scratch.Get "__paginator.shouldEllipse") }}
+            <span class="gap">…</span>
+          {{ end }}
+      {{ end }}
+
+      {{ if $pag.HasNext }}
+      <a href="{{ $pag.Next.URL }}" class="next_page">Next</a>
+      {{ else }}
+      <span class="next_page disabled">Next</span>
+      {{ end }}
+    </ul>
+  </div>
+</nav>
+{{ end }}
diff --git a/layouts/taxonomy/taxonomy.html.html b/layouts/taxonomy/taxonomy.html.html
index 626f745..5f2a28a 100644
--- a/layouts/taxonomy/taxonomy.html.html
+++ b/layouts/taxonomy/taxonomy.html.html
@@ -32,31 +32,7 @@
   {{ end }}
 
   <!-- paginator nav -->
-  {{ if gt .Paginator.TotalPages 1 }}
-  <nav class="paginate-container">
-    <div class="pagination">
-      <ul>
-        {{ if .Paginator.HasPrev }}
-        <a href="{{ .Paginator.Prev.URL }}" class="previous_page">Prev</a>
-        {{ else }}
-        <span class="previous_page disabled">Prev</span>
-        {{ end }}
-
-        {{ range .Paginator.Pagers }}
-          <a href="{{ .URL }}">
-            {{ .PageNumber }}
-          </a>
-        {{ end }}
-
-        {{ if .Paginator.HasNext }}
-        <a href="{{ .Paginator.Next.URL }}" class="next_page">Next</a>
-        {{ else }}
-        <span class="next_page disabled">Next</span>
-        {{ end }}
-      </ul>
-    </div>
-  </nav>
-  {{ end }}
+  {{ partial "paginator.html" . }}
 
 
 </div>
diff --git a/layouts/taxonomy/terms.html.html b/layouts/taxonomy/terms.html.html
index 2fbe378..52594b6 100644
--- a/layouts/taxonomy/terms.html.html
+++ b/layouts/taxonomy/terms.html.html
@@ -30,31 +30,7 @@
   {{ end }}
 
   <!-- paginator nav -->
-  {{ if gt .Paginator.TotalPages 1 }}
-  <nav class="paginate-container">
-    <div class="pagination">
-      <ul>
-        {{ if .Paginator.HasPrev }}
-        <a href="{{ .Paginator.Prev.URL }}" class="previous_page">Prev</a>
-        {{ else }}
-        <span class="previous_page disabled">Prev</span>
-        {{ end }}
-
-        {{ range .Paginator.Pagers }}
-          <a href="{{ .URL }}">
-            {{ .PageNumber }}
-          </a>
-        {{ end }}
-
-        {{ if .Paginator.HasNext }}
-        <a href="{{ .Paginator.Next.URL }}" class="next_page">Next</a>
-        {{ else }}
-        <span class="next_page disabled">Next</span>
-        {{ end }}
-      </ul>
-    </div>
-  </nav>
-  {{ end }}
+  {{ partial "paginator.html" . }}
 
 
 </div>