Render flash in sidebar

[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 cedfdb9c2bf043daba9692564ecb9b9614db7602..8be2aff81de3f91a9252feb5c79398d0409b954a 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -1,22 +1,30 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "index" %>
+<% end %>
+
+<% content_for(:body_class) { "map-layout" } %>
+

 <% content_for :content do %>
   <div id="sidebar">
 <% 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],
       <%= 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 %>
 
     <div id="sidebar_content">
       <% if STATUS == :database_offline or STATUS == :api_offline %>
       </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 %>
       <% 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 %>
 
       <% end %>
 

-      <%= content_for :sidebar %>
+      <%= render :partial => "layouts/flash" %>
+
+      <%= yield %>

     </div>
   </div>
 
     </div>
   </div>
 


@@ -45,3 +53,5 @@
     </table>
   </div>
 <% end %>
     </table>
   </div>
 <% end %>

+
+<%= render :template => 'layouts/site' %>