Merge branch 'master' into notes

[rails.git] / app / views / site / _search.html.erb

diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index 3750a7dc93191e97c6d6ecc55b50e0577208c580..c074a49a30804082ff6c1d5fbe8e07abf3eb423d 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,60 +1,31 @@
 <script type="text/javascript">
 <!--
-  function startSearch() {
-    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");
-  }
-
   function describeLocation() {
-    var position = getPosition();
-    var zoom = getZoom();
+    var args = getArgs($("#viewanchor").attr("href"));
 
-    <%= remote_function(:loading => "startSearch()",
-                        :url => { :controller => :geocoder, :action => :description },
-                        :with => "'lat=' + position.lat + '&lon=' + position.lon + '&zoom=' + zoom") %>
+    $("#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();
-
-    $("minlon").value = extent.left;
-    $("minlat").value = extent.bottom;
-    $("maxlon").value = extent.right;
-    $("maxlat").value = extent.top;
-    <% end %>
-  }
-
-  <% 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="oboxheader"><%= t 'site.search.search' %></span>
-    <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
-    <div class="search_form">
+    <div class="search_container">
     <div id="search_field">
-    <% form_remote_tag(:before => "setSearchViewbox()",
-                       :loading => "startSearch()",
-                       :complete => "endSearch()",
-                       :url => { :controller => :geocoder, :action => :search },
-                       :html => { :method => "get", :action => url_for(:action => "index") }) do %>
-      <%= text_field_tag :query, h(params[:query]) %>
-      <% if params[:action] == 'index' %>
-        <%= hidden_field_tag :minlon %>
-        <%= hidden_field_tag :minlat %>
-        <%= hidden_field_tag :maxlon %>
-        <%= hidden_field_tag :maxlat %>
-      <% end %>
+    <%= 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'), :autofocus => "autofocus" %>
     <% end %>
     </div>
     </div>
-    <p class="search_help">
-      <%= t 'site.search.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 %>