summaryrefslogtreecommitdiff
path: root/public/javascripts
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 /public/javascripts
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 'public/javascripts')
-rw-r--r--public/javascripts/admin_interface.js12
-rw-r--r--public/javascripts/related_assets.js35
2 files changed, 28 insertions, 19 deletions
diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index e9f96c2..7fb1dc2 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -277,10 +277,12 @@ cccms = {
277 277
278 var items = $('#related_asset_list li').map(function() { 278 var items = $('#related_asset_list li').map(function() {
279 return { 279 return {
280 id: $(this).data('asset-id'),
280 thumb: $(this).find('img').attr('src'), 281 thumb: $(this).find('img').attr('src'),
281 large: $(this).data('large-url'), 282 large: $(this).data('large-url'),
282 original: $(this).data('original-url'), 283 original: $(this).data('original-url'),
283 name: $(this).data('name') 284 name: $(this).data('name'),
285 headline: $(this).data('headline') === true
284 }; 286 };
285 }).get(); 287 }).get();
286 cccms.inline_images.items = items; 288 cccms.inline_images.items = items;
@@ -293,7 +295,7 @@ cccms = {
293 items.forEach(function(item, i) { 295 items.forEach(function(item, i) {
294 var wrapper = $('<div class="inline_image_picker_item"></div>'); 296 var wrapper = $('<div class="inline_image_picker_item"></div>');
295 wrapper.append($('<img>').attr('src', item.thumb).attr('data-index', i)); 297 wrapper.append($('<img>').attr('src', item.thumb).attr('data-index', i));
296 if (i === 0) { 298 if (item.headline) {
297 wrapper.append($('<span>', { "class": "inline_image_picker_headline_badge" }).text("Headline")); 299 wrapper.append($('<span>', { "class": "inline_image_picker_headline_badge" }).text("Headline"));
298 } 300 }
299 grid.append(wrapper); 301 grid.append(wrapper);
@@ -317,8 +319,10 @@ cccms = {
317 ? 'inline-image inline-image--full' 319 ? 'inline-image inline-image--full'
318 : 'inline-image inline-image--half inline-image--' + placement; 320 : 'inline-image inline-image--half inline-image--' + placement;
319 321
320 var html = '<a href="' + item.original + '" class="glightbox" data-gallery="page-' + cccms.inline_images.node_id + '">' + 322 var esc = cccms.inline_images.escape_attr;
321 '<img src="' + item.large + '" class="' + classes + '" alt="' + cccms.inline_images.escape_attr(item.name) + '"></a>'; 323 var html = '<a href="' + esc(item.original) + '" class="glightbox" data-gallery="page-' + esc(cccms.inline_images.node_id) + '"' +
324 ' data-title="' + esc(item.name) + '" data-description="#credit_for_asset_' + esc(item.id) + '">' +
325 '<img src="' + esc(item.large) + '" class="' + classes + '" alt="' + esc(item.name) + '"></a>';
322 326
323 cccms.inline_images.editor.insertContent(html); 327 cccms.inline_images.editor.insertContent(html);
324 $('#inline_image_picker').hide(); 328 $('#inline_image_picker').hide();
diff --git a/public/javascripts/related_assets.js b/public/javascripts/related_assets.js
index 3340fa7..cc07d86 100644
--- a/public/javascripts/related_assets.js
+++ b/public/javascripts/related_assets.js
@@ -5,8 +5,6 @@ related_assets = {
5 var createUrl = container.data("create-url"); 5 var createUrl = container.data("create-url");
6 var list = $("#related_asset_list"); 6 var list = $("#related_asset_list");
7 7
8 related_assets.update_headline_badge(list);
9
10 initSearchPicker({ 8 initSearchPicker({
11 inputSelector: "#related_asset_search_term", 9 inputSelector: "#related_asset_search_term",
12 resultsSelector: "#related_asset_search_results", 10 resultsSelector: "#related_asset_search_results",
@@ -44,7 +42,6 @@ related_assets = {
44 url: ui.item.data("url"), 42 url: ui.item.data("url"),
45 data: "position=" + newPosition 43 data: "position=" + newPosition
46 }); 44 });
47 related_assets.update_headline_badge(list);
48 } 45 }
49 }); 46 });
50 47
@@ -55,21 +52,29 @@ related_assets = {
55 url: item.data("url"), 52 url: item.data("url"),
56 success: function() { 53 success: function() {
57 item.remove(); 54 item.remove();
58 related_assets.update_headline_badge(list);
59 } 55 }
60 }); 56 });
61 }); 57 });
62 },
63 58
64 update_headline_badge: function(list) { 59 list.on("click", ".related_asset_set_headline", function() {
65 list.find(".related_asset_headline_badge").remove(); 60 var button = $(this);
66 var first = list.children("li").first(); 61 var item = button.closest("li");
67 if (first.length) { 62 var makeHeadline = button.attr("aria-pressed") !== "true";
68 $("<span>", { 63
69 "class": "related_asset_headline_badge", 64 $.ajax({
70 "title": "Shown automatically as this page's headline image" 65 type: "PATCH",
71 }).text("Headline").insertBefore(first.find(".related_asset_remove")); 66 url: item.data("url"),
72 } 67 data: "headline=" + makeHeadline,
68 success: function() {
69 list.children("li").removeClass("is_headline")
70 .find(".related_asset_set_headline").attr("aria-pressed", "false");
71 if (makeHeadline) {
72 item.addClass("is_headline");
73 button.attr("aria-pressed", "true");
74 }
75 }
76 });
77 });
73 }, 78 },
74 79
75 attach: function(assetId, createUrl, list) { 80 attach: function(assetId, createUrl, list) {
@@ -81,13 +86,13 @@ related_assets = {
81 success: function(related) { 86 success: function(related) {
82 var item = $($("#related_asset_template").html().trim()); 87 var item = $($("#related_asset_template").html().trim());
83 item.attr("data-url", related.url); 88 item.attr("data-url", related.url);
89 item.attr("data-asset-id", related.asset_id);
84 item.attr("data-large-url", related.large_url); 90 item.attr("data-large-url", related.large_url);
85 item.attr("data-original-url", related.original_url); 91 item.attr("data-original-url", related.original_url);
86 item.attr("data-name", related.name); 92 item.attr("data-name", related.name);
87 item.find("img").attr("src", related.thumb_url); 93 item.find("img").attr("src", related.thumb_url);
88 list.append(item); 94 list.append(item);
89 list.sortable("refresh"); 95 list.sortable("refresh");
90 related_assets.update_headline_badge(list);
91 $("#related_asset_search_term").val(""); 96 $("#related_asset_search_term").val("");
92 $("#related_asset_search_results").slideUp().empty(); 97 $("#related_asset_search_results").slideUp().empty();
93 } 98 }