6 files changed, 21 insertions, 10 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 9e8564e..1a94a77 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -35,12 +35,12 @@ class AdminController < ApplicationController
    
    respond_to do |format|
      format.html do
-        render :template => 'admin/search_results.html'
+        render :template => 'admin/search_results'
      end
      format.js do 
        render( :json => @results.map do |node| 
            if node
-              {:id => node.id, :title => node.title, :edit_path => node_path(node)}
+              {:id => node.id, :title => " #{node.title} (#{node.unique_name})", :edit_path => edit_node_path(node)}
            end
          end
        )
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 6f217eb..6dba085 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,6 +1,7 @@
 <%= language_selector %>
 <%= button_to 'Logout', logout_path, method: :delete %>
 <%= link_to 'Overview', admin_path %>
+<a href="#" onclick="admin_search.display_toggle(); return false;">search</a>
 <%= link_to 'Nodes', nodes_path, selected?('nodes') %>
 <%= link_to 'Assets', assets_path, selected?('assets') %>
 <%= link_to 'User', users_path, selected?('users') %>
diff --git a/app/views/admin/search_results.html.erb b/app/views/admin/search_results.html.erb
index 671b665..f8aece0 100644
--- a/app/views/admin/search_results.html.erb
+++ b/app/views/admin/search_results.html.erb
@@ -2,6 +2,6 @@
 <ul>
 <%- @results.each do |result| %>
-  <li><a href="<%= node_path(result) %>"><%= result.title %></a></li>
+  <li><%= link_to "#{result.title} (#{result.unique_name})", edit_node_path(result) %></li>
 <% end %>
 </ul>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 890aeaa..c1cada3 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -13,6 +13,10 @@
    <link rel="stylesheet" href="/stylesheets/admin.css">
    <script src="/javascripts/admin_search.js"></script>
    <script src="/javascripts/admin_interface.js"></script>
+    <script>
+      var ADMIN_SEARCH_URL = "<%= admin_search_path %>";
+      var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>";
+    </script>
  </head>
  
  <body>
@@ -41,7 +45,7 @@
    
    <div id="search_widget" style="display: none;">
      <div>
-        <% form_tag admin_search_path do %>
+        <%= form_tag admin_search_path, method: :get do %>
          <span>Search: </span><%= text_field_tag :search_term %>
        <% end %>
      </div>
diff --git a/config/routes.rb b/config/routes.rb
index 92f2452..88f49a2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,6 +54,7 @@ Cccms::Application.routes.draw do
    match '/login'       => 'sessions#new',     :as => :login,        :via => :get
    match 'admin'        => 'admin#index',      :as => :admin,        :via => :get
    match 'admin/search' => 'admin#search',     :as => :admin_search, :via => :get
+    match 'admin/menu_search' => 'admin#menu_search', :as => :admin_menu_search, :via => :get
    match 'search'       => 'search#index',     :as => :search,       :via => :get
    resources :users
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index 78577e7..8ff0db1 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -18,14 +18,19 @@ admin_search = {
    }
    $("#search_term").bind("keyup", function() {
-      if ($(this).attr("value")) {
+      console.log("keyup fired, value:", $(this).val());
+      if ($(this).val()) {
+        console.log("sending ajax to", ADMIN_SEARCH_URL);
        $.ajax({
          type: "GET",
-          url: "/admin/search",
+          url: ADMIN_SEARCH_URL,
-          data: "search_term=" + $(this).attr("value"),
+          data: "search_term=" + $(this).val(),
          dataType: "json",
          success : function(results) {
            admin_search.show_results(results);
+          },
+          error: function(xhr, status, error) {
+            console.log("Ajax error:", status, error, xhr.status, xhr.responseText);
          }
        });
      }
@@ -52,7 +57,7 @@ menu_items = {
      if ($(this).attr("value")) {
        $.ajax({
          type: "GET",
-          url: "/admin/menu_search",
+          url: ADMIN_MENU_SEARCH_URL,
          data: "search_term=" + $(this).attr("value"),
          dataType: "json",
          success : function(results) {
@@ -104,7 +109,7 @@ parent_search = {
      if ($(this).attr("value")) {
        $.ajax({
          type: "GET",
-          url: "/admin/menu_search",
+          url: ADMIN_MENU_SEARCH_URL,
          data: "search_term=" + $(this).attr("value"),
          dataType: "json",
          success : function(results) {
@@ -184,7 +189,7 @@ move_to_search = {
    if (_this.attr("value")) {
      $.ajax({
        type: "GET",
-        url: "/admin/menu_search",
+        url: ADMIN_MENU_SEARCH_URL,
        data: "search_term=" + _this.attr("value"),
        dataType: "json",
        success : function(results) {