Update OpenSearch plugin to work with new search system.

[rails.git] / app / views / site / _search.rhtml

diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml
index 8e5a8b764a8d1cfbe5ef126115bebc0925a8aed7..f6d9cb5902c8966043a873ad15c3e3dcd94c6f29 100644 (file)
--- a/app/views/site/_search.rhtml
+++ b/app/views/site/_search.rhtml
@@ -1,10 +1,42 @@
+<div id="search_results">
+  <table class="search_results_title" width="100%">
+    <tr>
+      <td align="left">Search Results</td>
+      <td align="right"><a href="javascript:closeSearchResults()">Close</a></td>
+    </tr>
+  </table>
+  <div id="search_results_content">
+  </div>
+</div>
+
+<script type="text/javascript">
+<!--
+  function openSearchResults() {
+    $("search_results").style.display = "block";
+    $("search_results_content").innerHTML = "<p class='search_results_entry'>Searching...</p>";
+    <%= onopen %>
+  }
+
+  function closeSearchResults() {
+    $("search_results").style.display = "none";
+    <%= onclose %>
+  }
+
+  <% if params[:query] %>
+  <%= remote_function(:update => :search_results_content, 
+                      :loading => "openSearchResults()",
+                      :url => { :controller => :geocoder, :action => :search, :query => params[:query] }) %>
+  <% end %>
+// -->
+</script>
+
 <% content_for "optionals" do %>
   <div class="optionalbox">
     <span class="oboxheader">Search</span>
     <% form_remote_tag(:update => :search_results_content, 
                        :loading => "openSearchResults()",
-                       :url => { :controller => :geocoder, :action => :search } ) do %>
-      <%= text_field_tag :query, nil, :size => 16 %>
+                       :url => { :controller => :geocoder, :action => :search }) do %>
+      <%= text_field_tag :query, params[:query] %>
     <% end %>
     <p class="search_help">
       examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ',
@@ -12,29 +44,4 @@
       <a href="http://wiki.openstreetmap.org/index.php/Name_finder#Searching_for_things">more examples...</a>
     </p>
   </div>
-  <script type="text/javascript">
-  <!--
-    function openSearchResults() {
-      $("search_results").style.display = "block";
-      $("search_results_content").innerHTML = "<p class='search_results_entry'>Searching...</p>";
-      <%= onopen %>
-    }
-
-    function closeSearchResults() {
-      $("search_results").style.display = "none";
-      <%= onclose %>
-    }
-  // -->
-  </script>
 <% end %>
-
-<div id="search_results">
-  <table class="search_results_title" width="100%">
-    <tr>
-      <td align="left">Search Results</td>
-      <td align="right"><a href="javascript:closeSearchResults()">Close</a></td>
-    </tr>
-  </table>
-  <div id="search_results_content">
-  </div>
-</div>