From 6a0b330132be946867ba12e6e2486a6c9504e32a Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Wed, 4 Jun 2025 17:36:21 +0200 Subject: [PATCH] add licenses --- data/licences.json | 5 +++++ layouts/partials/media/attr.html | 34 ++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/data/licences.json b/data/licences.json index b7cd395..b76c3aa 100644 --- a/data/licences.json +++ b/data/licences.json @@ -3,8 +3,13 @@ "CC BY 2.0": "https://creativecommons.org/licenses/by/2.0/", "CC BY-SA 2.0": "https://creativecommons.org/licenses/by-sa/2.0/", "CC BY-NC 2.0": "https://creativecommons.org/licenses/by-nc/2.0/", + "CC BY-SA 2.5": "https://creativecommons.org/licenses/by-sa/2.5/", "CC BY-SA 3.0": "https://creativecommons.org/licenses/by-sa/3.0/", "CC BY-SA 4.0": "https://creativecommons.org/licenses/by-sa/4.0/", + "CC BY-NC 4.0": "https://creativecommons.org/licenses/by-nc/4.0/", + "CC BY-NC-ND 4.0": "https://creativecommons.org/licenses/by-nc-nd/4.0/", + "OGLv3.0": "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", + "Pexels License": "https://www.pexels.com/license/", "Pixabay Content License": "https://pixabay.com/service/license-summary/", "Unsplash License": "https://unsplash.com/license" } diff --git a/layouts/partials/media/attr.html b/layouts/partials/media/attr.html index 75f15ed..e7fe80d 100644 --- a/layouts/partials/media/attr.html +++ b/layouts/partials/media/attr.html @@ -37,22 +37,26 @@

- {{- with $attr_link -}} - + {{- with $attr_link -}} + + {{- end -}} + {{- $attr | safeHTML -}} + {{- if $attr_link -}} + + {{- end -}} + + {{- if $attr_licence }} ( + {{- $attr_licence_link := partialCached "util/get_licence_link.html" ( dict "licences_data" .sc.Site.Data.licences "licence" $attr_licence "licence_link" $attr_licence_link ) $attr_licence $attr_licence_link -}} + + {{- with $attr_licence_link -}} + {{- end -}} - {{- $attr | safeHTML -}} - {{- if $attr_link -}} + + {{- $attr_licence -}} + + {{- with $attr_licence_link -}} {{- end -}} - - {{- if $attr_licence }} ( - {{- with ( index .sc.Site.Data.licences $attr_licence ) -}} - - {{- end -}} - {{- $attr_licence -}} - {{- with ( index .sc.Site.Data.licences $attr_licence ) -}} - - {{- end -}} - ) - {{- end -}} + ) + {{- end -}}