diff --git a/content/operator/ns/index.de.md b/content/operator/ns/index.de.md index 1a516153a..d9fc2ffe1 100644 --- a/content/operator/ns/index.de.md +++ b/content/operator/ns/index.de.md @@ -124,7 +124,7 @@ Dieser kann [Online](https://www.ns.nl/en/tickets/icd-supplement) bzw. in der NS Inhaber einer OV-Chipkarte können am Zuschlagsschalter im Bahnhof zu [Off-Peak Zeiten](https://www.ns.nl/en/travel-information/off-peak-hours.html) einen vergünstigten Zuschlag für 1,92 € (40 % Rabatt) erwerben. [^1] [^2] [^3] [^4] {{< /highlight >}} -![Intercity Direct Netz, Spag85, [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0), via [Wikimedia Commons](https://commons.wikimedia.org/wiki/File:Intercity_direct_network.jpg)](intercity-direct-map.webp) +![Intercity Direct Netz](intercity-direct-map.jpg) {{% /train-category %}} diff --git a/content/operator/ns/index.en.md b/content/operator/ns/index.en.md index 752d6c10c..3e879aea8 100644 --- a/content/operator/ns/index.en.md +++ b/content/operator/ns/index.en.md @@ -125,7 +125,7 @@ The supplement can be purchased [online](https://www.ns.nl/en/tickets/icd-supple Holders of an OV-chipkaart can buy a discounted supplement for € 1.92 (40 % discount) at the supplement counter in the station during [off-peak times](https://www.ns.nl/en/travel-information/off-peak-hours.html). [^1] [^2] [^3] [^4] {{< /highlight >}} -![Intercity Direct Network, Spag85, [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0), via [Wikimedia Commons](https://commons.wikimedia.org/wiki/File:Intercity_direct_network.jpg)](intercity-direct-map.webp) +![Intercity Direct Network](intercity-direct-map.jpg) {{% /train-category %}} diff --git a/content/operator/ns/index.fr.md b/content/operator/ns/index.fr.md index 86f054d19..942667f72 100644 --- a/content/operator/ns/index.fr.md +++ b/content/operator/ns/index.fr.md @@ -125,7 +125,7 @@ Ce supplément peut être acheté [en ligne](https://www.ns.nl/en/tickets/icd-su Les détenteurs d'une carte OV-chipkaart peuvent acheter un supplément à tarif réduit de 1,92 € (40 % de réduction) au guichet pendant les [heures creuses](https://www.ns.nl/en/travel-information/off-peak-hours.html). [^1] [^2] [^3] [^4] {{< /highlight >}} -![Réseau Intercity Direct, Spag85, [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0), via [Wikimedia Commons](https://commons.wikimedia.org/wiki/File:Intercity_direct_network.jpg)](intercity-direct-map.webp) +![Réseau Intercity Direct](intercity-direct-map.jpg) {{% /train-category %}} diff --git a/content/operator/ns/intercity-direct-map.jpg b/content/operator/ns/intercity-direct-map.jpg new file mode 100644 index 000000000..f1072e4cd Binary files /dev/null and b/content/operator/ns/intercity-direct-map.jpg differ diff --git a/content/operator/ns/intercity-direct-map.webp b/content/operator/ns/intercity-direct-map.webp deleted file mode 100644 index c5cad3499..000000000 Binary files a/content/operator/ns/intercity-direct-map.webp and /dev/null differ diff --git a/layouts/partials/image.html b/layouts/partials/image.html index 1254f71e9..edc420c97 100644 --- a/layouts/partials/image.html +++ b/layouts/partials/image.html @@ -18,6 +18,29 @@ {{- $figStyles = $figStyles | append (printf "width: %s" $width) -}} {{- end -}} +{{- $metaInformation := false -}} +{{- $iptcCopyrightNotice := "" -}} +{{- $artist := "" -}} + +{{- if and (ne $extension "svg") (ne $extension "gif") -}} + {{- if reflect.IsImageResourceWithMeta $image -}} + {{- with $image.Meta -}} + {{- with .IPTC -}} + {{- with (index . "CopyrightNotice") -}} + {{- $iptcCopyrightNotice = . -}} + {{ $metaInformation = true -}} + {{- end -}} + {{- end -}} + {{- with .Exif -}} + {{- with (index . "Artist") -}} + {{- $artist = . -}} + {{ $metaInformation = true -}} + {{- end -}} + {{- end -}} + {{- end -}} + {{- end -}} +{{- end -}} +
- {{- if .caption -}} + {{- if or (.caption) ($metaInformation) -}}
- {{- .caption -}} + {{- with .caption -}} + {{- . -}} + {{- end -}} + {{- if and (.caption) ($metaInformation) -}} + + {{- end -}} + {{- if $metaInformation -}} + ©  + {{- with $artist -}} + {{ . }},  + {{- end -}} + {{- with $iptcCopyrightNotice -}} + {{- . | safeHTML -}} + {{- end -}} + {{ end }}
{{- end -}}