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. --- app/views/assets/edit.html.erb | 58 +++++++++++++++------- app/views/assets/index.html.erb | 2 +- app/views/assets/new.html.erb | 49 ++++++++++++------ app/views/assets/show.html.erb | 26 +++++++++- app/views/content/_asset_credits.html.erb | 12 +++++ app/views/content/_headline_image.html.erb | 36 +++++++++----- .../page_templates/public/chapter_detail.html.erb | 1 + .../public/no_date_and_author.html.erb | 1 + .../no_title_abstract_date_and_author.html.erb | 1 + .../public/standard_template.html.erb | 1 + .../page_templates/public/title_only.html.erb | 1 + .../custom/page_templates/public/update.html.erb | 1 + app/views/nodes/edit.html.erb | 12 ++++- 13 files changed, 153 insertions(+), 48 deletions(-) create mode 100644 app/views/content/_asset_credits.html.erb (limited to 'app/views') diff --git a/app/views/assets/edit.html.erb b/app/views/assets/edit.html.erb index f198600..3ef8fea 100644 --- a/app/views/assets/edit.html.erb +++ b/app/views/assets/edit.html.erb @@ -1,24 +1,44 @@ -

Editing asset

+
+

Editing asset

-<%= form_for(@asset, html: { multipart: true }) do |f| %> - <%= form_error_messages(f) %> + <%= form_for(@asset, html: { multipart: true }) do |f| %> + <%= form_error_messages(f) %> - <% if @asset.upload.present? %> -

- Current file: - <%= @asset.upload.url %> - (<%= number_to_human_size(@asset.upload.size) %>) -

- <% end %> +
+
<%= f.label :name %>
+
<%= f.text_field :name %>
+ + <% if @asset.upload.present? %> +
Current File
+
<%= @asset.upload.url %> (<%= number_to_human_size(@asset.upload.size) %>)
+ <% end %> + +
<%= f.label :upload, "Replace file" %>
+
<%= f.file_field :upload %>
-

-
- <%= f.file_field :upload %> -

+
<%= f.label :creator %>
+
<%= f.text_field :creator %>
-

- <%= f.submit 'Update' %> -

-<% end %> +
<%= f.label :source_url, "Source URL" %>
+
<%= f.text_field :source_url %>
-<%= link_to 'Show', @asset %> | <%= link_to 'Back', assets_path %> +
<%= f.label :license_key, "License" %>
+
+ <%= f.select :license_key, + options_for_select( + [["— none —", ""]] + AssetLicense.keys.map { |key| [t("asset_licenses.#{key}"), key] }, + @asset.license_key + ) %> +
+ +
Actions
+
+
+
<%= f.submit 'Update' %>
+
<%= link_to 'Show', @asset %>
+
<%= link_to 'Back', assets_path %>
+
+
+
+ <% end %> +
diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb index 8c35561..ff1300a 100644 --- a/app/views/assets/index.html.erb +++ b/app/views/assets/index.html.erb @@ -17,7 +17,7 @@ <% @assets.each do |asset| %> - <%= image_tag asset.upload.url(:thumb), style: "max-width: 100px; max-height: 100px;" %> + <% if asset.has_variant?(:thumb) %><%= image_tag asset.upload.url(:thumb), style: "max-width: 100px; max-height: 100px;" %><% end %> <%= link_to asset.name, asset.upload.url %> <%= asset.upload.content_type %> <%= link_to 'Show', asset %> diff --git a/app/views/assets/new.html.erb b/app/views/assets/new.html.erb index 6c1310a..2cf8865 100644 --- a/app/views/assets/new.html.erb +++ b/app/views/assets/new.html.erb @@ -1,17 +1,38 @@ -

New asset

+
+

New asset

-<%= form_for(@asset, :html => { :multipart => true }) do |f| %> - <%= form_error_messages(f) %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

+ <%= form_for(@asset, :html => { :multipart => true }) do |f| %> + <%= form_error_messages(f) %> -

- <%= f.file_field :upload %> - <%= f.submit 'Create' %> -

