diff options
author | Jan Steinke <jan.steinke@gmail.com> | 2021-07-14 16:29:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-14 16:29:08 +0300 |
commit | e3f7fbe39d7b24d43e80a3c95aa3d940731ac535 (patch) | |
tree | afcc4248a91e87ffac1f514aee3c850401d3ee8e | |
parent | 6a8f9511aab13ae1096941ae3448a5f260c5ea6e (diff) |
-rwxr-xr-x | layouts/index.html | 4 | ||||
-rw-r--r-- | layouts/partials/func/GetFeaturedImage.html | 10 | ||||
-rw-r--r-- | layouts/partials/social-share.html | 2 | ||||
-rw-r--r-- | layouts/partials/summary-with-image.html | 6 | ||||
-rw-r--r-- | layouts/partials/summary.html | 2 | ||||
-rw-r--r-- | layouts/post/summary-with-image.html | 2 | ||||
-rw-r--r-- | layouts/post/summary.html | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/layouts/index.html b/layouts/index.html index cc06ad4..bb3c5a5 100755 --- a/layouts/index.html +++ b/layouts/index.html @@ -38,7 +38,7 @@ {{/* Now, range through the next four after the initial $n_posts items. Nest the requirements, "after" then "first" on the outside */}} {{ range (first 4 (after $n_posts $section)) }} <h2 class="f5 fw4 mb4 dib mr3"> - <a href="{{ .Permalink }}" class="link black dim"> + <a href="{{ .RelPermalink }}" class="link black dim"> {{ .Title }} </a> </h2> @@ -46,7 +46,7 @@ {{/* As above, Use $section_name to get the section title, and URL. Use "with" to only show it if it exists */}} {{ with .Site.GetPage "section" $section_name }} - <a href="{{ .Permalink }}" class="link db f6 pa2 br3 bg-mid-gray white dim w4 tc">{{ i18n "allTitle" . }}</a> + <a href="{{ .RelPermalink }}" class="link db f6 pa2 br3 bg-mid-gray white dim w4 tc">{{ i18n "allTitle" . }}</a> {{ end }} </section> {{ end }} diff --git a/layouts/partials/func/GetFeaturedImage.html b/layouts/partials/func/GetFeaturedImage.html index c00b086..a6219c7 100644 --- a/layouts/partials/func/GetFeaturedImage.html +++ b/layouts/partials/func/GetFeaturedImage.html @@ -1,8 +1,8 @@ {{/*
GetFeaturedImage
- This partial gets the url for featured image for a given page.
-
+ This partial gets the url for featured image for a given page.
+
If a featured_image was set in the page's front matter, then that will be used.
If not set, this will search page resources to find an image that contains the word
@@ -11,7 +11,7 @@ If no featured_image was set, and there's no "cover" image in page resources, then
this partial returns an empty string (which evaluates to false).
- @return Permalink to featured image, or an empty string if not found.
+ @return RelPermalink to featured image, or an empty string if not found.
*/}}
@@ -26,10 +26,10 @@ {{ else }}
{{ $img := (.Resources.ByType "image").GetMatch "*cover*" }}
{{ with $img }}
- {{ $linkToCover = .Permalink }}
+ {{ $linkToCover = .RelPermalink }}
{{ end }}
{{ end }}
{{/* return either a permalink, or an empty string. Note that partials can only have a single
return statement, so this needs to be at the end of the partial (and not in the if block) */}}
-{{ return $linkToCover }}
\ No newline at end of file +{{ return $linkToCover }}
diff --git a/layouts/partials/social-share.html b/layouts/partials/social-share.html index eb313c0..4ce1893 100644 --- a/layouts/partials/social-share.html +++ b/layouts/partials/social-share.html @@ -1,5 +1,5 @@ {{ $title := .Title }} -{{ $url := printf "%s" .Permalink | absLangURL }} +{{ $url := printf "%s" .RelPermalink | absLangURL }} {{ $icon_size := "32px" }} {{ if not .Params.disable_share }} diff --git a/layouts/partials/summary-with-image.html b/layouts/partials/summary-with-image.html index 702a305..94666db 100644 --- a/layouts/partials/summary-with-image.html +++ b/layouts/partials/summary-with-image.html @@ -6,21 +6,21 @@ {{/* Trimming the slash and adding absURL make sure the image works no matter where our site lives */}} {{ $featured_image := (trim $featured_image "/") | absURL }} <div class="pr3-ns mb4 mb0-ns w-100 w-40-ns"> - <a href="{{.Permalink}}" class="db grow"> + <a href="{{.RelPermalink}}" class="db grow"> <img src="{{ $featured_image }}" class="img" alt="image from {{ .Title }}"> </a> </div> {{ end }} <div class="blah w-100{{ if $featured_image }} w-60-ns pl3-ns{{ end }}"> <h1 class="f3 fw1 athelas mt0 lh-title"> - <a href="{{.Permalink}}" class="color-inherit dim link"> + <a href="{{.RelPermalink}}" class="color-inherit dim link"> {{ .Title }} </a> </h1> <div class="f6 f5-l lh-copy nested-copy-line-height nested-links"> {{ .Summary }} </div> - <a href="{{.Permalink}}" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">{{ $.Param "read_more_copy" | default (i18n "readMore") }}</a> + <a href="{{.RelPermalink}}" class="ba b--moon-gray bg-light-gray br2 color-inherit dib f7 hover-bg-moon-gray link mt2 ph2 pv1">{{ $.Param "read_more_copy" | default (i18n "readMore") }}</a> {{/* TODO: add author <p class="f6 lh-copy mv0">By {{ .Author }}</p> */}} </div> diff --git a/layouts/partials/summary.html b/layouts/partials/summary.html index 65b3eaa..d9cd9c6 100644 --- a/layouts/partials/summary.html +++ b/layouts/partials/summary.html @@ -2,7 +2,7 @@ <div class="bg-white mb3 pa4 gray overflow-hidden"> <span class="f6 db">{{ humanize .Section }}</span> <h1 class="f3 near-black"> - <a href="{{ .Permalink }}" class="link black dim"> + <a href="{{ .RelPermalink }}" class="link black dim"> {{ .Title }} </a> </h1> diff --git a/layouts/post/summary-with-image.html b/layouts/post/summary-with-image.html index 3afac67..fd02963 100644 --- a/layouts/post/summary-with-image.html +++ b/layouts/post/summary-with-image.html @@ -1,5 +1,5 @@ <article class="bb b--black-10"> - <a class="db pv4 ph3 ph0-l no-underline dark-gray dim" href="{{ .Permalink }}"> + <a class="db pv4 ph3 ph0-l no-underline dark-gray dim" href="{{ .RelPermalink }}"> <div class="flex flex-column flex-row-ns"> {{ $featured_image := partial "func/GetFeaturedImage.html" . }} {{ if $featured_image }} diff --git a/layouts/post/summary.html b/layouts/post/summary.html index 29a6d35..b2779cf 100644 --- a/layouts/post/summary.html +++ b/layouts/post/summary.html @@ -5,7 +5,7 @@ </div> {{ end }} <h1 class="f3 near-black"> - <a href="{{ .Permalink }}" class="link black dim"> + <a href="{{ .RelPermalink }}" class="link black dim"> {{ .Title }} </a> </h1> |