Merge remote-tracking branch 'upstream/pull/1985'

[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..534ff13c019117aedb8a9e1c76e769247d25ba75 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,45 +4,59 @@
 
 <% content_for(:body_class) { "map-layout" } %>
 
 
 <% content_for(:body_class) { "map-layout" } %>
 

-<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if current_user and !current_user.home_lon.nil? and !current_user.home_lat.nil? %>

   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",
                 :class => "set_position",
   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",
                 :class => "set_position",

-                :data => { :lat => @user.home_lat,
-                           :lon => @user.home_lon,
+                :data => { :lat => current_user.home_lat,
+                           :lon => current_user.home_lon,

                            :zoom => 15 } %>
   <% end %>
 <% end %>
 
                            :zoom => 15 } %>
   <% 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 } %>

 
 

-    <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">
+      <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
+    </div>

 
 

+    <div id="sidebar_content">

       <%= yield %>
     </div>
       <%= yield %>
     </div>

+
+    <% unless current_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>
+        <p><%= t 'layouts.partners_html',
+               :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
+               :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"),
+               :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
+               :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+        </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>
   </div>
 
   <noscript>


@@ -59,7 +73,7 @@
   </div>
 
   <div id="attribution">
   </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>
       <tr>
         <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
         <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>