From eb0ad9c489c482d949d1a3553741eb387f75eb80 Mon Sep 17 00:00:00 2001 From: James Booker Date: Thu, 13 Jun 2019 10:05:25 +0100 Subject: [PATCH] Fix deprecated .Hugo, .UniqueID and .URL references --- layouts/_default/list.html | 2 +- layouts/partials/footer.html | 6 +++--- layouts/partials/header.html | 4 ++-- layouts/partials/menu.html | 8 ++++---- layouts/shortcodes/children.html | 4 ++-- layouts/shortcodes/ref.html | 2 +- layouts/shortcodes/relref.html | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e0c466d8d8..b56e8d48f6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -7,7 +7,7 @@ {{ if or (eq .Kind "taxonomy") (eq .Kind "taxonomyTerm") }} {{end}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index e058bdf348..91a1c9923f 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -14,7 +14,7 @@ {{ define "menu-nextprev" }} {{$currentNode := .currentnode }} {{ if ne .menu.Params.hidden true}} - {{if hasPrefix $currentNode.URL .menu.URL }} + {{if hasPrefix $currentNode.RelPermalink .menu.RelPermalink }} {{ $currentNode.Scratch.Set "NextPageOK" "OK" }} {{ $currentNode.Scratch.Set "prevPage" ($currentNode.Scratch.Get "prevPageTmp") }} {{else}} @@ -43,10 +43,10 @@ {{$showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev))}} {{if $showPrevNext}} {{with ($.Scratch.Get "prevPage")}} - + {{end}} {{with ($.Scratch.Get "nextPage")}} - + {{end}} {{end}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 63e0c50aa6..cb92a3855b 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -3,7 +3,7 @@ - {{ .Hugo.Generator }} + {{ hugo.Generator }} {{ partial "meta.html" . }} {{ partial "favicon.html" . }} {{ .Title }} :: {{ .Site.Title }} @@ -100,7 +100,7 @@ {{define "breadcrumb"}} {{$parent := .page.Parent }} {{ if $parent }} - {{ $value := (printf "%s > %s" $parent.URL $parent.Title .value) }} + {{ $value := (printf "%s > %s" $parent.RelPermalink $parent.Title .value) }} {{ template "breadcrumb" dict "page" $parent "value" $value }} {{else}} {{.value|safeHTML}} diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 322649df62..3021317f17 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -32,7 +32,7 @@ @@ -97,9 +97,9 @@ {{with .sect}} {{if .IsSection}} {{safeHTML .Params.head}} -
  • @@ -137,7 +137,7 @@
    • {{else}} {{ if not .Params.Hidden }} -
  • +
  • {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}} {{ if $showvisitedlinks}}{{end}} diff --git a/layouts/shortcodes/children.html b/layouts/shortcodes/children.html index 359fced457..6432791be8 100644 --- a/layouts/shortcodes/children.html +++ b/layouts/shortcodes/children.html @@ -47,12 +47,12 @@ {{$numn := add $num $.count }} {{(printf "" $numn)|safeHTML}} -{{ .Title }} +{{ .Title }} {{(printf "" $numn)|safeHTML}} {{else}} {{(printf "<%s>" $.style)|safeHTML}} -{{ .Title }} +{{ .Title }} {{(printf "" $.style)|safeHTML}} {{end}} diff --git a/layouts/shortcodes/ref.html b/layouts/shortcodes/ref.html index e7f769e739..7b7eb426b8 100644 --- a/layouts/shortcodes/ref.html +++ b/layouts/shortcodes/ref.html @@ -7,7 +7,7 @@ {{- end -}} {{- else -}} {{- with .Site.GetPage "section" (.Get 0) }} - {{- .URL -}} + {{- .RelPermalink -}} {{- else -}} {{- .Get 0 | relref .Page -}} {{- end -}} diff --git a/layouts/shortcodes/relref.html b/layouts/shortcodes/relref.html index e7f769e739..7b7eb426b8 100644 --- a/layouts/shortcodes/relref.html +++ b/layouts/shortcodes/relref.html @@ -7,7 +7,7 @@ {{- end -}} {{- else -}} {{- with .Site.GetPage "section" (.Get 0) }} - {{- .URL -}} + {{- .RelPermalink -}} {{- else -}} {{- .Get 0 | relref .Page -}} {{- end -}}