New paginator syntax

bep · Jan 25, 2015 · b12ff30 · b12ff30
1 parent 12a68d7
commit b12ff30
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/layouts/_default/list.ace b/layouts/_default/list.ace
@@ -2,18 +2,18 @@
 html xmlns=http://www.w3.org/1999/xhtml xml:lang=nn lang=nn
   head
     = include partials/head.html .
-    {{ if .Data.Paginator.HasNext }}
-    link rel="next" href="{{ .Site.BaseUrl }}{{ .Data.Paginator.Next.Url }}"
+    {{ if .Paginator.HasNext }}
+    link rel="next" href="{{ .Site.BaseUrl }}{{ .Paginator.Next.Url }}"
     {{ end }}
-    {{ if .Data.Paginator.HasPrev }}
-    link rel="prev" href="{{ .Site.BaseUrl }}{{ .Data.Paginator.Prev.Url }}"
+    {{ if .Paginator.HasPrev }}
+    link rel="prev" href="{{ .Site.BaseUrl }}{{ .Paginator.Prev.Url }}"
     {{ end }}
   body.layout-reverse
     = include partials/menu.html .
     .content.container
       .main.list
         h1.post-title {{ .Title  }}
-        {{ range .Data.Paginator.Pages }}
+        {{ range .Paginator.Pages }}
         p
           a href={{.Permalink}} {{.LinkTitle}}
           span.bs-date &nbsp;– {{.Date.Format "Jan 02, 2006"}}

diff --git a/layouts/index.ace b/layouts/index.ace
@@ -18,10 +18,13 @@ html xmlns=http://www.w3.org/1999/xhtml xml:lang=nn lang=nn
         .front-read-more
           h1 Sjå òg
           ul
-            {{ range .Site.Taxonomies.tags.asterisk }}
+            {{ $indexNode := . }}
+            {{ range (.Paginate (where .Data.Pages "Type" "post")).Pages }}
+            {{/* range .Paginator.Pages */}}
             li
-              a href={{ .Page.RelPermalink }} {{ .Page.Title }} <small>(ca. {{ .Page.FuzzyWordCount }} ord)</small>
+              a href={{ .RelPermalink }} {{ .Title }} <small>(ca. {{ .FuzzyWordCount }} ord)</small>
             {{ end }}
+             = include partials/pagination.html .
       = include partials/hello-simple.html .
     = include partials/footer.html .
 
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
@@ -1,4 +1,4 @@
-{{ $pag := .Data.Paginator }}
+{{ $pag := .Paginator }}
 {{ if gt $pag.TotalPages 1 }}
 <nav class="pagination">
     <ul class="pagination">