X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f436a5cd2ba7f1e86c73fab06eae2e8da188f79f..c798fe416a60eb25f8390ca8a5ab22126dfc7155:/app/views/site/_search.html.erb

diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index 9adc3dafe..c208b3219 100644
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,59 +1,16 @@
-<script type="text/javascript">
-<!--
-  function describeLocation() {
-    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 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 -%>
-  }
-
-  $(document).ready(function () {
-    $("#search_form").submit(function (event) {
-      doSearch($("#query").val());
-
-      return false;
-    });
-  });
-// -->
-</script>
-
 <% content_for :optionals do %>
   <div class="optionalbox">
     <div class="search_container">
     <div id="search_field">
-    <%= form_tag "#", :id => "search_form" do %>
+    <%= form_tag url_for(:controller => :geocoder, :action => :search), :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') %>
+      <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search'), :autofocus => "autofocus" %>
     <% end %>
     </div>
     </div>
     <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>
+      <%= link_to t('site.search.where_am_i'), { :controller => :geocoder, :action => :description }, { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
     </p>
   </div>
 <% end %>