diff options
| author | Thibaud Lepretre <thibaud.lepretre@gmail.com> | 2021-09-08 12:48:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 12:48:16 +0300 |
| commit | 62893d72e7fd085b8b120f41c7a2bf8431950ac7 (patch) | |
| tree | a1b1640c4e9c1edf48f1a7c7ce107b5d553eb87d | |
| parent | 250d19d22044f86efea98fa15af5dd0094b7f69f (diff) | |
| parent | 210bf5bda7c65e67c9622ff2203b94ab15620061 (diff) | |
Merge pull request #333 from sascha-wolf/bugfix/properly-handle-relative-urls
Fix: Properly handle relative URLs
| -rw-r--r-- | layouts/_default/summary.html | 8 | ||||
| -rw-r--r-- | layouts/partials/cover.html | 2 | ||||
| -rw-r--r-- | layouts/partials/menu.html | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 1981b67..679f507 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -10,8 +10,12 @@ {{ end }} {{ end }} {{ else }} - {{ if .Params.coverimage }} - {{ .Scratch.Set "thumbnailImage" (.Params.coverimage | absURL) }} + {{ if .Params.coverImage }} + {{ if (findRE "^/" .Params.coverImage 1) }} + {{ .Scratch.Set "thumbnailImage" (.Params.coverImage | absURL) }} + {{ else }} + {{ .Scratch.Set "thumbnailImage" (path.Join .RelPermalink .Params.coverImage) }} + {{ end }} {{ end }} {{ end }} {{ end }} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index 8f808aa..24d16d7 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -3,7 +3,7 @@ <div id="cover" style="background-image:url('{{ . | absURL }}');"></div> {{ else }} {{ if (fileExists (printf "static/images/%s" .)) }} - {{ $cover := (printf "images/%s" .) }} + {{ $cover := (printf "/images/%s" .) }} <div id="cover" style="background-image:url('{{ $cover | absURL }}');"></div> {{ else }} <div id="cover" style="background-image:url('{{ . | absURL }}');"></div> diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 2ba9797..36fca1f 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -1,6 +1,6 @@ {{ range .menu }} <li class="sidebar-button"> - {{ if and (or (in .URL "://") (in .URL "mailto:") (in .URL "tel:") (in .URL "callto:") (in .URL "skype:")) (not (in .URL (printf "%s" $.root.Site.BaseURL))) }} + {{ if and (or (in .URL "://") (in .URL "mailto:") (in .URL "tel:") (in .URL "callto:") (in .URL "skype:")) (not (and $.root.Site.BaseURL (in .URL (printf "%s" $.root.Site.BaseURL)))) }} <a class="sidebar-button-link {{ if eq .Identifier "search" }}open-algolia-search{{ end }}" href="{{ .URL | safeURL }}" target="_blank" rel="noopener" title="{{ .Name }}"> {{ else }} <a class="sidebar-button-link {{ if eq .Identifier "search" }}open-algolia-search{{ end }}" href="{{ .URL | relLangURL }}" title="{{ .Name }}"> |