merging master into html-mail-fixes

[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 ccbb463a69d857bcc68999b9e0a8b99f0c26304d..6607bf7a5879eba6d026edbe809fc42835947516 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -17,12 +17,12 @@
 <% end %>
 
 <% content_for :header do %>
-  <%= render :partial => "layouts/search" %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
 <% end %>
 
 <% content_for :content do %>
   <div id="sidebar">
-    <%= render :partial => "layouts/search" %>
+    <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <% if STATUS == :database_offline or STATUS == :api_offline %>
       <p class="error"><%= t 'layouts.osm_offline' %></p>
@@ -30,6 +30,10 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
+    <div id="flash">
+      <%= render :partial => "layouts/flash" %>
+    </div>
+
     <div id="browse_status"></div>
 
     <div id="sidebar_loader" style="display: none;">
@@ -37,18 +41,22 @@
     </div>
 
     <div id="sidebar_content">
-      <%= render :partial => "layouts/flash" %>
       <%= yield %>
     </div>
 
     <% unless @user %>
       <div class="welcome">
         <h2><%= t 'layouts.intro_header' %></h2>
+        <div class="close-wrap"><span class="icon close"></span></div>
         <p><%= t 'layouts.intro_text' %></p>
         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
         <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
       </div>
     <% end %>
+
+    <div id="banner">
+      <%= render :partial => "layouts/banner" %>
+    </div>
   </div>
 
   <noscript>
@@ -65,7 +73,7 @@
   </div>
 
   <div id="attribution">
-    <table width="100%">
+    <table>
       <tr>
         <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
         <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>