Merge remote-tracking branch 'upstream/master' into routing

[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 1daae059ec517b19d70b6752411f521dbdf720ee..4715570536f53cb3dcb6f002b30fd9635ffe70b0 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -16,16 +16,13 @@
   <% end %>
 <% end %>
 
   <% end %>
 <% end %>
 

+<% content_for :header do %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
+<% end %>
+

 <% content_for :content do %>
   <div id="sidebar">
 <% content_for :content do %>
   <div id="sidebar">

-    <%= 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'), '#', { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
-      </div>
-    <% end %>
+    <%= 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>


@@ -33,12 +30,43 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
       <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="browse_status"></div>
 

+    <div id="sidebar_loader" style="display: none;">
+      <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
+    </div>
+

     <div id="sidebar_content">
     <div id="sidebar_content">

-      <%= render :partial => "layouts/flash" %>

       <%= yield %>
     </div>
       <%= 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>
   </div>
 
   <noscript>