Merge branch 'rails41'

[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 68162f7032246e51ba540300f3ea5c1f1a42ba61..e72214cbefe86fae1d9e6c816bd99766fec39c3c 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 %>
 <% end %>
 
 <% content_for :header do %>

-  <%= render :partial => "layouts/search" %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>

 <% end %>
 
 <% content_for :content do %>
   <div id="sidebar">
 <% 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>
 
     <% if STATUS == :database_offline or STATUS == :api_offline %>
       <p class="error"><%= t 'layouts.osm_offline' %></p>


@@ -46,7 +46,7 @@
 
     <% unless @user %>
       <div class="welcome">
 
     <% unless @user %>
       <div class="welcome">

-        <h2><%= t 'layouts.intro_header' %></h2>
+        <h2><a><span class="icon close"></span></a><%= t 'layouts.intro_header' %></h2>

         <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>
         <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>