1 files changed, 24 insertions, 87 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index e9f96c2..5514f3b 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();
   }
@@ -69,6 +65,10 @@ $(document).ready(function () {
     related_assets.initialize();
   }
 
+  if ($("#asset_node_search_term").length != 0) {
+    asset_node_search.initialize_search();
+  }
+
   if ($("#rrule_builder").length != 0) {
     rrule_builder.initialize();
   }
@@ -77,6 +77,14 @@ $(document).ready(function () {
     cccms.preview.initialize();
   }
 
+  var metadata_details = document.getElementById('metadata_details');
+  if (metadata_details) {
+    var desktop_mq = window.matchMedia('(min-width: 1016px)');
+    var sync_metadata = function() { metadata_details.open = desktop_mq.matches; };
+    sync_metadata();
+    desktop_mq.addEventListener('change', sync_metadata);
+  }
+
   jQuery.ajaxSetup({
     'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript");}
   });
@@ -110,14 +118,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 +277,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 +296,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 +320,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 +364,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());