summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-07-20 19:45:43 +0200
committererdgeist <erdgeist@erdgeist.org>2026-07-20 19:45:43 +0200
commit836308471f8d31ccdcdd3a5bd88bc76cc1c0831b (patch)
tree821a526d4d10870654a38d07a4eb53a2180ba313 /config
parentd89e2de48a5e16ff01ec627e79c76b833e4618cf (diff)
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.
Diffstat (limited to 'config')
-rw-r--r--config/asset_licenses.yml25
-rw-r--r--config/locales/de.yml14
-rw-r--r--config/locales/en.yml14
3 files changed, 53 insertions, 0 deletions
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 @@
1# config/asset_licenses.yml
2cc0:
3 url: "https://creativecommons.org/publicdomain/zero/1.0/"
4 requires_attribution: false
5 style: license
6cc_by_4:
7 url: "https://creativecommons.org/licenses/by/4.0/"
8 requires_attribution: true
9 style: license
10cc_by_sa_4:
11 url: "https://creativecommons.org/licenses/by-sa/4.0/"
12 requires_attribution: true
13 style: license
14public_domain:
15 url:
16 requires_attribution: false
17 style: note
18used_with_permission:
19 url:
20 requires_attribution: false
21 style: note
22own_work:
23 url:
24 requires_attribution: false
25 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:
116 revision_created: "angelegt am %{date} von %{actor}" 116 revision_created: "angelegt am %{date} von %{actor}"
117 revision_published: "veröffentlicht am %{date} von %{actor}" 117 revision_published: "veröffentlicht am %{date} von %{actor}"
118 revision_restored: "wiederhergestellt am %{date} von %{actor}" 118 revision_restored: "wiederhergestellt am %{date} von %{actor}"
119
120 open_gallery: "Gallerie anzeigen"
121 asset_licenses:
122 cc0: "CC0"
123 cc_by_4: "CC BY 4.0"
124 cc_by_sa_4: "CC BY-SA 4.0"
125 public_domain: "Gemeinfrei"
126 used_with_permission: "Mit Genehmigung verwendet"
127 own_work: "Eigenes Werk"
128
129 asset_credits:
130 photo: "Foto %{name}"
131 by: "von %{creator}"
132 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:
68 revision_created: "created %{date} by %{actor}" 68 revision_created: "created %{date} by %{actor}"
69 revision_published: "published %{date} by %{actor}" 69 revision_published: "published %{date} by %{actor}"
70 revision_restored: "restored %{date} by %{actor}" 70 revision_restored: "restored %{date} by %{actor}"
71
72 open_gallery: "Open gallery"
73 asset_licenses:
74 cc0: "CC0"
75 cc_by_4: "CC BY 4.0"
76 cc_by_sa_4: "CC BY-SA 4.0"
77 public_domain: "Public domain"
78 used_with_permission: "Used with permission"
79 own_work: "Own work"
80
81 asset_credits:
82 photo: "Photo %{name}"
83 by: "by %{creator}"
84 licensed_under: "Licensed under %{license}"