-<% end %> +
+
<%= f.label :name %>
+
<%= f.text_field :name %>
-<%= link_to 'Back', assets_path %> +
<%= f.label :upload, "File" %>
+
<%= f.file_field :upload %>
+ +
<%= f.label :creator %>
+
<%= f.text_field :creator %>
+ +
<%= f.label :source_url, "Source URL" %>
+
<%= f.text_field :source_url %>
+ +
<%= f.label :license_key, "License" %>
+
+ <%= f.select :license_key, + options_for_select( + [["— none —", ""]] + AssetLicense.keys.map { |key| [t("asset_licenses.#{key}"), key] }, + @asset.license_key + ) %> +
+ +
Actions
+
+
+
<%= f.submit 'Create' %>
+
<%= link_to 'Back', assets_path %>
+
+
+
+ <% end %> +
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb index ff00883..a0e4e46 100644 --- a/app/views/assets/show.html.erb +++ b/app/views/assets/show.html.erb @@ -17,7 +17,10 @@
Thumbnail
-
<%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %>
+ <% if @asset.has_variant?(:medium) %> +
Thumbnail
+
<%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %>
+ <% end %>
Public Path
@@ -30,6 +33,27 @@
+
Creator
+
<%= @asset.creator.presence || "—" %>
+ +
Source
+
+ <% if @asset.source_url.present? %> + <%= link_to @asset.source_url, @asset.source_url %> + <% else %> + — + <% end %> +
+ +
License
+
+ <% if (license = AssetLicense.find(@asset.license_key)) %> + <%= t("asset_licenses.#{license.key}") %> + <% else %> + — + <% end %> +
+
Content Type
<%= @asset.upload.content_type %>
diff --git a/app/views/content/_asset_credits.html.erb b/app/views/content/_asset_credits.html.erb new file mode 100644 index 0000000..85739d0 --- /dev/null +++ b/app/views/content/_asset_credits.html.erb @@ -0,0 +1,12 @@ +<% if @page.assets.images.any? %> +
+ <% @page.assets.images.each do |image| %> + <% credit = asset_credit(image) %> + <% next unless credit %> +
"> + <%= credit %> +
+ <% end %> +
+<% end %> diff --git a/app/views/content/_headline_image.html.erb b/app/views/content/_headline_image.html.erb index 243be40..c764d22 100644 --- a/app/views/content/_headline_image.html.erb +++ b/app/views/content/_headline_image.html.erb @@ -1,16 +1,28 @@ -<%= link_to( - image_tag(@images[0].upload.url(:headline)), - @images[0].upload.url, - :class => "glightbox", - :data => { :gallery => "page-#{@page.node.id}" } -) %> +<% gallery_images = @page.assets.images %> -<% if 1 < @images.length %> -
- <%= "#{@images.length} #{t(:images)}" %> -
+<% if @headline_asset %> + <%= link_to( + image_tag(@headline_asset.upload.url(:headline)), + @headline_asset.upload.url, + :class => "glightbox", + :data => { :gallery => "page-#{@page.node.id}", :title => @headline_asset.name, + :description => "#credit_for_asset_#{@headline_asset.id}" } + ) %> + <% if gallery_images.size > 1 %> +
<%= "#{gallery_images.size} #{t(:images)}" %>
+ <% end %> +<% elsif gallery_images.any? %> + <%= link_to "#{gallery_images.size} #{t(:images)}, #{t(:open_gallery)}", + gallery_images.first.upload.url, + :class => "glightbox right", + :data => { :gallery => "page-#{@page.node.id}", :title => gallery_images.first.name, + :description => "#credit_for_asset_#{gallery_images.first.id}" } %> <% end %> -<% @images[1..-1].each do |image| %> - <%= link_to "", image.upload.url, :class => "glightbox", :style => "display: none", :data => { :gallery => "page-#{@page.node.id}" } %> +<% gallery_images.each do |image| %> + <% next if image == @headline_asset %> + <% next if !@headline_asset && image == gallery_images.first %> + <%= link_to "", image.upload.url, :class => "glightbox", :style => "display: none", + :data => { :gallery => "page-#{@page.node.id}", :title => image.name, + :description => "#credit_for_asset_#{image.id}" } %> <% end %> diff --git a/app/views/custom/page_templates/public/chapter_detail.html.erb b/app/views/custom/page_templates/public/chapter_detail.html.erb index c4c2598..18449b8 100644 --- a/app/views/custom/page_templates/public/chapter_detail.html.erb +++ b/app/views/custom/page_templates/public/chapter_detail.html.erb @@ -31,4 +31,5 @@ <% end %> + <%= render partial: 'content/asset_credits' %> diff --git a/app/views/custom/page_templates/public/no_date_and_author.html.erb b/app/views/custom/page_templates/public/no_date_and_author.html.erb index fa39e54..ec7e850 100644 --- a/app/views/custom/page_templates/public/no_date_and_author.html.erb +++ b/app/views/custom/page_templates/public/no_date_and_author.html.erb @@ -3,6 +3,7 @@

<%= sanitize( @page.abstract ) %>

<%= headline_image %>
<%= aggregate?(@page.body) %> + <%= render partial: 'content/asset_credits' %> <%= will_paginate(@content_collection) if @content_collection %> diff --git a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb index 64e2a7c..c486684 100644 --- a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb +++ b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb @@ -1,6 +1,7 @@
<%= headline_image %>
<%= aggregate?(@page.body) %> + <%= render partial: 'content/asset_credits' %>
<%= will_paginate(@content_collection) if @content_collection %> diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb index bbc8cd0..e1e2eb0 100644 --- a/app/views/custom/page_templates/public/standard_template.html.erb +++ b/app/views/custom/page_templates/public/standard_template.html.erb @@ -3,6 +3,7 @@

<%= sanitize( @page.abstract )%>

<%= headline_image %>
<%= aggregate?(@page.body) %>
+ <%= render partial: 'content/asset_credits' %> <%= will_paginate(@content_collection) if @content_collection %> diff --git a/app/views/custom/page_templates/public/title_only.html.erb b/app/views/custom/page_templates/public/title_only.html.erb index 42fe9a6..d706e9d 100644 --- a/app/views/custom/page_templates/public/title_only.html.erb +++ b/app/views/custom/page_templates/public/title_only.html.erb @@ -2,6 +2,7 @@

<%= @page.title %>

<%= headline_image %>
<%= aggregate?(@page.body) %> + <%= render partial: 'content/asset_credits' %> <%= will_paginate(@content_collection) if @content_collection %> diff --git a/app/views/custom/page_templates/public/update.html.erb b/app/views/custom/page_templates/public/update.html.erb index d5995ac..0ff1bb2 100644 --- a/app/views/custom/page_templates/public/update.html.erb +++ b/app/views/custom/page_templates/public/update.html.erb @@ -4,6 +4,7 @@

<%= sanitize( @page.abstract )%>

<%= headline_image %>
<%= aggregate?(@page.body) %>
+ <%= render partial: 'content/asset_credits' %> <%= will_paginate(@content_collection) if @content_collection %> diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb index 25f15c2..2c1e975 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb @@ -82,11 +82,18 @@