16 files changed, 178 insertions, 71 deletions

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 @@
-<h1>Editing asset</h1>
+<div id="page_editor">
+  <h1>Editing asset</h1>
 
-<%= 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? %>
-    <p>
-      <strong>Current file:</strong>
-      <%= @asset.upload.url %>
-      (<%= number_to_human_size(@asset.upload.size) %>)
-    </p>
-  <% end %>
+    <div id="content">
+      <div class="node_description"><%= f.label :name %></div>
+      <div class="node_content"><%= f.text_field :name %></div>
+
+      <% if @asset.upload.present? %>
+        <div class="node_description">Current File</div>
+        <div class="node_content"><%= @asset.upload.url %> (<%= number_to_human_size(@asset.upload.size) %>)</div>
+      <% end %>
+
+      <div class="node_description"><%= f.label :upload, "Replace file" %></div>
+      <div class="node_content"><%= f.file_field :upload %></div>
 
-  <p>
-    <label>Replace file:</label><br>
-    <%= f.file_field :upload %>
-  </p>
+      <div class="node_description"><%= f.label :creator %></div>
+      <div class="node_content"><%= f.text_field :creator %></div>
 
-  <p>
-    <%= f.submit 'Update' %>
-  </p>
-<% end %>
+      <div class="node_description"><%= f.label :source_url, "Source URL" %></div>
+      <div class="node_content"><%= f.text_field :source_url %></div>
 
-<%= link_to 'Show', @asset %> | <%= link_to 'Back', assets_path %>
+      <div class="node_description"><%= f.label :license_key, "License" %></div>
+      <div class="node_content">
+        <%= f.select :license_key,
+              options_for_select(
+                [["— none —", ""]] + AssetLicense.keys.map { |key| [t("asset_licenses.#{key}"), key] },
+                @asset.license_key
+              ) %>
+      </div>
+
+      <div class="node_description">Actions</div>
+      <div class="node_content node_info_group">
+        <div class="node_info_group_items">
+          <div class="node_info_item"><%= f.submit 'Update' %></div>
+          <div class="node_info_item"><%= link_to 'Show', @asset %></div>
+          <div class="node_info_item"><%= link_to 'Back', assets_path %></div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
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 @@
   </tr>
 <% @assets.each do |asset| %>
   <tr>
-    <td><%= image_tag asset.upload.url(:thumb), style: "max-width: 100px; max-height: 100px;" %></td>
+    <td><% if asset.has_variant?(:thumb) %><%= image_tag asset.upload.url(:thumb), style: "max-width: 100px; max-height: 100px;" %><% end %></td>
     <td><%= link_to asset.name, asset.upload.url %></td>
     <td><%= asset.upload.content_type %></td>
     <td><%= link_to 'Show', asset %></td>
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 @@
-<h1>New asset</h1>
+<div id="page_editor">
+  <h1>New asset</h1>
 
-<%= form_for(@asset, :html => { :multipart => true }) do |f| %>
-  <%= form_error_messages(f) %>
-  
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
+  <%= form_for(@asset, :html => { :multipart => true }) do |f| %>
+    <%= form_error_messages(f) %>
 
-  <p>
-    <%= f.file_field :upload %>
-    <%= f.submit 'Create' %>
-  </p>
-<% end %>
+    <div id="content">
+      <div class="node_description"><%= f.label :name %></div>
+      <div class="node_content"><%= f.text_field :name %></div>
 
-<%= link_to 'Back', assets_path %>
+      <div class="node_description"><%= f.label :upload, "File" %></div>
+      <div class="node_content"><%= f.file_field :upload %></div>
+
+      <div class="node_description"><%= f.label :creator %></div>
+      <div class="node_content"><%= f.text_field :creator %></div>
+
+      <div class="node_description"><%= f.label :source_url, "Source URL" %></div>
+      <div class="node_content"><%= f.text_field :source_url %></div>
+
+      <div class="node_description"><%= f.label :license_key, "License" %></div>
+      <div class="node_content">
+        <%= f.select :license_key,
+              options_for_select(
+                [["— none —", ""]] + AssetLicense.keys.map { |key| [t("asset_licenses.#{key}"), key] },
+                @asset.license_key
+              ) %>
+      </div>
+
+      <div class="node_description">Actions</div>
+      <div class="node_content node_info_group">
+        <div class="node_info_group_items">
+          <div class="node_info_item"><%= f.submit 'Create' %></div>
+          <div class="node_info_item"><%= link_to 'Back', assets_path %></div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index ff00883..e551e35 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -16,8 +16,10 @@
       </div>
     </div>
 
