1 files changed, 189 insertions, 151 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 9da5d28..f6d915f 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();
 
@@ -19,15 +7,29 @@ $(document).ready(function () {
     promotion: false,
     menubar: false,
     plugins: 'code link lists visualblocks',
-    toolbar: 'bold italic underline | bullist numlist | link unlink | blocks | code',
-    extended_valid_elements: 'aggregate[children|tags|limit|order_by|order_direction|partial|conditions]',
+    toolbar: 'bold italic underline | bullist numlist | link unlink | insertpageimage | blocks | code',
+    extended_valid_elements: 'aggregate[children|tags|limit|order_by|order_direction|partial|conditions],a[href|target|rel|class|data-gallery],img[class|src|alt|title|width|height|style|border]',
     relative_urls: false,
     entity_encoding: 'raw',
-    valid_classes: { '*': '' },
+    content_style: '.inline-image--full { width: 100%; margin: 1rem 0; } .inline-image--half { width: 48%; margin-bottom: 1rem; } .inline-image--left { float: left; margin-right: 1rem; } .inline-image--right { float: right; margin-left: 1rem; }',
+    valid_classes: {
+      '*': '',
+      'img': 'inline-image inline-image--full inline-image--half inline-image--left inline-image--right',
+      'a': 'glightbox'
+    },
     setup: function(editor) {
       editor.on('init', function() {
         cccms.setup_autosave();
       });
+
+      editor.ui.registry.addButton('insertpageimage', {
+        icon: 'image',
+        text: 'Insert image',
+        tooltip: "Insert one of this page's attached images",
+        onAction: function() {
+          cccms.inline_images.open(editor);
+        }
+      });
     }
   });
 
@@ -43,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();
   }
@@ -55,6 +53,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();
   }
@@ -71,75 +73,38 @@ $(document).ready(function () {
     cccms.preview.initialize();
   }
 
-  if ($('#recent_changes_toggle').length != 0) {
-    hide_all();
-    $('#recent_changes_toggle').attr("class", "selected");
-    $('#recent_changes_table').show();
-
-    $('#recent_changes_toggle').bind("click", function(){
-      hide_all();
-      $('#recent_changes_toggle').attr("class", "selected");
-      $('#recent_changes_table').show();
-      return false;
-    });
-
-    $('#my_work_toggle').bind("click", function(){
-      hide_all();
-      $('#my_work_toggle').attr("class", "selected");
-      $('#my_work_table').show();
-      return false;
-    });
-
-    $('#admin_wizard_my_work').bind("click", function(){
-      hide_all();
-      $('#my_work_toggle').attr("class", "selected");
-      $('#my_work_table').show();
-      return false;
-    });
-
-    $('#current_drafts_toggle').bind("click", function(){
-      hide_all();
-      $('#current_drafts_toggle').attr("class", "selected");
-      $('#current_drafts_table').show();
-      return false;
-    });
-
-    $('#admin_sitemap_toggle').bind("click", function(){
-      hide_all();
-      $('#admin_sitemap_toggle').attr("class", "selected");
-      $('#admin_sitemap_table').show();
-      return false;
-    });
-
-    $('#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);
+    var meta = document.querySelector("meta[name='csrf-token']");
+    if (meta) request.setRequestHeader("X-CSRF-Token", meta.content);
   });
 
-});
+  document.addEventListener('click', function (event) {
+    var button = event.target.closest('.copy_button');
+    if (!button) return;
+
+    var text = button.dataset.copyUrl;
+    if (text === undefined && button.dataset.copyTarget) {
+      var target = document.querySelector(button.dataset.copyTarget);
+      text = target ? target.textContent : undefined;
+    }
 
+    if (!text || text === '—' || !navigator.clipboard) return;
 
-meta_data = {
-  initialize : function() {
-    document.getElementById("metadata_details").addEventListener("toggle", function() {
-      if (this.open) image_interface.initialize();
+    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);
     });
-  }
-};
+  });
+
+});
+
 
 cccms = {
   setup_autosave : function() {
@@ -172,6 +137,10 @@ cccms = {
       options = options || {};
       if (options.force || page.title_has_changed() || page.abstract_has_changed() || page.body_has_changed()) {
 
+        elements.body.find('a.glightbox').each(function() {
+          if ($(this).find('img').length === 0) { $(this).remove(); }
+        });
+
         tinymce.triggerSave();
         page.cached_title      = elements.title.val();
         page.cached_abstract   = elements.abstract.val();
@@ -252,6 +221,104 @@ cccms = {
     refresh_if_open : function() {
       if (cccms.preview.is_open) cccms.preview.refresh();
     }
+  },
+
+  inline_images: {
+    ensure_overlay: function() {
+      if ($('#inline_image_picker').length) return;
+
+      var overlay = $(
+        '<div id="inline_image_picker" style="display:none">' +
+          '<div id="inline_image_picker_grid"></div>' +
+          '<div id="inline_image_picker_actions">' +
+            '<button type="button" data-placement="full">Insert full width</button>' +
+            '<button type="button" data-placement="left">Insert, align left</button>' +
+            '<button type="button" data-placement="right">Insert, align right</button>' +
+            '<button type="button" id="inline_image_picker_cancel">Cancel</button>' +
+          '</div>' +
+        '</div>'
+      );
+      $('body').append(overlay);
+
+      overlay.on('click', '#inline_image_picker_grid img', function() {
+        overlay.find('#inline_image_picker_grid img').removeClass('selected');
+        $(this).addClass('selected');
+        cccms.inline_images.selected_index = $(this).data('index');
+      });
+
+      overlay.on('click', '[data-placement]', function() {
+        cccms.inline_images.insert($(this).data('placement'));
+      });
+
+      overlay.on('click', '#inline_image_picker_cancel', function() {
+        overlay.hide();
+      });
+    },
+
+    open: function(editor) {
+      cccms.inline_images.ensure_overlay();
+      cccms.inline_images.editor = editor;
+
+      var showUrl = $("#page_editor > form").attr("data-show-url") || "";
+      var match = showUrl.match(/(\d+)$/);
+      cccms.inline_images.node_id = match ? match[1] : "";
+
+      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'),
+          hasCredit: $(this).data('has-credit') === true,
+          headline: $(this).data('headline') === true
+        };
+      }).get();
+      cccms.inline_images.items = items;
+
+    var grid = $('#inline_image_picker_grid').empty();
+      if (items.length === 0) {
+        grid.append('<p>No images are attached to this page yet -- attach one from the Images section first.</p>');
+        cccms.inline_images.selected_index = null;
+      } else {
+        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 (item.headline) {
+            wrapper.append($('<span>', { "class": "inline_image_picker_headline_badge" }).text("Headline"));
+          }
+          grid.append(wrapper);
+        });
+        cccms.inline_images.selected_index = 0;
+        grid.find('img').first().addClass('selected');
+      }
+
+      $('#inline_image_picker').show();
+    },
+
+    escape_attr: function(str) {
+      return String(str || '').replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    },
+
+    insert: function(placement) {
+      var item = cccms.inline_images.items[cccms.inline_images.selected_index];
+      if (!item) return;
+
+      var classes = placement === 'full'
+        ? 'inline-image inline-image--full'
+        : 'inline-image inline-image--half inline-image--' + placement;
+
+      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();
+    }
   }
 }
 
@@ -285,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());
@@ -367,8 +363,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();
@@ -385,6 +383,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 = [];
@@ -400,7 +404,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());
+        }
       }
     }
 
@@ -435,8 +448,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]);