From 836308471f8d31ccdcdd3a5bd88bc76cc1c0831b Mon Sep 17 00:00:00 2001 From: erdgeist Date: Mon, 20 Jul 2026 19:45:43 +0200 Subject: Make headline images explicit, add asset credits - related_assets gains a `headline` boolean (DB-enforced: at most one per page), replacing "first image by position" as the headline rule. A rake task backfills the current first image on every live head/draft, so nothing changes visually until an editor changes it. - The image picker sidebar gets a star toggle reflecting the flag; the TinyMCE inline-image picker's badge now reads it too, instead of assuming position 0. - No headline chosen (or none attached) now falls back to the gallery-count caption itself becoming the lightbox trigger, instead of the gallery being unreachable. - Assets gain creator, source_url, and license_key (against a new config/asset_licenses.yml dictionary). asset_credit renders a degrading attribution line, reused as a hidden per-image glightbox caption so credit is one click away for every image, not only the headline's always-visible one. - Fixed: asset thumbnails rendered unconditionally regardless of whether a real variant exists on disk. Asset#has_variant? checks file existence, not content type -- some legacy PDFs have real pre-rewrite thumbnails a content-type check would have hidden. - assets#new/edit rebuilt onto the same node_description/node_content layout as assets#show, picking up the three new fields in the process. --- config/asset_licenses.yml | 25 +++++++++++++++++++++++++ config/locales/de.yml | 14 ++++++++++++++ config/locales/en.yml | 14 ++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 config/asset_licenses.yml (limited to 'config') diff --git a/config/asset_licenses.yml b/config/asset_licenses.yml new file mode 100644 index 0000000..5cf377f --- /dev/null +++ b/config/asset_licenses.yml @@ -0,0 +1,25 @@ +# config/asset_licenses.yml +cc0: + url: "https://creativecommons.org/publicdomain/zero/1.0/" + requires_attribution: false + style: license +cc_by_4: + url: "https://creativecommons.org/licenses/by/4.0/" + requires_attribution: true + style: license +cc_by_sa_4: + url: "https://creativecommons.org/licenses/by-sa/4.0/" + requires_attribution: true + style: license +public_domain: + url: + requires_attribution: false + style: note +used_with_permission: + url: + requires_attribution: false + style: note +own_work: + url: + requires_attribution: false + style: note diff --git a/config/locales/de.yml b/config/locales/de.yml index f64f6cd..21c8ebf 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -116,3 +116,17 @@ de: revision_created: "angelegt am %{date} von %{actor}" revision_published: "veröffentlicht am %{date} von %{actor}" revision_restored: "wiederhergestellt am %{date} von %{actor}" + + open_gallery: "Gallerie anzeigen" + asset_licenses: + cc0: "CC0" + cc_by_4: "CC BY 4.0" + cc_by_sa_4: "CC BY-SA 4.0" + public_domain: "Gemeinfrei" + used_with_permission: "Mit Genehmigung verwendet" + own_work: "Eigenes Werk" + + asset_credits: + photo: "Foto %{name}" + by: "von %{creator}" + licensed_under: "Lizenziert unter %{license}" diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a8acc1..1afcf21 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -68,3 +68,17 @@ en: revision_created: "created %{date} by %{actor}" revision_published: "published %{date} by %{actor}" revision_restored: "restored %{date} by %{actor}" + + open_gallery: "Open gallery" + asset_licenses: + cc0: "CC0" + cc_by_4: "CC BY 4.0" + cc_by_sa_4: "CC BY-SA 4.0" + public_domain: "Public domain" + used_with_permission: "Used with permission" + own_work: "Own work" + + asset_credits: + photo: "Photo %{name}" + by: "by %{creator}" + licensed_under: "Licensed under %{license}" -- cgit v1.3