6 files changed, 22 insertions, 11 deletions

diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb
index da82cde..2fefaf7 100644
--- a/app/controllers/related_assets_controller.rb
+++ b/app/controllers/related_assets_controller.rb
@@ -26,6 +26,7 @@ class RelatedAssetsController < ApplicationController
       id: related.id,
       asset_id: asset.id,
       name: asset.name,
+      has_credit: asset.has_credit?,
       thumb_url: asset.upload.url(:thumb),
       large_url: asset.upload.url(:large),
       original_url: asset.upload.url,
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 5b67259..b3c6bad 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -153,7 +153,7 @@ module ContentHelper
 
   def asset_credit(asset)
     return nil unless asset
-    return nil if asset.creator.blank? && asset.source_url.blank? && asset.license_key.blank?
+    return nil unless asset.has_credit?
 
     license = AssetLicense.find(asset.license_key)
 
@@ -173,4 +173,8 @@ module ContentHelper
     full = license_text ? safe_join([attribution, license_text], ", ") : attribution
     safe_join([full, "."])
   end
+
+  def glightbox_data(image, title)
+    "title: #{title.to_s.tr(';', ',')};"
+  end
 end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 8bea1b3..4a295d8 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -15,4 +15,8 @@ class Asset < ApplicationRecord
   def image?
     IMAGE_CONTENT_TYPES.include?(upload_content_type)
   end
+
+  def has_credit?
+    creator.present? || source_url.present? || license_key.present?
+  end
 end
diff --git a/app/views/content/_asset_credits.html.erb b/app/views/content/_asset_credits.html.erb
index 85739d0..5959abd 100644
--- a/app/views/content/_asset_credits.html.erb
+++ b/app/views/content/_asset_credits.html.erb
@@ -1,11 +1,9 @@
 <% if @page.assets.images.any? %>
   <div id="asset_credits">
     <% @page.assets.images.each do |image| %>
-      <% credit = asset_credit(image) %>
-      <% next unless credit %>
       <div id="credit_for_asset_<%= image.id %>"
-           class="glightbox-desc<%= " headline_credit" if image == @headline_asset %>">
-        <%= credit %>
+          class="asset_credit_block<%= " headline_credit" if image == @headline_asset %>">
+        <%= asset_credit(image) %>
       </div>
     <% end %>
   </div>
diff --git a/app/views/content/_headline_image.html.erb b/app/views/content/_headline_image.html.erb
index c764d22..e7b821b 100644
--- a/app/views/content/_headline_image.html.erb
+++ b/app/views/content/_headline_image.html.erb
@@ -5,8 +5,9 @@
     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}" }
+    :data => { :gallery => "page-#{@page.node.id}",
+               :glightbox => glightbox_data(@headline_asset, @headline_asset.name),
+               :"credit-selector" => (@headline_asset.has_credit? ? "#credit_for_asset_#{@headline_asset.id}" : nil) }
   ) %>
   <% if gallery_images.size > 1 %>
     <div class="right"><%= "#{gallery_images.size} #{t(:images)}" %></div>
@@ -15,14 +16,16 @@
   <%= 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}" } %>
+        :data => { :gallery => "page-#{@page.node.id}",
+                   :glightbox => glightbox_data(gallery_images.first, gallery_images.first.name),
+                   :"credit-selector" => (gallery_images.first.has_credit? ? "#credit_for_asset_#{gallery_images.first.id}" : nil) } %>
 <% end %>
 
 <% 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}" } %>
+        :data => { :gallery => "page-#{@page.node.id}",
+                   :glightbox => glightbox_data(image, image.name),
+                   :"credit-selector" => (image.has_credit? ? "#credit_for_asset_#{image.id}" : nil) } %>
 <% end %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index da682f0..07b42d4 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -86,6 +86,7 @@
                   data-large-url="<%= related.asset.upload.url(:large) %>"
                   data-original-url="<%= related.asset.upload.url %>"
                   data-name="<%= related.asset.name %>"
+                  data-has-credit="<%= related.asset.has_credit? %>"
                   data-headline="<%= related.headline? %>"
                   class="<%= "is_headline" if related.headline? %>">
                 <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span>