-    <div class="node_description">Thumbnail</div>
-    <div class="node_content"><%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %></div>
+    <% if @asset.has_variant?(:medium) %>
+      <div class="node_description">Thumbnail</div>
+      <div class="node_content"><%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %></div>
+    <% end %>
 
     <div class="node_description">Public Path</div>
     <div class="node_content">
@@ -30,6 +32,27 @@
       </button>
     </div>
 
+    <div class="node_description">Creator</div>
+    <div class="node_content"><%= @asset.creator.presence || "—" %></div>
+
+    <div class="node_description">Source</div>
+    <div class="node_content">
+      <% if @asset.source_url.present? %>
+        <%= link_to @asset.source_url, @asset.source_url %>
+      <% else %>
+        —
+      <% end %>
+    </div>
+
+    <div class="node_description">License</div>
+    <div class="node_content">
+      <% if (license = AssetLicense.find(@asset.license_key)) %>
+        <%= t("asset_licenses.#{license.key}") %>
+      <% else %>
+        —
+      <% end %>
+    </div>
+
     <div class="node_description">Content Type</div>
     <div class="node_content"><%= @asset.upload.content_type %></div>
 
diff --git a/app/views/content/_asset_credits.html.erb b/app/views/content/_asset_credits.html.erb
new file mode 100644
index 0000000..5959abd
--- /dev/null
+++ b/app/views/content/_asset_credits.html.erb
@@ -0,0 +1,10 @@
+<% if @page.assets.images.any? %>
+  <div id="asset_credits">
+    <% @page.assets.images.each do |image| %>
+      <div id="credit_for_asset_<%= image.id %>"
+          class="asset_credit_block<%= " headline_credit" if image == @headline_asset %>">
+        <%= asset_credit(image) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/content/_headline_image.html.erb b/app/views/content/_headline_image.html.erb
index 243be40..e7b821b 100644
--- a/app/views/content/_headline_image.html.erb
+++ b/app/views/content/_headline_image.html.erb
@@ -1,16 +1,31 @@
-<%= 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 %>
-  <div class="right">
-    <%= "#{@images.length} #{t(:images)}" %>
-  </div>
+<% if @headline_asset %>
+  <%= link_to(
+    image_tag(@headline_asset.upload.url(:headline)),
+    @headline_asset.upload.url,
+    :class => "glightbox",
+    :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>
+  <% 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}",
+                   :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 %>
 
-<% @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}",
+                   :glightbox => glightbox_data(image, image.name),
+                   :"credit-selector" => (image.has_credit? ? "#credit_for_asset_#{image.id}" : nil) } %>
 <% 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 @@
       </ul>
     </div>
   <% end %>
+  <%= render partial: 'content/asset_credits' %>
 </div>
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 @@
   <p><%= sanitize( @page.abstract ) %></p>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
+  <%= render partial: 'content/asset_credits' %>
 </div>
 
 <%= 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 @@
 <div class="article" lang="<%= @page.effective_lang %>">
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
+  <%= render partial: 'content/asset_credits' %>
 </div>
 
 <%= 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 @@
   <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
   <div id="headline_image"><%= headline_image %></div>
   <div class="body"><%= aggregate?(@page.body) %></div>
+  <%= render partial: 'content/asset_credits' %>
 </div>
 
 <%= 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 @@
   <h2 class="headline"><%= @page.title %></h2>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
+  <%= render partial: 'content/asset_credits' %>
 </div>
 
 <%= 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 @@
   <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
   <div id="headline_image"><%= headline_image %></div>
   <div class="body"><%= aggregate?(@page.body) %></div>
+  <%= render partial: 'content/asset_credits' %>
 </div>
 
 <%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/layouts/events.html.erb b/app/views/layouts/events.html.erb
deleted file mode 100644
index 93a6c0c..0000000
--- a/app/views/layouts/events.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Events: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-
-<p style="color: green"><%= flash[:notice] %></p>
-
-<%= yield %>
-
-</body>
-</html>
diff --git a/app/views/node_actions/_change_details.html.erb b/app/views/node_actions/_change_details.html.erb
index 2583e8b..066d0f3 100644
--- a/app/views/node_actions/_change_details.html.erb
+++ b/app/views/node_actions/_change_details.html.erb
@@ -5,9 +5,13 @@
       <tr>
         <th><%= I18n.default_locale.to_s.upcase %></th>
         <td>
