Convert search to pushState

[rails.git] / app / views / layouts / map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 09c7d0d8e90646335db7661a816fbe8cc06f5223..a8a15a30f0cbe4a0fbf07ad3e7b0aa423660b9ef 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -2,14 +2,16 @@
   <%= javascript_include_tag "index" %>
 <% end %>
 
+<% content_for(:body_class) { "map-layout" } %>
+
 <% content_for :content do %>
   <div id="sidebar">
-    <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>
+    <%= form_tag search_path, :id => "search_form" do %>
       <%= submit_tag t('site.search.submit_text') %>
       <div id='query_wrapper'>
         <%= text_field_tag :query, params[:query],
-                           :placeholder => t('site.search.search'),
-                           :autofocus => "autofocus" %>
+                           :placeholder => t('site.search.search') %>
+        <%= link_to t('site.search.where_am_i'), '#', { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
       </div>
     <% end %>
 
@@ -20,7 +22,7 @@
         <p class="alert"><%= t 'layouts.osm_read_only' %></p>
       <% end %>
 
-      <%= content_for :sidebar %>
+      <%= yield %>
     </div>
   </div>
 
@@ -49,3 +51,5 @@
     </table>
   </div>
 <% end %>
+
+<%= render :template => 'layouts/site' %>