diff --git a/exampleSite/static/img/boards.jpg b/exampleSite/static/media/boards.jpg similarity index 100% rename from exampleSite/static/img/boards.jpg rename to exampleSite/static/media/boards.jpg diff --git a/exampleSite/static/img/headers/bubbles-wide.jpg b/exampleSite/static/media/headers/bubbles-wide.jpg similarity index 100% rename from exampleSite/static/img/headers/bubbles-wide.jpg rename to exampleSite/static/media/headers/bubbles-wide.jpg diff --git a/exampleSite/static/img/hero-academic.png b/exampleSite/static/media/hero-academic.png similarity index 100% rename from exampleSite/static/img/hero-academic.png rename to exampleSite/static/media/hero-academic.png diff --git a/layouts/partials/jsonld/business.html b/layouts/partials/jsonld/business.html index c0aa57ef..5064faae 100644 --- a/layouts/partials/jsonld/business.html +++ b/layouts/partials/jsonld/business.html @@ -5,7 +5,7 @@ "@id": {{site.BaseURL}}, "name": {{site.Params.org_name | default site.Title}}, "logo": {{ partial "functions/get_logo_url" . }}, - {{with site.Params.sharing_image}}"image": {{printf "img/%s" . | absURL}},{{end}} + {{with site.Params.sharing_image}}"image": {{printf "%s/%s" ($.Scratch.Get "media_dir") . | absURL}},{{end}} {{ if (eq site.Params.site_type "LocalBusiness") | and site.Params.coordinates }} "geo": { "@type": "GeoCoordinates", diff --git a/layouts/partials/page_header.html b/layouts/partials/page_header.html index e0664be6..1f6747a0 100644 --- a/layouts/partials/page_header.html +++ b/layouts/partials/page_header.html @@ -21,7 +21,8 @@ {{ if $img_src.Scheme }} {{ else }} - + {{ $media_dir := $.Scratch.Get "media_dir" }} + {{ end }} {{ with .Params.header.caption }}{{ . | markdownify | emojify }}{{ end }} diff --git a/layouts/partials/site_head.html b/layouts/partials/site_head.html index 3bb8725b..aa3cf334 100644 --- a/layouts/partials/site_head.html +++ b/layouts/partials/site_head.html @@ -7,6 +7,9 @@ {{ $scr := .Scratch }} + {{ $media_dir := site.Params.media_dir | default "media" }} + {{ $scr.Set "media_dir" $media_dir }} + {{/* Attempt to load superuser. */}} {{ $superuser_name := "" }} {{ $superuser_username := "" }} @@ -173,9 +176,9 @@ {{ else if $featured_image }} {{ $og_image = $featured_image.Permalink }} {{ else if .Params.header.image }} - {{ $og_image = printf "img/%s" .Params.header.image | absURL }} + {{ $og_image = printf "%s/%s" $media_dir .Params.header.image | absURL }} {{ else if site.Params.sharing_image }} - {{ $og_image = printf "img/%s" site.Params.sharing_image | absURL }} + {{ $og_image = printf "%s/%s" $media_dir site.Params.sharing_image | absURL }} {{ else if $has_logo }} {{ $og_image = (partial "functions/get_logo" (dict "constraint" "fit" "size" 300)).Permalink }} {{ $twitter_card = "summary" }} diff --git a/layouts/partials/widget_page.html b/layouts/partials/widget_page.html index 472675b5..4584b3ca 100644 --- a/layouts/partials/widget_page.html +++ b/layouts/partials/widget_page.html @@ -43,7 +43,8 @@ {{ $darken = printf "linear-gradient(rgba(0, 0, 0, %s), rgba(0, 0, 0, %s))," (string $bg.image_darken) (string $bg.image_darken) }} {{ end }} {{/* See Hugo note on linking assets in styles: https://github.com/gohugoio/hugoThemes#common-permalink-issues */}} - {{ $style = printf "%sbackground-image: %s url('%s');" $style $darken (printf "img/%s" $bg.image | absURL) }} + {{ $media_dir := $.Scratch.Get "media_dir" }} + {{ $style = printf "%sbackground-image: %s url('%s');" $style $darken (printf "%s/%s" $media_dir $bg.image | absURL) }} {{ with $bg.image_size }} {{/* Allow sizes: actual, cover, and contain. */}} {{ $style = printf "%sbackground-size: %s;" $style (replace . "actual" "auto") }} diff --git a/layouts/partials/widgets/hero.html b/layouts/partials/widgets/hero.html index 3f60f18b..b12549fa 100644 --- a/layouts/partials/widgets/hero.html +++ b/layouts/partials/widgets/hero.html @@ -57,9 +57,10 @@ {{/* Hero image */}} {{ if $page.Params.hero_media }} + {{ $media_dir := $.Scratch.Get "media_dir" }}
- +
{{ end }} diff --git a/layouts/partials/widgets/slider.html b/layouts/partials/widgets/slider.html index 5da34b14..f8c03e09 100644 --- a/layouts/partials/widgets/slider.html +++ b/layouts/partials/widgets/slider.html @@ -17,9 +17,10 @@ background-color: {{ $item.overlay_color | default "transparent" }}; {{ end }} {{ if $item.overlay_img }} + {{ $media_dir := $.Scratch.Get "media_dir" }} background-image: {{ if $item.overlay_filter }}linear-gradient(rgba(0, 0, 0, {{ $item.overlay_filter }}), rgba(0, 0, 0, {{ $item.overlay_filter }})), {{ end }} - url('{{ printf "img/%s" $item.overlay_img | absURL }}'); + url('{{ printf "%s/%s" $media_dir $item.overlay_img | absURL }}'); {{ end }} ;">
diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html index 7a1ddf1c..232d76e5 100644 --- a/layouts/shortcodes/audio.html +++ b/layouts/shortcodes/audio.html @@ -3,8 +3,9 @@ {{ $path := "" }} {{ $root_dir := "" }} +{{ $media_dir := $.Scratch.Get "media_dir" }} {{ if .Get "library" }} - {{ $path = "media/" }} + {{ $path = printf "%s/" $media_dir }} {{ $root_dir = "static/" }} {{ end }} diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html index 7f3dac76..6e819549 100644 --- a/layouts/shortcodes/figure.html +++ b/layouts/shortcodes/figure.html @@ -1,12 +1,13 @@ -{{/* Enable image to be loaded from local page dir or media library at `static/img/`. */}} +{{/* Enable image to be loaded from local page dir or media library at `static/media/`. */}} +{{ $media_dir := $.Scratch.Get "media_dir" }} {{ $asset := (.Page.Resources.ByType "image").GetMatch (.Get "src") }} {{ $image_src := (.Get "src") }} {{ if $asset }} {{ $asset2 := $asset.Fit "2000x2000" }} {{ $image_src = $asset2.RelPermalink }} {{ else if .Get "library" }} - {{ $image_src = printf "img/%s" $image_src | relURL }} + {{ $image_src = printf "%s/%s" $media_dir $image_src | relURL }} {{ end }} {{/* Disallow user from opening image in the lightbox? */}} diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html index 8eb74d70..37a61502 100644 --- a/layouts/shortcodes/gallery.html +++ b/layouts/shortcodes/gallery.html @@ -34,7 +34,7 @@ {{end}} {{else}} - {{/* Load gallery images from the `static/img/` media library or internet */}} + {{/* Load gallery images from the `static/media/` media library or internet */}} {{ if $.Page.Params.gallery_item }} {{ range (where $.Page.Params.gallery_item "album" $album) }} @@ -42,7 +42,8 @@ {{ $.Scratch.Set "src" .image }} {{ if gt (len .image) 4 }} {{ if ne "http" (slicestr .image 0 4) }} - {{ $.Scratch.Set "src" (printf "img/%s" .image | relURL) }} + {{ $media_dir := $.Scratch.Get "media_dir" }} + {{ $.Scratch.Set "src" (printf "%s/%s" $media_dir .image | relURL) }} {{ end }} {{ end }} {{/* Don't lazy load image as cannot init image size from non-Hugo asset, resulting in inaccurate anchor scrolling & active link highlighting. */}} diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html index f6019f1c..e34edc7f 100644 --- a/layouts/shortcodes/video.html +++ b/layouts/shortcodes/video.html @@ -1,8 +1,10 @@ -{{/* Enable video to be loaded from local page dir or media library at `static/img/`. */}} +{{/* Enable video to be loaded from local page dir or media library at `static/media/`. */}} + {{ $path := "" }} {{ $root_dir := "" }} +{{ $media_dir := $.Scratch.Get "media_dir" }} {{ if .Get "library" }} - {{ $path = "img/" }} + {{ $path = printf "%s/" $media_dir }} {{ $root_dir = "static/" }} {{ end }} diff --git a/layouts/slides/baseof.html b/layouts/slides/baseof.html index 98c8fa4c..a30aea7f 100644 --- a/layouts/slides/baseof.html +++ b/layouts/slides/baseof.html @@ -1,6 +1,9 @@ + {{ $media_dir := site.Params.media_dir | default "media" }} + {{ $scr.Set "media_dir" $media_dir }} + {{ $css := site.Data.assets.css }} {{ $cdn_url_reveal := "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.8.0" }}