From 9bb25aadba06157d3ca94f907c1d1dfc537d3aca Mon Sep 17 00:00:00 2001 From: Horacio Duran Date: Thu, 17 Mar 2022 13:58:53 +0100 Subject: [PATCH 1/2] Update site to build with newer hugo --- site/content/_index.md | 2 ++ site/layouts/partials/header.html | 6 +++--- site/themes/learn/layouts/partials/footer.html | 6 +++--- site/themes/learn/layouts/partials/header.html | 6 +++--- site/themes/learn/layouts/partials/menu.html | 10 +++++----- site/themes/learn/layouts/shortcodes/children.html | 6 +++--- site/themes/learn/layouts/shortcodes/relref.html | 6 +++--- 7 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 site/content/_index.md diff --git a/site/content/_index.md b/site/content/_index.md new file mode 100644 index 00000000..ac36e062 --- /dev/null +++ b/site/content/_index.md @@ -0,0 +1,2 @@ ++++ ++++ diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html index a2f9e39d..d7ae1830 100644 --- a/site/layouts/partials/header.html +++ b/site/layouts/partials/header.html @@ -3,7 +3,7 @@ - {{ .Hugo.Generator }} + {{ hugo.Generator }} {{ partial "meta.html" . }} {{ partial "favicon.html" . }} {{ .Title }} :: {{ .Site.Title }} @@ -90,9 +90,9 @@

{{.Title}}

{{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}} {{end}} - {{end}} \ No newline at end of file + {{end}} diff --git a/site/themes/learn/layouts/partials/footer.html b/site/themes/learn/layouts/partials/footer.html index fe5c8342..6ec54f3a 100644 --- a/site/themes/learn/layouts/partials/footer.html +++ b/site/themes/learn/layouts/partials/footer.html @@ -13,7 +13,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}} @@ -40,10 +40,10 @@ {{with ($.Scratch.Get "prevPage")}} - + {{end}} {{with ($.Scratch.Get "nextPage")}} - + {{end}} diff --git a/site/themes/learn/layouts/partials/header.html b/site/themes/learn/layouts/partials/header.html index 451b21b7..2f1c569e 100644 --- a/site/themes/learn/layouts/partials/header.html +++ b/site/themes/learn/layouts/partials/header.html @@ -3,7 +3,7 @@ - {{ .Hugo.Generator }} + {{ hugo.Generator }} {{ partial "meta.html" . }} {{ partial "favicon.html" . }} {{ .Title }} :: {{ .Site.Title }} @@ -87,9 +87,9 @@

{{.Title}}

{{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}} {{end}} - {{end}} \ No newline at end of file + {{end}} diff --git a/site/themes/learn/layouts/partials/menu.html b/site/themes/learn/layouts/partials/menu.html index 9780b832..46743732 100644 --- a/site/themes/learn/layouts/partials/menu.html +++ b/site/themes/learn/layouts/partials/menu.html @@ -57,9 +57,9 @@

{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}

{{ if eq $translation.Lang .Lang }} {{ $selected := false }} {{ if eq $pageLang .Lang}} - + {{ else }} - + {{ end }} {{ end }} {{ end }} @@ -97,9 +97,9 @@

{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}

{{with .sect}} {{if .IsSection}} {{safeHTML .Params.head}} -
  • @@ -137,7 +137,7 @@

    {{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}

    • {{else}} {{ if not .Params.Hidden }} -
  • +
  • {{safeHTML .Params.Pre}}{{.Title}}{{safeHTML .Params.Post}} {{ if $showvisitedlinks}}{{end}} diff --git a/site/themes/learn/layouts/shortcodes/children.html b/site/themes/learn/layouts/shortcodes/children.html index fe208398..86a03d95 100644 --- a/site/themes/learn/layouts/shortcodes/children.html +++ b/site/themes/learn/layouts/shortcodes/children.html @@ -40,12 +40,12 @@ {{$numn := add $num $.count }} {{(printf "" $numn)|safeHTML}} -{{ .Title }} +{{ .Title }} {{(printf "" $numn)|safeHTML}} {{else}} {{(printf "<%s>" $.style)|safeHTML}} -{{ .Title }} +{{ .Title }} {{(printf "" $.style)|safeHTML}} {{end}} @@ -93,4 +93,4 @@ {{end}} {{end}} -{{end}} \ No newline at end of file +{{end}} diff --git a/site/themes/learn/layouts/shortcodes/relref.html b/site/themes/learn/layouts/shortcodes/relref.html index 5cb81162..02eae969 100644 --- a/site/themes/learn/layouts/shortcodes/relref.html +++ b/site/themes/learn/layouts/shortcodes/relref.html @@ -1,12 +1,12 @@ {{- if in (.Get 0) "/_index.md" -}} {{- $path := (trim (.Get 0) "_index.md") -}} {{- with .Site.GetPage "section" (trim $path "/") -}} - {{- .URL -}} + {{- .RelPermalink -}} {{- end -}} {{- else -}} {{- with .Site.GetPage "section" (.Get 0) }} - {{- .URL -}} + {{- .RelPermalink -}} {{- else -}} {{- .Get 0 | relref .Page -}} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} From cb12c95a3460860e8ff26d8fff588f6ec94ee1eb Mon Sep 17 00:00:00 2001 From: Nate Finch Date: Thu, 17 Mar 2022 16:02:28 -0400 Subject: [PATCH 2/2] dumb update to trigger netlify --- site/themes/learn/layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/learn/layouts/partials/footer.html b/site/themes/learn/layouts/partials/footer.html index 6ec54f3a..79008ae0 100644 --- a/site/themes/learn/layouts/partials/footer.html +++ b/site/themes/learn/layouts/partials/footer.html @@ -12,7 +12,7 @@ {{ define "menu-nextprev" }} {{$currentNode := .currentnode }} - {{ if ne .menu.Params.hidden true}} + {{ if ne .menu.Params.hidden true }} {{if hasPrefix $currentNode.RelPermalink .menu.RelPermalink }} {{ $currentNode.Scratch.Set "NextPageOK" "OK" }} {{ $currentNode.Scratch.Set "prevPage" ($currentNode.Scratch.Get "prevPageTmp") }}