-          <%= safe_join(default_items, ", ") %>
+          <%= safe_join(default_items, tag.br) %>
           <% if action_entry.page && action_entry.node %>
-            <%= link_to t("node_actions.view_revision"), node_revision_path(action_entry.node, action_entry.page) %>
+            <% if (diff_params = action_entry.diff_link_params) %>
+              <%= link_to t("node_actions.view_diff"), diff_node_revisions_path(action_entry.node, diff_params) %>
+            <% else %>
+              <%= link_to t("node_actions.view_revision"), node_revision_path(action_entry.node, action_entry.page) %>
+            <% end %>
           <% end %>
         </td>
       </tr>
@@ -16,9 +20,13 @@
       <tr>
         <th><%= locale.upcase %></th>
         <td>
-          <%= safe_join(translation_changes(diff), ", ") %>
+          <%= safe_join(translation_changes(diff), tag.br) %>
           <% if action_entry.page && action_entry.node %>
-            <%= link_to t("node_actions.view_revision"), node_revision_path(action_entry.node, action_entry.page, :locale => locale) %>
+            <% if (diff_params = action_entry.diff_link_params) %>
+              <%= link_to t("node_actions.view_diff"), diff_node_revisions_path(action_entry.node, diff_params.merge(:locale => locale)) %>
+            <% else %>
+              <%= link_to t("node_actions.view_revision"), node_revision_path(action_entry.node, action_entry.page, :locale => locale) %>
+            <% end %>
           <% end %>
         </td>
       </tr>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 25f15c2..07b42d4 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -82,17 +82,27 @@
           <ul id="related_asset_list" class="thumbnail_list">
             <% @page.related_assets.includes(:asset).each do |related| %>
               <li data-url="<%= node_related_asset_path(@node, related) %>"
+                  data-asset-id="<%= related.asset.id %>"
                   data-large-url="<%= related.asset.upload.url(:large) %>"
                   data-original-url="<%= related.asset.upload.url %>"
-                  data-name="<%= related.asset.name %>">
+                  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>
                 <%= image_tag related.asset.upload.url(:thumb) %>
+                <button type="button" class="related_asset_set_headline"
+                        aria-pressed="<%= related.headline? %>" aria-label="Set as headline image"
+                        title="Use this photo as the page's headline image">
+                  <%= icon("star", library: "tabler", "aria-hidden": true) %>
+                </button>
                 <button type="button" class="related_asset_remove" aria-label="Remove image">
                   <%= icon("x", library: "tabler", "aria-hidden": true) %>
                 </button>
               </li>
             <% end %>
           </ul>
+          <p class="field_hint">The starred photo becomes this page's headline image on the public site. If none is starred, visitors get a link to browse all attached images instead.</p>
           <%= text_field_tag nil, nil, id: "related_asset_search_term", placeholder: "Search images to attach…", autocomplete: "off" %>
           <div id="related_asset_search_results" class="search_results"></div>
         </div>
@@ -102,6 +112,9 @@
         <li>
           <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span>
           <img src="">
+          <button type="button" class="related_asset_set_headline" aria-pressed="false" aria-label="Set as headline image">
+            <%= icon("star", library: "tabler", "aria-hidden": true) %>
+          </button>
           <button type="button" class="related_asset_remove" aria-label="Remove image">
             <%= icon("x", library: "tabler", "aria-hidden": true) %>
           </button>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index af05778..a7be3c6 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -254,11 +254,19 @@
     </div>
 
     <% if @page.assets.images.any? %>
+      <% headline_asset_id = @page.related_assets.find_by(headline: true)&.asset_id %>
       <div class="node_description">Images</div>
       <div class="node_content node_info_group">
         <ul class="thumbnail_list">
           <% @page.assets.images.each do |asset| %>
-            <li><%= link_to image_tag(asset.upload.url(:thumb)), asset_path(asset) %></li>
+            <li class="<%= "is_headline" if asset.id == headline_asset_id %>">
+              <%= link_to image_tag(asset.upload.url(:thumb)), asset_path(asset) %>
+              <% if asset.id == headline_asset_id %>
+                <span class="headline_indicator" title="This page's headline image">
+                  <%= icon("star", library: "tabler", "aria-hidden": true) %>
+                </span>
+              <% end %>
+            </li>
           <% end %>
         </ul>
       </div>