X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/22594361d5abd2a6ee18e290058d9d39d7d761ec..5966792af5f61d9dd65ff83bfd264e8a8098d307:/app/views/site/_search.html.erb

diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index 2c914d14c..9adc3dafe 100644
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,88 +1,59 @@
 <script type="text/javascript">
 <!--
   function describeLocation() {
-    var args = getArgs($("viewanchor").href);
-
-    <%= remote_function(:loading => "startSearch()",
-                        :url => { :controller => :geocoder, :action => :description },
-                        :with => "'lat=' + args['lat'] + '&lon=' + args['lon'] + '&zoom=' + args['zoom']") %>
+    var args = getArgs($("#viewanchor").attr("href"));
+
+    $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
+    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :description %>", {
+      lat: args["lat"],
+      lon: args["lon"],
+      zoom: args["zoom"]
+    }, openSidebar);
   }
 
-  function setSearchViewbox() {
-    <% if params[:action] == 'index' %>
-    var extent = getMapExtent();
-
-    var minlon = document.createElement("input");
-    minlon.type = "hidden";
-    minlon.id = "minlon";
-    minlon.name = "minlon";
-    minlon.value = extent.left;
-    $("search_form").appendChild(minlon);
-
-    var minlat = document.createElement("input");
-    minlat.type = "hidden";
-    minlat.id = "minlat";
-    minlat.name = "minlat";
-    minlat.value = extent.bottom;
-    $("search_form").appendChild(minlat);
-
-    var maxlon = document.createElement("input");
-    maxlon.type = "hidden";
-    maxlon.id = "maxlon";
-    maxlon.name = "maxlon";
-    maxlon.value = extent.left;
-    $("search_form").appendChild(maxlon);
-
-    var maxlat = document.createElement("input");
-    maxlat.type = "hidden";
-    maxlat.id = "maxlat";
-    maxlat.name = "maxlat";
-    maxlat.value = extent.bottom;
-    $("search_form").appendChild(maxlat);
-    <% end %>
+  function doSearch(query) {
+    $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
+
+    <% if params[:action] == 'index' -%>
+    var extent = unproj(map.getExtent());
+
+    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", {
+      query: $("#query").val(),
+      minlon: extent.left,
+      minlat: extent.bottom,
+      maxlon: extent.right,
+      maxlat: extent.top
+    }, openSidebar);
+    <% else -%>
+    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :search %>", {
+      query: $("#query").val()
+    }, openSidebar);
+    <% end -%>
   }
 
-  function startSearch() {
-    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");
-  }
+  $(document).ready(function () {
+    $("#search_form").submit(function (event) {
+      doSearch($("#query").val());
 
-  function endSearch() {
-    <% if params[:action] == 'index' %>
-    $("minlon").remove();
-    $("minlat").remove();
-    $("maxlon").remove();
-    $("maxlat").remove();
-    <% end %>
-  }
-
-  document.observe("dom:loaded", function () {
-    $("search_form").observe("ajax:before", setSearchViewbox);
-    $("search_form").observe("ajax:loading", startSearch);
-    $("search_form").observe("ajax:complete", endSearch);
+      return false;
+    });
   });
-
-  <% if params[:query] %>
-  <%= remote_function(:loading => "startSearch()",
-                      :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>
-  <% end %>
 // -->
 </script>
 
-<% content_for "optionals" do %>
+<% content_for :optionals do %>
   <div class="optionalbox">
-    <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
-    <h1><%= t 'site.search.search' %></h1>
     <div class="search_container">
     <div id="search_field">
-    <%= form_tag({ :controller => :geocoder, :action => :search },
-                 { :id => "search_form", :remote => true, :method => "get", :action => url_for(:action => "index") }) do %>
-      <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %>
+    <%= form_tag "#", :id => "search_form" do %>
       <%= submit_tag t('site.search.submit_text') %>
+      <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search') %>
     <% end %>
     </div>
     </div>
-    <p class="search_help">
+    <p class='search_help deemphasize'>
       <%= raw(t 'site.search.search_help') %>
+      <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
     </p>
   </div>
 <% end %>