From 1dcf58286d8c81622feeaae4dd91f74b500bff76 Mon Sep 17 00:00:00 2001 From: Christian Wolf <github@christianwolf.email> Date: Sun, 9 Mar 2025 11:26:56 +0100 Subject: [PATCH] Make all links non-relative --- hugo.yaml | 2 +- themes/tsc_vfl/layouts/_default/announcements.html | 2 +- themes/tsc_vfl/layouts/_default/archive.html | 2 +- themes/tsc_vfl/layouts/_default/home.html | 4 ++-- themes/tsc_vfl/layouts/_default/list.html | 9 --------- themes/tsc_vfl/layouts/_default/turniermeldungen.html | 2 +- themes/tsc_vfl/layouts/partials/page/banner-images.html | 4 ++-- themes/tsc_vfl/layouts/partials/page/footer.html | 6 +++--- themes/tsc_vfl/layouts/partials/page/head.html | 6 +++--- .../layouts/partials/page/left-announcements.html | 2 +- themes/tsc_vfl/layouts/shortcodes/tsc/link-offers.md | 4 ++-- .../layouts/shortcodes/tsc/news/gallery-image.html | 6 +++--- .../layouts/shortcodes/tsc/news/inline-float.html | 2 +- .../layouts/shortcodes/tsc/news/internal-video.html | 2 +- themes/tsc_vfl/layouts/shortcodes/tsc/press/dld.html | 2 +- themes/tsc_vfl/layouts/shortcodes/tsc/press/img.html | 2 +- themes/tsc_vfl/layouts/shortcodes/tsc/rooms/image.html | 2 +- themes/tsc_vfl/layouts/shortcodes/tsc/trainer.html | 4 ++-- themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html | 4 ++-- 19 files changed, 29 insertions(+), 38 deletions(-) diff --git a/hugo.yaml b/hugo.yaml index 0344833c..e861ce0f 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -3,7 +3,7 @@ languageCode: de defaultContentLanguage: de title: TSC im VfL Sindelfingen e.V. theme: tsc_vfl -relativeUrls: true +relativeUrls: false sitemap: changeFreq: daily diff --git a/themes/tsc_vfl/layouts/_default/announcements.html b/themes/tsc_vfl/layouts/_default/announcements.html index 10d14504..3ae5c2a5 100644 --- a/themes/tsc_vfl/layouts/_default/announcements.html +++ b/themes/tsc_vfl/layouts/_default/announcements.html @@ -6,7 +6,7 @@ <div class="announcement-list"> {{ $announcements := partial "get-announcement-list" . }} {{ range $announcements }} - {{ $urlBlogEntry := .RelPermalink}} + {{ $urlBlogEntry := .Permalink}} <div class="entry"> <span class="time"> {{ (time.AsTime .Params.announcement.date).Format "02.01.2006" }} diff --git a/themes/tsc_vfl/layouts/_default/archive.html b/themes/tsc_vfl/layouts/_default/archive.html index a6b4ecf0..0c21f79b 100644 --- a/themes/tsc_vfl/layouts/_default/archive.html +++ b/themes/tsc_vfl/layouts/_default/archive.html @@ -15,7 +15,7 @@ <div class="archive-year-list"> <div class="date">{{ .Date.Format "02.01.2006" }}</div> <div class="title"> - <a href="{{ .RelPermalink}}"> + <a href="{{ .Permalink}}"> {{ .Title }} </a> </div> diff --git a/themes/tsc_vfl/layouts/_default/home.html b/themes/tsc_vfl/layouts/_default/home.html index 0cea6e02..7a6377d9 100644 --- a/themes/tsc_vfl/layouts/_default/home.html +++ b/themes/tsc_vfl/layouts/_default/home.html @@ -4,7 +4,7 @@ </a> <div class="news-blog"> {{ range (.Paginate (first 30 ( where .Site.RegularPages "Section" "==" "news")) 10 ).Pages }} - {{ $urlBlogEntry := .RelPermalink}} + {{ $urlBlogEntry := .Permalink}} <div class="blog-entry"> <div class="header"> {{ .Date.Format "02.01.2006" }} @@ -21,7 +21,7 @@ {{/* {{ with ($resImage).Fit "290x190 webp" }} */}} {{ with $resImage }} <a href="{{ $urlBlogEntry }}"> - <img src="{{ (.Fit "290x190 webp").RelPermalink }}"> + <img src="{{ (.Fit "290x190 webp").Permalink }}"> </a> {{ end }} {{ end }} diff --git a/themes/tsc_vfl/layouts/_default/list.html b/themes/tsc_vfl/layouts/_default/list.html index b0eababd..3c5215ca 100644 --- a/themes/tsc_vfl/layouts/_default/list.html +++ b/themes/tsc_vfl/layouts/_default/list.html @@ -3,14 +3,5 @@ <h1>{{ .Title }}</h1> </a> {{ .Content }} - <!--{{ range .Pages.ByPublishDate.Reverse }} - <p> - <h3><a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a></h3> - {{ partial "metadata.html" . }} - <a class="summary" href="{{ .RelPermalink }}"> - <p>{{ .Summary }}</p> - </a> - </p> - {{ end }}--> {{ partial "totop" }} {{ end }} diff --git a/themes/tsc_vfl/layouts/_default/turniermeldungen.html b/themes/tsc_vfl/layouts/_default/turniermeldungen.html index a329db97..0f87d322 100644 --- a/themes/tsc_vfl/layouts/_default/turniermeldungen.html +++ b/themes/tsc_vfl/layouts/_default/turniermeldungen.html @@ -17,7 +17,7 @@ <div class="day"> <div class="date">{{ .Key }}</div> {{ range .Pages }} - <div class="participation"><a href="{{ .RelPermalink }}">{{ .Params.ort }} ({{ .Params.partner }} / {{ .Params.partnerin }})</a></div> + <div class="participation"><a href="{{ .Permalink }}">{{ .Params.ort }} ({{ .Params.partner }} / {{ .Params.partnerin }})</a></div> {{ end }} </div> {{ end }} diff --git a/themes/tsc_vfl/layouts/partials/page/banner-images.html b/themes/tsc_vfl/layouts/partials/page/banner-images.html index b37ee0b9..64d76af1 100644 --- a/themes/tsc_vfl/layouts/partials/page/banner-images.html +++ b/themes/tsc_vfl/layouts/partials/page/banner-images.html @@ -3,10 +3,10 @@ {{- range $images }} {{- $img := .Fit "1220x340 webp" -}} {{ if $first }} - <img src="{{ $img.RelPermalink }}" class="placeholder"> + <img src="{{ $img.Permalink }}" class="placeholder"> {{ $first = false }} {{ end }} - <img src="{{ $img.RelPermalink }}" class="hidden slider-img"> + <img src="{{ $img.Permalink }}" class="hidden slider-img"> {{ end -}} <div class="dots"> {{- $count := (len $images) -}} diff --git a/themes/tsc_vfl/layouts/partials/page/footer.html b/themes/tsc_vfl/layouts/partials/page/footer.html index 2eb1ba1c..1282a2c8 100644 --- a/themes/tsc_vfl/layouts/partials/page/footer.html +++ b/themes/tsc_vfl/layouts/partials/page/footer.html @@ -3,9 +3,9 @@ <div class="last-entry meta-menu"> <ul> <li><a href="https://www.facebook.com/pages/Tanzsportclub-im-VfL-Sindelfingen/140842382700982" class="facebook" target="_blank"></a></li> - <li><a href="{{ relref . "page/club/impressum" }}">Impressum & Datenschutz</a></li> - <li><a href="{{ relref . "page/info/sitemap" }}">Sitemap</a></li> - <li><a href="{{ relref . "page/info" }}">Kontakt</a></li> + <li><a href="{{ ref . "page/club/impressum" }}">Impressum & Datenschutz</a></li> + <li><a href="{{ ref . "page/info/sitemap" }}">Sitemap</a></li> + <li><a href="{{ ref . "page/info" }}">Kontakt</a></li> </ul> </div> </div> diff --git a/themes/tsc_vfl/layouts/partials/page/head.html b/themes/tsc_vfl/layouts/partials/page/head.html index c0a3120b..7136e095 100644 --- a/themes/tsc_vfl/layouts/partials/page/head.html +++ b/themes/tsc_vfl/layouts/partials/page/head.html @@ -14,7 +14,7 @@ {{ $options := (dict "targetPath" "main.css" "outputStyle" "compressed" "enableSourceMap" (not hugo.IsProduction) "transpiler" "dartsass") }} {{ $scss := resources.Get "css/main.scss" | css.Sass $options }} {{ if hugo.IsProduction }}{{ $scss = $scss | minify | fingerprint }}{{ end }} - <link rel="stylesheet" type="text/css" href="{{ $scss.RelPermalink }}" /> + <link rel="stylesheet" type="text/css" href="{{ $scss.Permalink }}" /> {{ $title := print .Site.Title " | " .Title }} {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} <title>{{ $title }}</title> @@ -22,8 +22,8 @@ <script defer src="{{ relURL "js/jquery-3.6.3.min.js" }}"></script> {{ $galleryJs := resources.Get "js/gallery.js" }} {{ if hugo.IsProduction }}{{ $galleryJs = $galleryJs | minify | fingerprint }}{{ end }} - <script defer src="{{ $galleryJs.RelPermalink }}"></script> + <script defer src="{{ $galleryJs.Permalink }}"></script> {{ $mailsJs := resources.Get "js/mails.js" }} {{ if hugo.IsProduction }}{{ $mailsJs = $mailsJs | minify | fingerprint }}{{ end }} - <script defer src="{{ $mailsJs.RelPermalink }}"></script> + <script defer src="{{ $mailsJs.Permalink }}"></script> </head> diff --git a/themes/tsc_vfl/layouts/partials/page/left-announcements.html b/themes/tsc_vfl/layouts/partials/page/left-announcements.html index ab26d5ae..64a5d87e 100644 --- a/themes/tsc_vfl/layouts/partials/page/left-announcements.html +++ b/themes/tsc_vfl/layouts/partials/page/left-announcements.html @@ -1,7 +1,7 @@ {{ $announcements := partial "get-announcement-list" . }} <div class="announcements"> {{ range $announcements }} - {{ $urlBlogEntry := .RelPermalink}} + {{ $urlBlogEntry := .Permalink}} <div class="entry"> <div class="time"> {{ (time.AsTime .Params.announcement.date).Format "02.01.2006" }} diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/link-offers.md b/themes/tsc_vfl/layouts/shortcodes/tsc/link-offers.md index 456b2ef0..a107e1fb 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/link-offers.md +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/link-offers.md @@ -1,7 +1,7 @@ ## Trainingsorte -siehe [Standorte]({{ relref $.Page "raeume" }}) +siehe [Standorte]({{ ref $.Page "raeume" }}) ## Beitrag -siehe [Mitgliedschaft]({{ relref $.Page "beitrag" }}) +siehe [Mitgliedschaft]({{ ref $.Page "beitrag" }}) diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/news/gallery-image.html b/themes/tsc_vfl/layouts/shortcodes/tsc/news/gallery-image.html index 43676572..6cdaa047 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/news/gallery-image.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/news/gallery-image.html @@ -17,12 +17,12 @@ {{ with $.Get "href" }} href="{{ . }}" {{ else }} - data-url="{{ $imgFitted.RelPermalink }}" + data-url="{{ $imgFitted.Permalink }}" {{ end }} > <img {{ with $.Get "alt"}}alt="{{.}}"{{ end }} - src="{{ $img.RelPermalink }}" + src="{{ $img.Permalink }}" > </a> {{ with $.Get "credits" }} @@ -34,4 +34,4 @@ </figure> {{ else }} {{ warnf "No image found for page %s: %s" .Page.RelPermalink (.Get "src") }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/news/inline-float.html b/themes/tsc_vfl/layouts/shortcodes/tsc/news/inline-float.html index 688e2fbf..a02d1c7e 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/news/inline-float.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/news/inline-float.html @@ -9,7 +9,7 @@ {{ if not $resource }} {{ $resource = resources.GetMatch $filename }} {{ end }} - src="{{ $resource.RelPermalink }}" + src="{{ $resource.Permalink }}" > {{ with .Get "href" }} </a> diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/news/internal-video.html b/themes/tsc_vfl/layouts/shortcodes/tsc/news/internal-video.html index c908229f..38d6315a 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/news/internal-video.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/news/internal-video.html @@ -6,6 +6,6 @@ class="internal-video" > <source {{ with .Get "type" }}type="{{ . }}"{{ end }} - src="{{ (.Page.Resources.GetMatch (.Get "src")).RelPermalink }}" + src="{{ (.Page.Resources.GetMatch (.Get "src")).Permalink }}" > </video> diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/press/dld.html b/themes/tsc_vfl/layouts/shortcodes/tsc/press/dld.html index 844489dc..1573f4c1 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/press/dld.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/press/dld.html @@ -2,6 +2,6 @@ {{ .Get "url"}}{{ page.Resources}} --> {{ $res := .Page.Resources.GetMatch (.Get "url") }} -<a target="_blank" class="download press-download" href="{{ $res.RelPermalink }}"> +<a target="_blank" class="download press-download" href="{{ $res.Permalink }}"> {{ .Inner }} </a> diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/press/img.html b/themes/tsc_vfl/layouts/shortcodes/tsc/press/img.html index 99726839..74a7aa6d 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/press/img.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/press/img.html @@ -7,5 +7,5 @@ --> <div class="press-img"> {{- $res := .Page.Resources.GetMatch (.Get "src") -}} - <img{{ with .Get "alt" }} alt="{{ . }}"{{ end }} src="{{ $res.RelPermalink }}"> + <img{{ with .Get "alt" }} alt="{{ . }}"{{ end }} src="{{ $res.Permalink }}"> </div> diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/rooms/image.html b/themes/tsc_vfl/layouts/shortcodes/tsc/rooms/image.html index fc22a6b2..a4e73f9b 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/rooms/image.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/rooms/image.html @@ -1,4 +1,4 @@ <div class="image"> {{ $resource := .Page.Resources.GetMatch (.Get "image") }} - <img src="{{ $resource.RelPermalink}} "> + <img src="{{ $resource.Permalink}} "> </div> diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/trainer.html b/themes/tsc_vfl/layouts/shortcodes/tsc/trainer.html index 49fe74e5..0fd6e336 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/trainer.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/trainer.html @@ -3,10 +3,10 @@ {{ $imageName := .Params.image }} {{ $image := "" }} {{ with .Resources.GetMatch $imageName}} - {{ $image = (.Fit "60x80 webp").RelPermalink }} + {{ $image = (.Fit "60x80 webp").Permalink }} {{ else }} {{ with .Resources.ByType "image" }} - {{ $image = ((index . 0).Fit "60x80 webp").RelPermalink }} + {{ $image = ((index . 0).Fit "60x80 webp").Permalink }} {{ warnf "Image for %s is not correclty found. Falling back to first found image in page resources." ($.Get "name") }} {{ else }} {{ with .Params.sex }} diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html b/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html index 7115eeca..a5cd9709 100644 --- a/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html +++ b/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html @@ -3,11 +3,11 @@ {{ $imageName := .Params.image }} {{ $image := "" }} {{ with (.Resources.GetMatch $imageName) }} - {{ $image = (.Fit "60x80 webp").RelPermalink }} + {{ $image = (.Fit "60x80 webp").Permalink }} {{ else }} {{ warnf "Image for %s is not correclty found. Falling back to default." ($.Get "name") }} {{ with (.Resources.ByType "image") }} - {{ $image = ((index . 0).Fit "60x80 webp").RelPermalink }} + {{ $image = ((index . 0).Fit "60x80 webp").Permalink }} {{ else }} {{ with .Params.sex }} {{ if eq . "male" }}