7 files changed, 61 insertions, 3 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 55c66cf..8d7d2ea 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -12,4 +12,19 @@ class AdminController < ApplicationController
     )
   end
   
+  def search
+    @results = Node.search params[:search_term]
+    
+    respond_to do |format|
+      format.html
+      format.js do 
+        render( :json => @results.map do |node| 
+          {:id => node.id, :title => node.title} 
+          end
+        )
+        
+      end 
+    end
+  end
+  
 end
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 7902cae..fea6b5a 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -9,6 +9,7 @@
     <%= stylesheet_link_tag 'admin' %>
     <%= javascript_include_tag 'jquery-1.3.2.min' %>
     <%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
+    <%= javascript_include_tag 'admin_search.js' %>
     <%= javascript_include_tag 'admin_interface.js' %>
     
     <script type="text/javascript">
@@ -38,6 +39,11 @@
       <div id="subnavigation">
         <%= yield :subnavigation %>
       </div>
+      <div id="admin_search">
+        <% form_tag admin_search_path do %>
+          <%= text_field_tag :search_term %>
+        <% end %>
+      </div>
       <div style="clear: both"></div>
       <div id="flash">
         <%= flash[:notice] %>
@@ -45,6 +51,8 @@
       <div id="content">
         <%= yield :layout %>
       </div>
+      
+      <div id="results"></div>
     </div>
   </body>
 </html>
diff --git a/config/routes.rb b/config/routes.rb
index bf4ba10..7456b60 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,8 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :assets
 
-
-
   map.filter :locale
   
   map.root( 
@@ -19,6 +17,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :nodes, :member => {:publish => :put, :unlock => :put}  
   map.logout '/logout', :controller => 'sessions', :action => 'destroy'
   map.login '/login',   :controller => 'sessions', :action => 'new'
+  map.admin_search 'admin/search', :controller => 'admin', :action => 'search'
   map.resources :users
   map.resource  :session
   
diff --git a/config/sphinx.yml b/config/sphinx.yml
new file mode 100644
index 0000000..3924be2
--- /dev/null
+++ b/config/sphinx.yml
@@ -0,0 +1,3 @@
+development:
+  enable_star: 1
+  min_infix_len: 1
\ No newline at end of file
diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 0085bc2..5fe91a2 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -1,4 +1,6 @@
 $(document).ready(function () {
+  admin_search.initialize();
+  
   $("#metadata").attr("style", "display: none;");
   
   $("#button").click(function () {
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
new file mode 100644
index 0000000..d645cca
--- /dev/null
+++ b/public/javascripts/admin_search.js
@@ -0,0 +1,28 @@
+admin_search = {
+  
+  initialize : function() {
+    $("#search_term").bind("keyup", function() {
+      if ($(this).attr("value")) {
+        $.ajax({
+          type: "GET",
+          url: "/admin/search",
+          data: "search_term=" + $(this).attr("value"),
+          dataType: "json",
+          success : function(results) {
+            admin_search.show_results(results);
+          }
+        });
+      }
+      else {
+        $('#results').empty(); 
+      }
+    });
+  },
+  
+  show_results : function(results) {
+    $('#results').empty();
+    for (result in results) {
+      $('#results').append("<p>" + results[result].title + "</p>");
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 982a231..e077918 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -64,7 +64,7 @@ div.pagination span.current, div.pagination a:hover {
   text-align: right;
 }
 
-#navigation {
+#navigation, #subnavigation {
   margin-left: 0px;
   float: left;
 }
@@ -100,6 +100,9 @@ div.pagination span.current, div.pagination a:hover {
   background-color: #000000;
 }
 
+#admin_search {
+}
+
 /* Nodes */
 
 table#node_table {