From f23d4163d8773a3bef21e1f3f272352d6fdb3ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Weber?= Date: Fri, 11 Nov 2022 13:44:23 +0100 Subject: [PATCH] theme: simplify refLangPrettyUglyURL.hugo #380 --- layouts/404.html | 2 +- layouts/partials/_taxonomy.html | 4 ++-- layouts/partials/header.html | 8 ++++---- layouts/partials/logo.html | 2 +- layouts/partials/menu.html | 14 +++++++------- layouts/partials/relLangPrettyUglyURL.hugo | 3 +-- layouts/partials/shortcodes/children.html | 6 +++--- layouts/partials/tags.html | 2 +- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/layouts/404.html b/layouts/404.html index fb12afbad5..6a8371c5cc 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -33,7 +33,7 @@

{{ T "message-404" }}

-

{{ T "Go-to-homepage" }}

+

{{ T "Go-to-homepage" }}

Page not found!

diff --git a/layouts/partials/_taxonomy.html b/layouts/partials/_taxonomy.html index d9b966f34c..7b92e1654c 100644 --- a/layouts/partials/_taxonomy.html +++ b/layouts/partials/_taxonomy.html @@ -13,12 +13,12 @@ {{- end }} {{- end }} {{- if $len }} -
  • {{ .Page.Title }} ({{ $len }})
    • +
  • {{ .Page.Title }} ({{ $len }})
    • {{- end }} {{- else }} {{- range sort .Pages "Title" }} {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }} -
  • {{ .Title }}
    • +
  • {{ .Title }}
    • {{- end }} {{- end }} {{- end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 50e36a0ee4..b1379717b2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -17,7 +17,7 @@ {{- if eq .Rel "canonical" }} {{ (printf $link .Permalink .Rel .MediaType.Type ($title | htmlEscape)) | safeHTML }} {{- else if and (ne .Name "JSON") (ne .Name "SEARCH") }} - {{ (printf $link (partial "relLangPrettyUglyURL.hugo" (dict "page" $page "to" .)) .Rel .MediaType.Type ($title | htmlEscape)) | safeHTML }} + {{ (printf $link (partial "relLangPrettyUglyURL.hugo" (dict "to" .)) .Rel .MediaType.Type ($title | htmlEscape)) | safeHTML }} {{- end }} {{- end }} {{- end }} @@ -49,7 +49,7 @@
    {{- if and $ispublished ($.Scratch.Get "relearnNextPage") }} {{- with ($.Scratch.Get "relearnNextPage") }} - + {{- end }} {{- else }} @@ -58,7 +58,7 @@
    {{- if and $ispublished ($.Scratch.Get "relearnPrevPage") }} {{- with ($.Scratch.Get "relearnPrevPage") }} - + {{- end}} {{- else }} @@ -143,7 +143,7 @@ {{- $remaining = sub $remaining 1 }} {{- if $ispublished }} {{- $depth = add $depth 1 }} -
  • {{ if $remaining }}{{end}}{{ if $to.Title }}{{ $to.Title }}{{ else }}{{ $to.Site.Title }}{{ end }}{{ if $remaining }}{{ end }}{{ if $remaining }} > {{ end }}
    • +
  • {{ if $remaining }}{{end}}{{ if $to.Title }}{{ $to.Title }}{{ else }}{{ $to.Site.Title }}{{ end }}{{ if $remaining }}{{ end }}{{ if $remaining }} > {{ end }}
    • {{- end }} {{- end }} {{- end }} \ No newline at end of file diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html index ddec0a554e..266b4250d8 100644 --- a/layouts/partials/logo.html +++ b/layouts/partials/logo.html @@ -48,7 +48,7 @@ } } - @@ -44,7 +44,7 @@ {{- $shortcut := . }} {{- with $page.Site.GetPage (printf "%s" $shortcut.URL ) }} {{- $to := . }} -
  • {{ $shortcut.Pre }}{{ safeHTML $shortcut.Name }}{{ $shortcut.Post }}
    • +
  • {{ $shortcut.Pre }}{{ safeHTML $shortcut.Name }}{{ $shortcut.Post }}
    • {{- else }}
  • {{ $shortcut.Pre }}{{ safeHTML $shortcut.Name }}{{ $shortcut.Post }}
    • {{- end }} @@ -76,9 +76,9 @@ {{- range $siteLanguages }} {{- if eq $translation.Lang .Lang }} {{- if eq $pageLang .Lang }} - + {{- else }} - + {{- end }} {{- end }} {{- end }} @@ -154,7 +154,7 @@ {{- $currentAlwaysopen := .Params.alwaysopen | default $alwaysopen }} {{- $pageHash := md5 .Page }} {{- $isOpen := or $currentAlwaysopen $isSelf $isAncestor }} -
  • {{ if .Site.Params.collapsibleMenu }}{{ end }} +
  • {{ if .Site.Params.collapsibleMenu }}{{ end }} {{- partial "menu-pre.html" . }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ partial "menu-post.html" . }} {{- if $showvisitedlinks }}{{ end }}
      {{- $defaultAlwaysopen := .Site.Params.alwaysopen | default true }} @@ -168,12 +168,12 @@ {{- end }} {{- end }}
    • {{- else }} -
  • +
  • {{- partial "menu-pre.html" . }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ partial "menu-post.html" . }} {{- if $showvisitedlinks }}{{ end }}
    • {{- end }} {{- else }} -
  • +
  • {{- partial "menu-pre.html" . }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ partial "menu-post.html" . }} {{- if $showvisitedlinks }}{{ end }}
    • {{- end }} diff --git a/layouts/partials/relLangPrettyUglyURL.hugo b/layouts/partials/relLangPrettyUglyURL.hugo index 0b6fd82989..37edd55cfb 100644 --- a/layouts/partials/relLangPrettyUglyURL.hugo +++ b/layouts/partials/relLangPrettyUglyURL.hugo @@ -1,7 +1,6 @@ -{{- $page := .page }} {{- $to := .to }} {{- $link := $to.RelPermalink }} -{{- if and (ne $page.Site.Params.disableExplicitIndexURLs true) (eq (substr $link -1) "/") }} +{{- if and (ne .Site.Params.disableExplicitIndexURLs true) (eq (substr $link -1) "/") }} {{- $link = printf "%sindex.html" $link }} {{- end }} {{- $link }} \ No newline at end of file diff --git a/layouts/partials/shortcodes/children.html b/layouts/partials/shortcodes/children.html index d2de8f50d6..39827010d1 100644 --- a/layouts/partials/shortcodes/children.html +++ b/layouts/partials/shortcodes/children.html @@ -51,7 +51,7 @@ {{- if hasPrefix $.style "h" }} {{- $num := sub ( int (trim $.style "h") ) 1 }} {{- $numn := add $num $.count }} -{{ (printf "" $numn)|safeHTML }}{{ .Title }}{{ (printf "" $numn)|safeHTML }} +{{ (printf "" $numn)|safeHTML }}{{ .Title }}{{ (printf "" $numn)|safeHTML }} {{- if $.description }} {{- if .Description -}}

    {{ .Description }}

    @@ -61,7 +61,7 @@ {{- end }} {{- else if eq $.style "li" }} -{{ (printf "<%s>" $.style)|safeHTML }}{{ .Title }} +{{ (printf "<%s>" $.style)|safeHTML }}{{ .Title }} {{- if $.description }} {{- if .Description -}}

    {{ .Description }}

    @@ -71,7 +71,7 @@ {{- end }} {{- else }} -{{ (printf "<%s>" $.style)|safeHTML }}{{ .Title }}{{ (printf "" $.style)|safeHTML }} +{{ (printf "<%s>" $.style)|safeHTML }}{{ .Title }}{{ (printf "" $.style)|safeHTML }} {{- if $.description }} {{- if .Description -}}

    {{ .Description }}

    diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html index 50179c578a..740a067f54 100644 --- a/layouts/partials/tags.html +++ b/layouts/partials/tags.html @@ -6,7 +6,7 @@ {{- $tag := . }} {{- with $page.Site.GetPage (printf "%s%s" ("/tags/" | relURL ) $tag ) }} {{- $to := . }} - {{ $tag }} + {{ $tag }} {{- end }} {{- end }}