X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b4f8e92c969a5508b73ae7af45811a118fda6b1..15a7276a9f50821a7728b4da3af16849284f251b:/app/views/layouts/map.html.erb?ds=sidebyside

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 2170705b0..471557053 100644
--- 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,25 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
+    <div id="sotm">
+      <a href="http://www.stateofthemap.org/?l=en"><%= image_tag "sotm.png" %></a>
+      <h2>
+        <a><span class="icon close"></span></a>
+        <a href="http://www.stateofthemap.org/?l=en"><%= t 'layouts.sotm_header' %></a>
+      </h2>
+      <p><a href="http://www.stateofthemap.org/?l=en">
+        <%= t 'layouts.sotm_line_1' %>
+      <br />
+        <%= t 'layouts.sotm_line_2' %>
+      <br />
+        <%= t 'layouts.sotm_line_3' %>
+      </a></p>
+    </div>
+
+    <div id="flash">
+      <%= render :partial => "layouts/flash" %>
+    </div>
+
     <div id="browse_status"></div>
 
     <div id="sidebar_loader" style="display: none;">
@@ -37,9 +56,17 @@
     </div>
 
     <div id="sidebar_content">
-      <%= render :partial => "layouts/flash" %>
       <%= yield %>
     </div>
+
+    <% unless @user %>
+      <div class="welcome">
+        <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>
+      </div>
+    <% end %>
   </div>
 
   <noscript>