From b12ff303c850ba540c532d7b18d0e34d9fecb5c9 Mon Sep 17 00:00:00 2001 From: bep Date: Mon, 26 Jan 2015 00:15:10 +0100 Subject: [PATCH] New paginator syntax --- layouts/_default/list.ace | 10 +++++----- layouts/index.ace | 7 +++++-- layouts/partials/pagination.html | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/layouts/_default/list.ace b/layouts/_default/list.ace index 58312ed..d538944 100644 --- 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  – {{.Date.Format "Jan 02, 2006"}} diff --git a/layouts/index.ace b/layouts/index.ace index 79f4c7c..1ec7c24 100644 --- 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 }} (ca. {{ .Page.FuzzyWordCount }} ord) + a href={{ .RelPermalink }} {{ .Title }} (ca. {{ .FuzzyWordCount }} ord) {{ 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 index 4baef37..3e4d68b 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,4 +1,4 @@ -{{ $pag := .Data.Paginator }} +{{ $pag := .Paginator }} {{ if gt $pag.TotalPages 1 }}