Revert to using join instead of to_sentence for now as to_sentence is

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

diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml
index f6d9cb5902c8966043a873ad15c3e3dcd94c6f29..b57a1f984f0381308322d9e78ccfb23119000cef 100644 (file)
--- a/app/views/site/_search.rhtml
+++ b/app/views/site/_search.rhtml
@@ -1,47 +1,51 @@
-<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">
 <!--
 <script type="text/javascript">
 <!--

-  function openSearchResults() {
-    $("search_results").style.display = "block";
-    $("search_results_content").innerHTML = "<p class='search_results_entry'>Searching...</p>";
-    <%= onopen %>
+  function startSearch() {
+    updateSidebar("Search Results", "<p class='search_results_entry'>Searching...<\/p>");
+
+    $("search_field").style.display = "none";
+    $("search_active").style.display = "inline";

   }
 
   }
 

-  function closeSearchResults() {
-    $("search_results").style.display = "none";
-    <%= onclose %>
+  function endSearch() {
+    $("search_field").style.display = "inline";
+    $("search_active").style.display = "none";
+  }
+
+  function describeLocation() {
+    var position = getPosition();
+
+    <%= remote_function(:loading => "startSearch()",
+                        :complete => "endSearch()",
+                        :url => { :controller => :geocoder, :action => :description },
+                        :with => "'lat=' + position.lat + '&lon=' + position.lon") %>

   }
 
   <% if params[:query] %>
   }
 
   <% if params[:query] %>

-  <%= remote_function(:update => :search_results_content, 
-                      :loading => "openSearchResults()",
-                      :url => { :controller => :geocoder, :action => :search, :query => params[:query] }) %>
+  <%= remote_function(:loading => "startSearch()",
+                      :complete => "endSearch()",
+                      :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>

   <% end %>
 // -->
 </script>
 
 <% content_for "optionals" do %>
   <div class="optionalbox">
   <% end %>
 // -->
 </script>
 
 <% content_for "optionals" do %>
   <div class="optionalbox">

-    <span class="oboxheader">Search</span>
-    <% form_remote_tag(:update => :search_results_content, 
-                       :loading => "openSearchResults()",
+    <span class="oboxheader"><%= t 'site.search.search' %></span>
+    <span class="whereami"><a href="javascript:describeLocation()"><%= t 'site.search.where_am_i' %></a></span>
+    <div class="search_form">
+    <div id="search_field">
+    <% form_remote_tag(:loading => "startSearch()",
+                       :complete => "endSearch()",

                        :url => { :controller => :geocoder, :action => :search }) do %>
                        :url => { :controller => :geocoder, :action => :search }) do %>

-      <%= text_field_tag :query, params[:query] %>
+      <%= text_field_tag :query, h(params[:query]) %>
+      <%= submit_tag t('site.search.submit_text') %>

     <% end %>
     <% end %>

+    </div>
+    <p id="search_active"><%= t 'site.search.searching' %></p>
+    </div>

     <p class="search_help">
     <p class="search_help">

-      examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ',
-      or 'post offices near Lünen'
-      <a href="http://wiki.openstreetmap.org/index.php/Name_finder#Searching_for_things">more examples...</a>
+      <%= t 'site.search.search_help' %>

     </p>
   </div>
 <% end %>
     </p>
   </div>
 <% end %>