3 files changed, 79 insertions, 10 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 3988016..b7bdc10 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -57,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();
   }
@@ -78,10 +82,8 @@ $(document).ready(function () {
   });
 
   $(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);
   });
 
 });
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index d135503..b53c931 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -262,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/stylesheets/admin.css b/public/stylesheets/admin.css
index 0aa22f8..0e11747 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 {
@@ -881,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
    ============================================================ */
@@ -1499,10 +1506,6 @@ div#image_browser ul li {
    Action log
    ============================================================ */
 
-#dashboard_widget td.node_action_time {
-  white-space: wrap;
-}
-
 #node_action_list td.node_action_body {
   border-bottom: 1px solid #f1f1f1;
 }
@@ -1510,12 +1513,20 @@ div#image_browser ul li {
 #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 .node_action_date {
+  display: block;
+}
+
+#node_action_list .node_action_clock {
+  float: right;
+  margin-top: 0.2rem;
+}
+
 #node_action_list td.node_action_body {
   vertical-align: top;
 }
@@ -1532,7 +1543,50 @@ div#image_browser ul li {
 }
 
 .node_action_details summary {
+  margin-top: 0.2rem;
   cursor: pointer;
   font-size: smaller;
   color: #777;
 }
+
+.node_action_icon {
+  color: #777;
+  margin-right: 0.35em;
+  vertical-align: text-top;
+}
+
+.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;
+}