X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a2ffd990fb4cac955d42cfe3b71d99e56a927ef0..d2bd78627e3903e990ddb28aebb39653ebb22fcd:/app/views/site/_search.rhtml

diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml
index a9a3385c3..14f8fa5f6 100644
--- a/app/views/site/_search.rhtml
+++ b/app/views/site/_search.rhtml
@@ -11,9 +11,19 @@
 
 <script type="text/javascript">
 <!--
+  function startSearch() {
+    $("search_results_content").innerHTML = "<p class='search_results_entry'>Searching...</p>";
+    $("search_field").style.display = "none";
+    $("search_active").style.display = "inline";
+  }
+
+  function endSearch() {
+    $("search_field").style.display = "inline";
+    $("search_active").style.display = "none";
+  }
+
   function openSearchResults() {
     $("search_results").style.display = "block";
-    $("search_results_content").innerHTML = "<p class='search_results_entry'>Searching...</p>";
     <%= onopen %>
   }
 
@@ -22,9 +32,18 @@
     <%= onclose %>
   }
 
+  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] %>
-  <%= remote_function(:update => :search_results_content, 
-                      :loading => "openSearchResults()",
+  <%= remote_function(:loading => "startSearch()",
+                      :complete => "endSearch()",
                       :url => { :controller => :geocoder, :action => :search, :query => params[:query] }) %>
   <% end %>
 // -->
@@ -33,11 +52,17 @@
 <% content_for "optionals" do %>
   <div class="optionalbox">
     <span class="oboxheader">Search</span>
-    <% form_remote_tag(:update => :search_results_content, 
-                       :loading => "openSearchResults()",
+    <span class="whereami"><a href="javascript:describeLocation()">Where am I?</a></span>
+    <div class="search_form">
+    <span id="search_field">
+    <% form_remote_tag(:loading => "startSearch()",
+                       :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search }) do %>
       <%= text_field_tag :query, params[:query] %>
     <% end %>
+    </span>
+    <p id="search_active">Searching...</p>
+    </div>
     <p class="search_help">
       examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ',
       or 'post offices near Lünen'