Rumperuu/Omphaloskepsis-2
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactor: resource attribution

Browse source
This commit is contained in:
Ben Goldsworthy 2025-05-14 17:29:46 +02:00
parent 1a61aeade0
commit 24bfa733ba
No known key found for this signature in database
12 changed files with 169 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

58
layouts/partials/media/attr.html Normal file
View file

@ -0,0 +1,58 @@
<!--
Partial to render attribution for a resource.
@params sc Site context.
@params pc Page context.
@params attr Resource attribution.
@params attr_link Resource link. Optional.
@params attr_license Resource license. Optional.
@params attr_license_link Resource license link. Optional.
-->
<!-- Validation -->
{{- if ( not ( isset . "sc" ) ) -}}
{{- errorf "No site context received" -}}
{{- end -}}
{{- if ( not ( isset . "pc" ) ) -}}
{{- errorf "No page context received (%q)" .sc.Page.File.Dir -}}
{{- end -}}
{{- if ( not ( isset . "params" ) ) -}}
{{- errorf "No params given (%q)" .pc.File.Path -}}
{{- end -}}
{{- if ( not ( isset .params "attr" ) ) -}}
{{- errorf "No attr given (%q)" .pc.File.Path -}}
{{- end -}}
<!-- Variable assignment -->
{{- $attr := .params.attr -}}
{{- $attr_link := .params.attrlink -}}
{{- $attr_licence := .params.attrlicence -}}
{{- $attr_licence_link := .params.attrlicencelink -}}
<!-- Rendering -->
<p class="attr">
{{- with $attr_link -}}
<a href="{{ . }}" target="_blank" rel="noopener">
{{- end -}}
{{- $attr | safeHTML -}}
{{- if $attr_link -}}
</a>
{{- end -}}
{{- if $attr_licence }} (
{{- with ( index .sc.Site.Data.licences $attr_licence ) -}}
<a href="{{ . }}" target="_blank" rel="noopener">
{{- end -}}
{{- $attr_licence -}}
{{- with ( index .sc.Site.Data.licences $attr_licence ) -}}
</a>
{{- end -}}
)
{{- end -}}
<p>

42
layouts/partials/media/picture.html
View file

@ -9,28 +9,30 @@
{{- $src := . -}}
{{- $isResizable := not ( in ( slice "svg" "gif" ) $src.MediaType.SubType ) -}}
<!-- Rendering -->
<picture
class="picture"
itemprop="image"
>
{{ if $isResizable -}}
<picture
class="picture"
itemprop="image"
>
{{ if $isResizable -}}
<source srcset="{{- ($src.Resize "1200x webp").RelPermalink -}}" />
<source srcset="{{- ($src.Resize "800x png").RelPermalink -}}" media="(max-width: 800px)"/>
{{- end }}
<img
class="u-photo picture__image"
{{ if not $isResizable -}}
src="{{- $src.RelPermalink -}}"
{{- else -}}
src="{{- ($src.Resize "1200x webp").RelPermalink -}}"
width="{{- $src.Width -}}"
height="{{- $src.Height -}}"
{{- end }}
{{ with $src.Params.alt -}}alt="{{- . -}}"{{- end }}
{{ with $src.Params.title -}}title="{{- . -}}" {{- end }}
loading="lazy"
role="img"
<source
srcset="{{- ($src.Resize "800x png").RelPermalink -}}"
media="(max-width: 800px)"
/>
{{- end }}
<img
class="u-photo picture__image"
{{ if not $isResizable -}}
src="{{- $src.RelPermalink -}}"
{{- else -}}
src="{{- ($src.Resize "1200x webp").RelPermalink -}}" width="{{- $src.Width -}}" height="{{- $src.Height -}}"
{{- end }}
{{ with $src.Params.alt -}}alt="{{- . -}}"{{- end }}
{{ with $src.Params.title -}}title="{{- . -}}"{{- end }}
loading="lazy"
role="img"
/>
</picture>

69
layouts/partials/single/main-header/item-tile.html
View file

@ -1,9 +1,10 @@
{{- /*
Renders the header tile for an item.
Renders the header tile for an item.
@params pc The page context.
@params sc The site context.
*/ -}}
@params pc The page context.
@params sc The site context.
*/
-}}
{{- if ( not ( isset . "sc" ) ) -}}
{{- errorf "No site context received" -}}
@ -14,21 +15,26 @@
{{- end -}}
{{ with .pc.Params.featured_image }}
<img class="u-photo" style="display: none;" src="
<img
class="u-photo"
style="display: none;"
src="
{{- with ( $.pc.Resources.GetMatch . ) -}}
{{ partialCached "images/get-image.html" ( dict "img" . ) . }}
{{- else -}}
{{- . -}}
{{- end -}}
"
{{ partialCached "images/get-image.html" ( dict "img" . ) . }}
{{- else -}}
{{- . -}}
{{- end -}}
"
itemprop="image"
{{- with ( $.pc.Resources.GetMatch . ) -}}
alt="{{ .Params.alt }}"
{{- end -}}
{{- with ( $.pc.Resources.GetMatch . ) -}}
alt="{{ .Params.alt }}"
{{- end -}}
/>
{{ end }}
<div class="article-header__featured-image"
<div
class="article-header__featured-image"
{{ with .pc.Params.featured_image }}
{{ with ( $.pc.Resources.GetMatch . ) }}
style="background-image: url({{ partialCached "images/get-image.html" ( dict "img" . ) $.pc }})"
@ -36,32 +42,21 @@
style="background-image: url({{ . }})"
{{ end }}
{{ end -}}
>
>
<div class="article-header__title-wrapper">
<a class="u-url u-uid" style="display: none" href="{{ .pc.Permalink }}"></a>
{{- with .pc.File -}}
{{- partialCached "text/item-title.html" ( dict "pc" $.pc "sc" $.sc "class" "article-header" ) .Filename -}}
{{- else -}}
{{- partial "text/item-title.html" ( dict "pc" $.pc "sc" $.sc "class" "article-header" ) -}}
{{- end -}}
<a
class="u-url u-uid"
style="display: none"
href="{{ .pc.Permalink }}"
></a>
{{- with .pc.File -}}
{{- partialCached "text/item-title.html" ( dict "pc" $.pc "sc" $.sc "class" "article-header" ) .Filename -}}
{{- else -}}
{{- partial "text/item-title.html" ( dict "pc" $.pc "sc" $.sc "class" "article-header" ) -}}
{{- end -}}
</div>
{{ with ( .pc.Resources.GetMatch .pc.Params.featured_image ) }}
<p class="attr">
{{- with .Params.attrlink -}}<a href="{{ . }}" target="_blank" rel="noopener">{{- end -}}
{{- .Params.attr | safeHTML -}}
{{- if .Params.attrlink -}}</a>{{- end -}}
{{- if .Params.attrlicence }} (
{{- with .Params.attrlicencelink -}}
<a href="{{ . }}" target="_blank" rel="noopener">
{{- end -}}
{{- .Params.attrlicence -}}
{{- if .Params.attrlicencelink -}}
</a>
{{- end -}}
)
{{- end -}}
<p>
{{- partial "media/attr.html" ( dict "pc" $.pc "sc" $.sc "params" .Params ) -}}
{{ end }}
</div>