3 files changed, 53 insertions, 103 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index e9f96c2..f6d915f 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -45,10 +45,6 @@ $(document).ready(function () {
     menu_item_sorter.initialize();
   }
 
-  if ($("#metadata").length != 0) {
-    meta_data.initialize();
-  }
-
   if ($("#parent_search_term").length != 0) {
     parent_search.initialize_search();
   }
@@ -110,14 +106,6 @@ $(document).ready(function () {
 });
 
 
-meta_data = {
-  initialize : function() {
-    document.getElementById("metadata_details").addEventListener("toggle", function() {
-      if (this.open) image_interface.initialize();
-    });
-  }
-};
-
 cccms = {
   setup_autosave : function() {
 
@@ -277,10 +265,13 @@ cccms = {
 
       var items = $('#related_asset_list li').map(function() {
         return {
+          id: $(this).data('asset-id'),
           thumb: $(this).find('img').attr('src'),
           large: $(this).data('large-url'),
           original: $(this).data('original-url'),
-          name: $(this).data('name')
+          name: $(this).data('name'),
+          hasCredit: $(this).data('has-credit') === true,
+          headline: $(this).data('headline') === true
         };
       }).get();
       cccms.inline_images.items = items;
@@ -293,7 +284,7 @@ cccms = {
         items.forEach(function(item, i) {
           var wrapper = $('<div class="inline_image_picker_item"></div>');
           wrapper.append($('<img>').attr('src', item.thumb).attr('data-index', i));
-          if (i === 0) {
+          if (item.headline) {
             wrapper.append($('<span>', { "class": "inline_image_picker_headline_badge" }).text("Headline"));
           }
           grid.append(wrapper);
@@ -317,8 +308,13 @@ cccms = {
         ? 'inline-image inline-image--full'
         : 'inline-image inline-image--half inline-image--' + placement;
 
-      var html = '<a href="' + item.original + '" class="glightbox" data-gallery="page-' + cccms.inline_images.node_id + '">' +
-                  '<img src="' + item.large + '" class="' + classes + '" alt="' + cccms.inline_images.escape_attr(item.name) + '"></a>';
+      var esc = cccms.inline_images.escape_attr;
+      var titleForGlightbox = (item.name || '').replace(/;/g, ',');
+      var glightboxOpts = 'title: ' + esc(titleForGlightbox) +
+        (item.hasCredit ? '; description: #credit_for_asset_' + esc(item.id) : '') + ';';
+      var html = '<a href="' + esc(item.original) + '" class="glightbox" data-gallery="page-' + esc(cccms.inline_images.node_id) + '"' +
+                 ' data-glightbox="' + glightboxOpts + '">' +
+                 '<img src="' + esc(item.large) + '" class="' + classes + '" alt="' + esc(item.name) + '"></a>';
 
       cccms.inline_images.editor.insertContent(html);
       $('#inline_image_picker').hide();
@@ -356,77 +352,6 @@ menu_item_sorter = {
   }
 }
 
-image_interface = {
-
-  initialize : function() {
-
-    $("#image_browser").hide();
-    image_interface.initialize_sortable_image_box();
-    image_interface.connect_browser_and_box();
-    image_interface.set_droppable_behavior();
-    image_interface.bind_image_browser_toggle();
-  },
-
-
-  set_droppable_behavior : function() {
-    $("ul#image_box").droppable({
-      out : function(event, ui) {
-        $(ui.draggable).fadeTo("fast", 0.4);
-
-        $(ui.draggable).bind("mouseup", function() {
-          $(this).remove();
-        });
-      },
-      over : function(event, ui) {
-        $(ui.draggable).fadeTo("fast", 1.0);
-        $(ui.draggable).unbind("mouseup");
-      }
-    });
-  },
-
-  connect_browser_and_box : function() {
-    $("#image_browser ul li").draggable({
-      connectToSortable : 'ul#image_box',
-      helper : 'clone',
-      revert : 'invalid'
-    });
-  },
-
-  initialize_sortable_image_box : function() {
-
-    $("ul#image_box").sortable({
-      revert  : true,
-      update    : function(event, ui) {
-        images = $("ul#image_box").sortable("serialize", {attribute : "rel"});
-
-        $.ajax({
-          type : "POST",
-          url  : "/pages/" + $("ul#image_box").attr("rel") + "/sort_images",
-          dataType : "json",
-          data : images + "&_method=put",
-          success : function() {
-          }
-        });
-      }
-    });
-  },
-
-  bind_image_browser_toggle : function() {
-    $("#image_browser_toggle").bind("click", function(){
-      if ($("#image_browser_toggle").attr("class") == "unselected") {
-        $("#image_browser_toggle").attr("class", "selected");
-        $("#image_browser").show();
-      }
-      else {
-        $("#image_browser_toggle").attr("class", "unselected");
-        $("#image_browser").hide();
-      }
-
-      return false;
-    });
-  }
-}
-
 rrule_builder = {
   initialize : function() {
     rrule_builder.try_populate_from_rrule($("#event_rrule").val());
diff --git a/public/javascripts/public.js b/public/javascripts/public.js
index a9250ca..7f38f66 100644
--- a/public/javascripts/public.js
+++ b/public/javascripts/public.js
@@ -1,6 +1,25 @@
 document.addEventListener('DOMContentLoaded', function(){
 
-  GLightbox({ selector: '.glightbox' });
+  GLightbox({
+    selector: '.glightbox',
+    afterSlideLoad: function(slideData) {
+      var trigger = document.querySelectorAll('.glightbox')[slideData.index];
+      var selector = trigger && trigger.dataset.creditSelector;
+      if (!selector) return;
+
+      var source = document.querySelector(selector);
+      var container = slideData.slide.querySelector('.gdesc-inner');
+      if (!source || !container) return;
+
+      var target = container.querySelector('.gslide-desc');
+      if (!target) {
+        target = document.createElement('div');
+        target.className = 'gslide-desc';
+        container.appendChild(target);
+      }
+      target.innerHTML = source.innerHTML;
+    }
+  });
 
   document.getElementById("light-mode").addEventListener("change", () => {
     if (document.getElementById("light-mode").checked)
diff --git a/public/javascripts/related_assets.js b/public/javascripts/related_assets.js
index 3340fa7..c6c6a19 100644
--- a/public/javascripts/related_assets.js
+++ b/public/javascripts/related_assets.js
@@ -5,8 +5,6 @@ related_assets = {
     var createUrl = container.data("create-url");
     var list = $("#related_asset_list");
 
-    related_assets.update_headline_badge(list);
-
     initSearchPicker({
       inputSelector: "#related_asset_search_term",
       resultsSelector: "#related_asset_search_results",
@@ -44,7 +42,6 @@ related_assets = {
           url: ui.item.data("url"),
           data: "position=" + newPosition
         });
-        related_assets.update_headline_badge(list);
       }
     });
 
@@ -55,21 +52,29 @@ related_assets = {
         url: item.data("url"),
         success: function() {
           item.remove();
-          related_assets.update_headline_badge(list);
         }
       });
     });
-  },
 
-  update_headline_badge: function(list) {
-    list.find(".related_asset_headline_badge").remove();
-    var first = list.children("li").first();
-    if (first.length) {
-      $("<span>", {
-        "class": "related_asset_headline_badge",
-        "title": "Shown automatically as this page's headline image"
-      }).text("Headline").insertBefore(first.find(".related_asset_remove"));
-    }
+    list.on("click", ".related_asset_set_headline", function() {
+      var button = $(this);
+      var item = button.closest("li");
+      var makeHeadline = button.attr("aria-pressed") !== "true";
+
+      $.ajax({
+        type: "PATCH",
+        url: item.data("url"),
+        data: "headline=" + makeHeadline,
+        success: function() {
+          list.children("li").removeClass("is_headline")
+              .find(".related_asset_set_headline").attr("aria-pressed", "false");
+          if (makeHeadline) {
+            item.addClass("is_headline");
+            button.attr("aria-pressed", "true");
+          }
+        }
+      });
+    });
   },
 
   attach: function(assetId, createUrl, list) {
@@ -81,13 +86,14 @@ related_assets = {
       success: function(related) {
         var item = $($("#related_asset_template").html().trim());
         item.attr("data-url", related.url);
+        item.attr("data-asset-id", related.asset_id);
+        item.attr("data-has-credit", related.has_credit);
         item.attr("data-large-url", related.large_url);
         item.attr("data-original-url", related.original_url);
         item.attr("data-name", related.name);
         item.find("img").attr("src", related.thumb_url);
         list.append(item);
         list.sortable("refresh");
-        related_assets.update_headline_badge(list);
         $("#related_asset_search_term").val("");
         $("#related_asset_search_results").slideUp().empty();
       }