diff options
author | it-gro <grossnik@tuvok> | 2018-08-26 10:40:28 +0300 |
---|---|---|
committer | it-gro <grossnik@tuvok> | 2018-08-26 10:40:28 +0300 |
commit | f65df259acb738ddf299cedb5f93ce1bcb7610e5 (patch) | |
tree | 074ec0a56594943bebd3407b94edd34dbd601434 | |
parent | b5bf7bf588d32648dd70824a48c1cd0da3b82a89 (diff) |
Fix resource RelPermalink (for HUGO_CANONIFYURLS true-or-false)
-rw-r--r-- | layouts/partials/resource.image.html | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/layouts/partials/resource.image.html b/layouts/partials/resource.image.html index 5f0079b..bb7677d 100644 --- a/layouts/partials/resource.image.html +++ b/layouts/partials/resource.image.html @@ -69,24 +69,22 @@ theResImgOpt : {{- $theResImgOpt }} <br/> {{- if $myImage }} {{- $myBaseUrlSubDirs := replaceRE `^(http(s)?)?://(.*?)/` `` $thePage.Site.BaseURL }} {{- if not (findRE (printf "^/%s" $myBaseUrlSubDirs) $myImage.RelPermalink) }} - {{- $thePage.Scratch.Set `myImagePermalinkWorkaround` (printf "%s/%s" $myBaseUrlSubDirs $myImage.RelPermalink ) }} + {{- $thePage.Scratch.Set `myImagePermalinkWorkaround` (replaceRE `^/` `` $myImage.RelPermalink ) }} {{- end }} {{- $myImagePermalinkWorkaround := ($thePage.Scratch.Get `myImagePermalinkWorkaround`) | default $myImage.RelPermalink }} <img class="{{ $theImgClass }}" style="{{ $theImgStyle | safeCSS }}" - src='{{ $myImagePermalinkWorkaround }}' + src='{{ $myImagePermalinkWorkaround | absURL }}' alt='{{ $myImage.RelPermalink }}' - data-dbg-Site.BaseURL='{{$thePage.Site.BaseURL }}' - data-dbg-myBaseUrlSubDirs='{{$myBaseUrlSubDirs }}' - data-dbg-myImagePermalinkWorkaround='{{$myImagePermalinkWorkaround }}' - data-dbg-myImagePermalinkWorkaround-absURL='{{$myImagePermalinkWorkaround | absURL }}' - data-dbg-myResource-Permalink='{{$myResource.Permalink }}' - data-dbg-myImage-Permalink='{{$myImage.Permalink }}' - data-dbg-myImage-Permalink-absURL='{{$myImage.Permalink | absURL }}' - data-dbg-myImage-Permalink-relURL='{{$myImage.Permalink | relURL }}' - data-dbg-myResource-RelPermalink='{{$myResource.RelPermalink }}' - data-dbg-myImage-RelPermalink='{{$myImage.RelPermalink }}' - data-dbg-myImage-RelPermalink-absURL='{{$myImage.RelPermalink | absURL }}' + data-dbg-Site.BaseURL='{{$thePage.Site.BaseURL }}' + data-dbg-myBaseUrlSubDirs='{{$myBaseUrlSubDirs }}' + data-dbg-myImagePermalinkWorkaround='{{$myImagePermalinkWorkaround }}' + data-dbg-myImagePermalinkWorkaround-absURL='{{$myImagePermalinkWorkaround | absURL }}' + data-dbg-myImage-RelPermalink='{{$myImage.RelPermalink }}' + data-dbg-myImage-RelPermalink-absURL='{{$myImage.RelPermalink | absURL }}' + data-dbg-myResource-Permalink='{{$myResource.Permalink }}' + data-dbg-myImage-Permalink='{{$myImage.Permalink }}' + data-dbg-myResource-RelPermalink='{{$myResource.RelPermalink }}' > {{- end }} |