3 files changed, 112 insertions, 40 deletions

diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index 4e1ef53..b20fe48 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -1,47 +1,56 @@
 <h1>New event</h1>
 
+<%= link_to 'Back', safe_return_to(params[:return_to] || events_path) %>
+
 <%= form_for(@event) do |f| %>
   <%= form_error_messages(f) %>
 
-  <p>
-    <%= f.label :start_time %><br />
-    <%= f.datetime_select :start_time %>
-  </p>
-  <p>
-    <%= f.label :end_time %><br />
-    <%= f.datetime_select :end_time %>
-  </p>
-  <p>
-    <%= f.label :rrule %><br />
-    <%= f.text_field :rrule %>
-  </p>
-  <p>
-    <%= f.label :tag_list, "Tags" %><br />
-    <%= f.text_field :tag_list %>
-  </p>
-  <p>
-    <%= f.label :allday %><br />
-    <%= f.check_box :allday %>
-  </p>
-  <p>
-    <%= f.label :url %><br />
-    <%= f.text_field :url %>
-  </p>
-  <p>
-    <%= f.label :latitude %><br />
-    <%= f.text_field :latitude %>
-  </p>
-  <p>
-    <%= f.label :longitude %><br />
-    <%= f.text_field :longitude %>
-  </p>
-  <p>
-    <%= f.hidden_field :node_id %>
-    <%= hidden_field_tag :return_to, params[:return_to] %>
-  </p>
-  <p>
-    <%= f.submit 'Create' %>
-  </p>
+  <div id="page_editor">
+    <div id="content">
+      <div class="node_description">Node</div>
+      <div class="node_content">
+        <%= text_field_tag :event_node_search_term %>
+        <div id="search_results"></div>
+        <%= f.hidden_field :node_id %>
+        <span class="field_hint">Optional — search and pick a node to associate this event with a page.</span>
+      </div>
+
+      <div class="node_description">Start time</div>
+      <div class="node_content"><%= f.datetime_select :start_time %></div>
+
+      <div class="node_description">End time</div>
+      <div class="node_content"><%= f.datetime_select :end_time %></div>
+
+      <div class="node_description">Rrule</div>
+      <div class="node_content"><%= f.text_field :rrule %></div>
+
+      <div class="node_description">Title</div>
+      <div class="node_content">
+        <%= f.text_field :title %>
+        <span id="event_title_hint" class="field_hint">Optional — if left blank, the associated node's title is used.</span>
+      </div>
+
+      <div class="node_description">Tags</div>
+      <div class="node_content"><%= f.text_field :tag_list %></div>
+
+      <div class="node_description">Allday</div>
+      <div class="node_content"><%= f.check_box :allday %></div>
+
+      <div class="node_description">Url</div>
+      <div class="node_content"><%= f.text_field :url %></div>
+
+      <div class="node_description">Latitude</div>
+      <div class="node_content"><%= f.text_field :latitude %></div>
+
+      <div class="node_description">Longitude</div>
+      <div class="node_content"><%= f.text_field :longitude %></div>
+
+      <div class="node_description"></div>
+      <div class="node_content"><%= hidden_field_tag :return_to, params[:return_to] %></div>
+
+      <div class="node_description"></div>
+      <div class="node_content"><%= f.submit 'Create' %></div>
+    </div>
+  </div>
 <% end %>
 
-<%= link_to 'Back', safe_return_to(params[:return_to] || events_path) %>
diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 4107ce8..8ca5b5e 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -51,6 +51,10 @@ $(document).ready(function () {
     move_to_search.initialize_search();
   }
 
+  if ($("#event_node_search_term").length != 0) {
+    event_search.initialize_search();
+  }
+
   if ($("#rrule_builder").length != 0) {
     rrule_builder.initialize();
   }
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index 6ef9087..5be5d57 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -283,3 +283,62 @@ move_to_search = {
     return barf;
   }
 }
+
+event_search = {
+  initialize_search : function() {
+    $("#event_node_search_term").bind("input", function() {
+      if ($(this).val()) {
+        $.ajax({
+          type: "GET",
+          url: ADMIN_MENU_SEARCH_URL,
+          data: "search_term=" + $(this).val(),
+          dataType: "json",
+          success : function(results) {
+            event_search.show_results(results);
+          }
+        });
+      }
+      else {
+        $('#search_results').slideUp();
+        $('#search_results').empty();
+      }
+    });
+  },
+
+  show_results : function(results) {
+    $("#search_results").empty();
+    var found = false;
+    for (result in results) {
+      var link = $((
+        "<p><a href='#'>" + results[result].title +
+          "<span class='result_path'>" + results[result].unique_name + "</span>" +
+        "</a></p>"));
+
+      $(link).bind("click", event_search.link_closure(results[result]));
+
+      $("#search_results").append(link);
+      found = true;
+    }
+    if (found)
+      $('#search_results').slideDown();
+    else
+      $('#search_results').slideUp();
+  },
+
+  link_closure : function(node) {
+    var barf = function(){
+      $("#event_node_search_term").val(node.title);
+      $("#event_node_id").val(node.node_id);
+      $('#search_results').slideUp();
+      $('#search_results').empty();
+
+      var title_field = $("#event_title");
+      if (title_field.val() === "") {
+        $("#event_title_hint").text("Using \"" + node.title + "\" from the associated node.");
+      }
+
+      return false;
+    }
+    return barf;
+  }
+};