1 files changed, 78 insertions, 69 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 0c9ec66..7fb1dc2 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -1,15 +1,3 @@
-function hide_all() {
-    $('#recent_changes_toggle').attr("class", "unselected");
-    $('#my_work_toggle').attr("class", "unselected");
-    $('#current_drafts_toggle').attr("class", "unselected");
-    $('#admin_sitemap_toggle').attr("class", "unselected");
-
-    $('#current_drafts_table').hide();
-    $('#my_work_table').hide();
-    $('#recent_changes_table').hide();
-    $('#admin_sitemap_table').hide();
-}
-
 $(document).ready(function () {
   admin_search.initialize();
 
@@ -69,6 +57,10 @@ $(document).ready(function () {
     move_to_search.initialize_search();
   }
 
+  if ($("#restore_search_term").length != 0) {
+    restore_search.initialize_search();
+  }
+
   if ($("#event_node_search_term").length != 0) {
     event_search.initialize_search();
   }
@@ -85,63 +77,34 @@ $(document).ready(function () {
     cccms.preview.initialize();
   }
 
-  if ($('#recent_changes_toggle').length != 0) {
-    hide_all();
-    $('#recent_changes_toggle').attr("class", "selected");
-    $('#recent_changes_table').show();
+  jQuery.ajaxSetup({
+    'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript");}
+  });
 
-    $('#recent_changes_toggle').bind("click", function(){
-      hide_all();
-      $('#recent_changes_toggle').attr("class", "selected");
-      $('#recent_changes_table').show();
-      return false;
-    });
+  $(document).ajaxSend(function(event, request, settings) {
+    var meta = document.querySelector("meta[name='csrf-token']");
+    if (meta) request.setRequestHeader("X-CSRF-Token", meta.content);
+  });
 
-    $('#my_work_toggle').bind("click", function(){
-      hide_all();
-      $('#my_work_toggle').attr("class", "selected");
-      $('#my_work_table').show();
-      return false;
-    });
+  document.addEventListener('click', function (event) {
+    var button = event.target.closest('.copy_button');
+    if (!button) return;
 
-    $('#admin_wizard_my_work').bind("click", function(){
-      hide_all();
-      $('#my_work_toggle').attr("class", "selected");
-      $('#my_work_table').show();
-      return false;
-    });
+    var text = button.dataset.copyUrl;
+    if (text === undefined && button.dataset.copyTarget) {
+      var target = document.querySelector(button.dataset.copyTarget);
+      text = target ? target.textContent : undefined;
+    }
 
-    $('#current_drafts_toggle').bind("click", function(){
-      hide_all();
-      $('#current_drafts_toggle').attr("class", "selected");
-      $('#current_drafts_table').show();
-      return false;
-    });
+    if (!text || text === '—' || !navigator.clipboard) return;
 
-    $('#admin_sitemap_toggle').bind("click", function(){
-      hide_all();
-      $('#admin_sitemap_toggle').attr("class", "selected");
-      $('#admin_sitemap_table').show();
-      return false;
+    navigator.clipboard.writeText(text).then(function () {
+      var label = button.querySelector('.copy_button_label');
+      if (!label) return;
+      var original = label.textContent;
+      label.textContent = 'Copied!';
+      setTimeout(function () { label.textContent = original; }, 1500);
     });
-
-    $('#admin_wizard_create_page').bind("click", function(){
-      hide_all();
-      $('#admin_sitemap_toggle').attr("class", "selected");
-      $('#admin_sitemap_table').show();
-      return false;
-    });
-  }
-
-  jQuery.ajaxSetup({
-    'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript");}
-  });
-
-  $(document).ajaxSend(function(event, request, settings) {
-    if (typeof(AUTH_TOKEN) == "undefined") return;
-    // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
-    settings.data = settings.data || "";
-    settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
   });
 
 });
@@ -314,10 +277,12 @@ 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'),
+          headline: $(this).data('headline') === true
         };
       }).get();
       cccms.inline_images.items = items;
@@ -330,7 +295,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);
@@ -354,8 +319,10 @@ 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 html = '<a href="' + esc(item.original) + '" class="glightbox" data-gallery="page-' + esc(cccms.inline_images.node_id) + '"' +
+                 ' data-title="' + esc(item.name) + '" data-description="#credit_for_asset_' + esc(item.id) + '">' +
+                 '<img src="' + esc(item.large) + '" class="' + classes + '" alt="' + esc(item.name) + '"></a>';
 
       cccms.inline_images.editor.insertContent(html);
       $('#inline_image_picker').hide();
@@ -475,8 +442,10 @@ rrule_builder = {
     });
     $("#rrule_monthly_ordinal").bind("change", function() {
       $("#rrule_ordinal_fields").toggle($(this).is(":checked"));
+      rrule_builder.toggle_custom_ordinal_fields();
       rrule_builder.sync();
     });
+    $("#rrule_ordinal").bind("change", rrule_builder.toggle_custom_ordinal_fields);
     $("#rrule_exclude_month").bind("change", function() {
       $("#rrule_excluded_month").toggle($(this).is(":checked"));
       rrule_builder.sync();
@@ -493,6 +462,12 @@ rrule_builder = {
     $("#rrule_monthly_options").show();
   },
 
+  toggle_custom_ordinal_fields : function() {
+    $("#rrule_custom_ordinal_fields").toggle(
+      $("#rrule_monthly_ordinal").is(":checked") && $("#rrule_ordinal").val() === "custom"
+    );
+  },
+
   sync : function() {
     var freq = $("input[name='rrule_freq']:checked").val();
     var parts = [];
@@ -508,7 +483,16 @@ rrule_builder = {
     } else {
       parts.push("FREQ=MONTHLY");
       if ($("#rrule_monthly_ordinal").is(":checked")) {
-        parts.push("BYDAY=" + $("#rrule_ordinal").val() + $("#rrule_ordinal_day").val());
+        var ordinal = $("#rrule_ordinal").val();
+        if (ordinal === "custom") {
+          var customDays = [];
+          $("input[id^='rrule_custom_ordinal_']:checked").each(function() {
+            customDays.push($(this).attr("id").replace("rrule_custom_ordinal_", "") + $("#rrule_ordinal_day").val());
+          });
+          if (customDays.length > 0) parts.push("BYDAY=" + customDays.join(","));
+        } else {
+          parts.push("BYDAY=" + ordinal + $("#rrule_ordinal_day").val());
+        }
       }
     }
 
@@ -543,8 +527,33 @@ rrule_builder = {
     } else if (parts.FREQ === "MONTHLY") {
       $("input[name='rrule_freq'][value='monthly']").prop("checked", true);
       rrule_builder.show_monthly_options();
+      var ordinalDays = parts.BYDAY && parts.BYDAY.split(",");
+      var customOrdinalDay = null;
+      var customOrdinals = [];
+      var customOrdinalsValid = ordinalDays && ordinalDays.length > 0;
+      if (customOrdinalsValid) {
+        ordinalDays.forEach(function(value) {
+          var customMatch = value.match(/^([1-5])([A-Z]{2})$/);
+          if (!customMatch || (customOrdinalDay && customOrdinalDay !== customMatch[2])) {
+            customOrdinalsValid = false;
+            return;
+          }
+          customOrdinalDay = customMatch[2];
+          customOrdinals.push(customMatch[1]);
+        });
+      }
+
       var match = parts.BYDAY && parts.BYDAY.match(/^(-?\d+)([A-Z]{2})$/);
-      if (match) {
+      if (customOrdinalsValid && (customOrdinals.length > 1 || customOrdinals[0] === "5")) {
+        $("#rrule_monthly_ordinal").prop("checked", true);
+        $("#rrule_ordinal_fields").show();
+        $("#rrule_ordinal").val("custom");
+        $("#rrule_ordinal_day").val(customOrdinalDay);
+        customOrdinals.forEach(function(ordinal) {
+          $("#rrule_custom_ordinal_" + ordinal).prop("checked", true);
+        });
+        rrule_builder.toggle_custom_ordinal_fields();
+      } else if (match) {
         $("#rrule_monthly_ordinal").prop("checked", true);
         $("#rrule_ordinal_fields").show();
         $("#rrule_ordinal").val(match[1]);