X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3bf4149e09053436d8d266952c49bb8f7ef6946..3bbdb004477a21e736f3613788356b12ba7f564f:/app/views/layouts/map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 701922486..8be2aff81 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -2,27 +2,29 @@
   <%= 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') %>
-        <%= link_to t('site.search.where_am_i'),
-                    { :controller => :geocoder, :action => :description },
-                    { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
+        <%= link_to t('site.search.where_am_i'), '#', { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
       </div>
     <% end %>
 
     <div id="sidebar_content">
       <% if STATUS == :database_offline or STATUS == :api_offline %>
-        <p class="alert"><%= t 'layouts.osm_offline' %></p>
+        <p class="error"><%= t 'layouts.osm_offline' %></p>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-        <p class="alert"><%= t 'layouts.osm_read_only' %></p>
+        <p class="error"><%= t 'layouts.osm_read_only' %></p>
       <% end %>
 
-      <%= content_for :sidebar %>
+      <%= render :partial => "layouts/flash" %>
+
+      <%= yield %>
     </div>
   </div>
 
@@ -51,3 +53,5 @@
     </table>
   </div>
 <% end %>
+
+<%= render :template => 'layouts/site' %>