diff options
author | Curtis Timson <curt@live.co.uk> | 2018-02-25 13:29:01 +0300 |
---|---|---|
committer | Curtis Timson <curt@live.co.uk> | 2018-02-25 13:29:01 +0300 |
commit | 4d3bf7190582ebff7be676c6d674cab4668921bc (patch) | |
tree | efd9f78b88beaeefa7084b92d8e9f8a57ec89833 | |
parent | c9ed8307cef558b42b721dee646b1ab5a2da8e0a (diff) | |
parent | 3b6c8784aadd5cf4f707f0530b111a96f4f4e4ea (diff) |
Merge branch 'master' into featured-post
-rw-r--r-- | exampleSite/config.toml | 1 | ||||
-rw-r--r-- | layouts/index.html | 5 | ||||
-rw-r--r-- | layouts/partials/htmlhead.html | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 29419d6..f300843 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -5,6 +5,7 @@ theme = "../.." [params.posts] foldername = "post" + pagesize = "6" [params.settings] googleanalytics = "UA-113904582-3" diff --git a/layouts/index.html b/layouts/index.html index 9331617..c2b0bdc 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -3,7 +3,7 @@ {{ $posts := where .Data.Pages "Type" .Site.Params.Posts.foldername }} {{ $firstPost := first 1 $posts }} - {{ $postsPaging := .Paginate (after 1 ($posts)) 6 }} + {{ $postsPaging := .Paginate (after 1 ($posts)) .Site.Params.Posts.pagesize }} {{ range $firstPost }} {{ .Title }} @@ -27,6 +27,7 @@ {{ partial "posts/list.html" (dict "posts" $postsPaging) }} <!-- Footer --> + {{ if gt $postsPaging.TotalPages 1 }} <footer> <div class="pagination"> {{ if $postsPaging.HasPrev }} @@ -42,7 +43,7 @@ {{ end }} </div> </footer> - + {{ end }} </div> {{ partial "footer/index" . }} diff --git a/layouts/partials/htmlhead.html b/layouts/partials/htmlhead.html index 3d22997..b8757f9 100644 --- a/layouts/partials/htmlhead.html +++ b/layouts/partials/htmlhead.html @@ -6,7 +6,8 @@ --> <html> <head> - <title>Massively by HTML5 UP</title> + <title>{{ if not .IsHome }} {{ .Title }} · {{ end }} {{ .Site.Title }}</title> + <title>{{ .Title }}</title> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/main.css" /> |