Enable/disable some context-menu options conditional on zoom

[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 c6467382a4d6ae3d87ad4a11b4d5f58d912f4065..cb2fd0e07a33007e082d437710ee88b75effba5d 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -16,33 +16,42 @@
   <% end %>
 <% end %>
 
+<% content_for :header do %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
+<% end %>
+
 <% 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>
+    <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
+
+    <% if STATUS == :database_offline or STATUS == :api_offline %>
+      <p class="error"><%= t 'layouts.osm_offline' %></p>
+    <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
+      <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
-    <a id="ad" href="#">
-      <span class="ad-content">State of the Map 2014</span>
-      <span class="close">dismiss</span>
-    </a>
+    <div id="flash">
+      <%= render :partial => "layouts/flash" %>
+    </div>
 
-    <div id="sidebar_content">
-      <% if STATUS == :database_offline or STATUS == :api_offline %>
-        <p class="error"><%= t 'layouts.osm_offline' %></p>
-      <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-        <p class="error"><%= t 'layouts.osm_read_only' %></p>
-      <% end %>
+    <div id="browse_status"></div>
 
-      <%= render :partial => "layouts/flash" %>
+    <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">
       <%= 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>
@@ -59,7 +68,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>