5 files changed, 442 insertions, 92 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 9da5d28..b7bdc10 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);
+        }
+      });
     }
   });
 
@@ -55,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();
   }
@@ -71,63 +77,13 @@ $(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);
   });
 
 });
@@ -172,6 +128,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 +212,96 @@ 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 {
+          thumb: $(this).find('img').attr('src'),
+          large: $(this).data('large-url'),
+          original: $(this).data('original-url'),
+          name: $(this).data('name')
+        };
+      }).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 (i === 0) {
+            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 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>';
+
+      cccms.inline_images.editor.insertContent(html);
+      $('#inline_image_picker').hide();
+    }
   }
 }
 
@@ -367,8 +417,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 +437,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 +458,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 +502,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]);
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index 7604bb7..b53c931 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -72,24 +72,20 @@ function initSearchPicker(options) {
           found = false;
           for (var i = 0; i < data.length; i++) {
             (function(node) {
-              var link;
+              var anchor = $("<a>").attr("href", onSelect ? "#" : node.node_path);
+              anchor.append(document.createTextNode(node.title || ""));
+              anchor.append($("<span>", { "class": "result_path" }).text(node.unique_name || ""));
+              var link = $("<p>").append(anchor);
+
               if (onSelect) {
-                link = $(
-                  "<p><a href='#'>" + node.title +
-                    "<span class='result_path'>" + node.unique_name + "</span></a></p>"
-                );
-                link.find("a").bind("click", function() {
+                anchor.bind("click", function() {
                   onSelect(node);
                   results.slideUp();
                   results.empty();
                   return false;
                 });
-              } else {
-                link = $(
-                  "<p><a href='" + node.node_path + "'>" + node.title +
-                    "<span class='result_path'>" + node.unique_name + "</span></a></p>"
-                );
               }
+
               results.append(link);
               found = true;
             })(data[i]);
@@ -150,7 +146,9 @@ dashboard_search = {
           results.append("<p class='search_group_label'>Tags</p>");
           var tag_row = $("<div class='search_tag_row'></div>");
           data.tags.forEach(function(tag) {
-            tag_row.append("<a class='search_tag_pill' href='" + tag.tag_path + "'>" + tag.name + "</a>");
+            tag_row.append(
+              $("<a>", { "class": "search_tag_pill" }).attr("href", tag.tag_path).text(tag.name || "")
+            );
             found = true;
           });
           results.append(tag_row);
@@ -159,10 +157,10 @@ dashboard_search = {
         if (data.nodes.length) {
           results.append("<p class='search_group_label'>Pages</p>");
           data.nodes.forEach(function(node) {
-            results.append(
-              "<p><a href='" + node.node_path + "'>" + node.title +
-                "<span class='result_path'>" + node.unique_name + "</span></a></p>"
-            );
+            var anchor = $("<a>").attr("href", node.node_path);
+            anchor.append(document.createTextNode(node.title || ""));
+            anchor.append($("<span>", { "class": "result_path" }).text(node.unique_name || ""));
+            results.append($("<p>").append(anchor));
             found = true;
           });
         }
@@ -264,6 +262,19 @@ move_to_search = {
   }
 };
 
+restore_search = {
+  initialize_search : function() {
+    initSearchPicker({
+      inputSelector: "#restore_search_term",
+      resultsSelector: "#restore_search_results",
+      onSelect: function(node) {
+        $("#restore_search_term").val(node.title);
+        $("#parent_id").val(node.node_id);
+      }
+    });
+  }
+};
+
 event_search = {
   initialize_search : function() {
     initSearchPicker({
diff --git a/public/javascripts/related_assets.js b/public/javascripts/related_assets.js
index 2955cbf..3340fa7 100644
--- a/public/javascripts/related_assets.js
+++ b/public/javascripts/related_assets.js
@@ -5,6 +5,8 @@ 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",
@@ -13,12 +15,9 @@ related_assets = {
       renderResults: function(data, results) {
         var found = false;
         data.forEach(function(asset) {
-          var item = $(
-            "<a href='#' class='related_asset_result'>" +
-              "<img src='" + asset.thumb_url + "' alt=''>" +
-              "<span>" + asset.name + "</span>" +
-            "</a>"
-          );
+          var item = $("<a>", { href: "#", "class": "related_asset_result" });
+          item.append($("<img>", { src: asset.thumb_url, alt: "" }));
+          item.append($("<span>").text(asset.name || ""));
           item.bind("click", function() {
             related_assets.attach(asset.id, createUrl, list);
             return false;
@@ -45,6 +44,7 @@ related_assets = {
           url: ui.item.data("url"),
           data: "position=" + newPosition
         });
+        related_assets.update_headline_badge(list);
       }
     });
 
@@ -55,11 +55,23 @@ 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"));
+    }
+  },
+
   attach: function(assetId, createUrl, list) {
     $.ajax({
       type: "POST",
@@ -69,9 +81,13 @@ related_assets = {
       success: function(related) {
         var item = $($("#related_asset_template").html().trim());
         item.attr("data-url", related.url);
+        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();
       }
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 5f7723b..05e47e7 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -37,10 +37,13 @@ td {
    depend on this rule for vertical padding. table.node_table td resets
    padding-top/bottom to 0 explicitly and does not depend on it. */
 
-input[type=text], textarea {
+input[type=text],
+input[type=password],
+textarea {
   font-size: 1rem;
   font-family: Helvetica;
   border: 1px solid #989898;
+  border-radius: 2px;
 }
 
 select {
@@ -764,6 +767,15 @@ table.user_table td.user_login {
   display: block;
 }
 
+.node_content .inline-image--full,
+.node_content .inline-image--half {
+  max-width: 300px;
+  width: auto;
+  float: none;
+  display: block;
+  margin: 0.5rem 0;
+}
+
 .action_button,
 form.button_to input[type="submit"],
 form.button_to button[type="submit"] {
@@ -872,6 +884,10 @@ form.button_to button[type="submit"] {
   margin-top: -5px;
 }
 
+.aligned_action_row .action_button.action_button_no_margin_top {
+  margin-top: 0;
+}
+
 /* ============================================================
    Page editor / metadata forms
    ============================================================ */
@@ -1112,6 +1128,25 @@ div#draft_list table td.actions a {
   font-size: 0.9em;
 }
 
+#recent_changes_full_list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+#recent_changes_full_list li {
+  padding: 0.75rem 0;
+  border-bottom: 1px solid #eee;
+}
+
+#recent_changes_full_list li:last-child {
+  border-bottom: none;
+}
+
+#recent_changes_full_list li > div {
+  margin-bottom: 0.25rem;
+}
+
 /* ============================================================
    Search widgets
    ============================================================ */
@@ -1292,6 +1327,15 @@ div#image_browser ul li {
   height: 1rem;
 }
 
+.related_asset_headline_badge {
+  background: #fff3cd;
+  color: #6b5900;
+  border-radius: 999px;
+  padding: 0.1rem 0.6rem;
+  font-size: 0.75em;
+  white-space: nowrap;
+}
+
 .related_asset_remove {
   display: flex;
   align-items: center;
@@ -1392,3 +1436,152 @@ div#image_browser ul li {
   border-color: #a9c6e8;
   color: #1a4d8f;
 }
+
+/* ============================================================
+   Image picker
+   ============================================================ */
+
+#inline_image_picker {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  transform: translateX(-50%);
+  background: #fff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  padding: 1rem;
+  max-width: 480px;
+  max-height: 70vh;
+  overflow-y: auto;
+  z-index: 1000;
+  box-shadow: 0 4px 16px rgba(0,0,0,0.2);
+}
+
+#inline_image_picker_grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-bottom: 1rem;
+}
+
+.inline_image_picker_item {
+  position: relative;
+}
+
+#inline_image_picker_grid img {
+  width: 80px;
+  height: 80px;
+  object-fit: cover;
+  border-radius: 4px;
+  cursor: pointer;
+  border: 2px solid transparent;
+  display: block;
+}
+
+.inline_image_picker_headline_badge {
+  position: absolute;
+  bottom: 2px;
+  left: 2px;
+  right: 2px;
+  background: rgba(255, 243, 205, 0.95);
+  color: #6b5900;
+  font-size: 0.65em;
+  text-align: center;
+  border-radius: 3px;
+  padding: 1px 0;
+  pointer-events: none;
+}
+
+#inline_image_picker_grid img.selected {
+  border-color: #1a4d8f;
+}
+
+#inline_image_picker_actions {
+  display: flex;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+/* ============================================================
+   Action log
+   ============================================================ */
+
+#node_action_list td.node_action_body {
+  border-bottom: 1px solid #f1f1f1;
+}
+
+.dashboard_widget .node_action_time span {
+  display: block;
+}
+
+#node_action_list td.node_action_time {
+  white-space: nowrap;
+  vertical-align: top;
+  font-family: monospace;
+  font-size: 0.8em;
+  color: #777;
+  padding-right: 1em;
+}
+
+#node_action_list td.node_action_body {
+  vertical-align: top;
+}
+
+.node_action_inferred {
+  opacity: 0.5;
+  font-size: smaller;
+  margin-left: 0.5em;
+}
+
+.node_action_zoom {
+  font-size: smaller;
+  margin-left: 0.5em;
+}
+
+.node_action_details summary {
+  cursor: pointer;
+  font-size: smaller;
+  color: #777;
+}
+
+.node_action_icon {
+  color: #777;
+  margin-right: 0.35em;
+  vertical-align: text-bottom;
+}
+
+.revision_lifecycle {
+  font-size: 0.85rem;
+  color: #777;
+}
+
+/* ============================================================
+   Trash section
+   ============================================================ */
+
+.restore_form {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.restore_picker {
+  position: relative;
+}
+
+.restore_picker input[type=text] {
+  width: 22em;
+}
+
+.restore_picker .search_results {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  z-index: 10;
+  background: #fff;
+  border: 1px solid #989898;
+  border-top: none;
+  max-height: 20em;
+  overflow-y: auto;
+}
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index fe2144f..cbeea17 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -610,3 +610,41 @@ label[for=light-mode] {
   }
 }
 
+.chapter_partial_layout {
+  display: flex;
+  gap: 12px;
+  align-items: flex-start;
+}
+
+.chapter_thumbnail img {
+  width: 64px;
+  height: 64px;
+  object-fit: cover;
+  border-radius: 4px;
+  display: block;
+}
+
+.chapter_partial_content {
+  min-width: 0;
+}
+
+
+.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;
+}