diff options
| author | Hauke Stieler <mail@hauke-stieler.de> | 2020-04-09 22:23:56 +0300 |
|---|---|---|
| committer | Hauke Stieler <mail@hauke-stieler.de> | 2020-04-09 22:23:56 +0300 |
| commit | a3bb9df2835c167be8536d073617604d16952156 (patch) | |
| tree | 2fd70739d04276c0cbcbfa7d1c19e83183c486e7 | |
| parent | f9e1b3012e22a515bc97893deb7a65e1157725ba (diff) | |
| parent | f7c5cd9193ad407fa7538fa50578033cc028fdb1 (diff) | |
Merge branch 'dev'v0.6.2
| -rw-r--r-- | layouts/_default/single.html | 8 | ||||
| -rw-r--r-- | layouts/_default/terms.html | 2 | ||||
| -rw-r--r-- | layouts/partials/header.html | 8 | ||||
| -rw-r--r-- | layouts/partials/pagination.html | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 854300b..15d8107 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -77,8 +77,8 @@ {{ end }} <div class="delimiter"></div> <div class="pager-container"> - {{ if .Next }} - <a class="btn btn-primary btn-older-posts" href="{{ .Next.Permalink }}"> + {{ with .PrevInSection }} + <a class="btn btn-primary btn-older-posts" href="{{ .Permalink }}"> <div> <span aria-hidden="true">←</span> {{ i18n "olderPosts" }} </div> @@ -90,8 +90,8 @@ </div> </a> {{ end }} - {{ if .Prev }} - <a class="btn btn-primary btn-newer-posts" href="{{ .Prev.Permalink }}"> + {{ with .NextInSection }} + <a class="btn btn-primary btn-newer-posts" href="{{ .Permalink }}"> <div> {{ i18n "newerPosts" }} <span aria-hidden="true">→</span> </div> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 801323a..c0f6157 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -4,7 +4,7 @@ {{ $data := .Data }} <div class="list-group"> {{ range $key, $value := .Pages }} - <a class="list-group-item" href="{{ $value.URL }}"> + <a class="list-group-item" href="{{ $value.Permalink }}"> {{ $value.Name }} </a> {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 42941db..ff54542 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -3,7 +3,7 @@ <head prefix="og: http://ogp.me/ns#"> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" /> - <meta property="og:title" content="{{ if ne .URL "/" }} {{ .Title }} · {{ end }} {{ .Site.Title }}" /> + <meta property="og:title" content="{{ if ne .Permalink "/" }} {{ .Title }} · {{ end }} {{ .Site.Title }}" /> {{ with .Site.Params.themecolor }} <meta name="theme-color" content="{{ . }}" /> {{ end }} @@ -28,7 +28,7 @@ {{ end }} <title> - {{ if ne .URL "/" }} {{ .Title }} · {{ end }} {{ .Site.Title }} + {{ if ne .Permalink "/" }} {{ .Title }} · {{ end }} {{ .Site.Title }} </title> <link rel="alternative stylesheet" href="{{ .Site.BaseURL }}css/bootstrap.min.css" /> @@ -44,7 +44,7 @@ <link rel="stylesheet" href="{{ (print "css/" . ) | absURL }}"> {{ end }} - {{ if eq .URL "/" }} + {{ if eq .Permalink "/" }} <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }} </head> @@ -88,7 +88,7 @@ {{ if .IsTranslated }} <div class="language-container"> {{ range .Site.Home.AllTranslations }} - <a class="btn btn-default language-button" href="{{ .URL }}{{ strings.TrimPrefix "/" $path }}">{{ .Language.LanguageName }}</a> + <a class="btn btn-default language-button" href="{{ .Permalink }}{{ strings.TrimPrefix "/" $path }}">{{ .Language.LanguageName }}</a> {{ end }} </div> {{ end }} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 37fbc8c..4748677 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -8,7 +8,7 @@ </div> </a> {{ else }} - <a class="btn btn-primary btn-older-posts disable" href="#"> + <a class="btn btn-primary btn-older-posts disabled" href="#"> <div> <span aria-hidden="true">←</span> {{ i18n "olderPosts" }} </div> @@ -24,7 +24,7 @@ </div> </a> {{ else }} - <a class="btn btn-primary btn-newer-posts disable" href="#"> + <a class="btn btn-primary btn-newer-posts disabled" href="#"> <div> {{ i18n "newerPosts" }} <span aria-hidden="true">→</span> </div> |