X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d4a137959573a9bada01e2622613c87b5056f92..32c3000af7c2c4016b75abf5a396262e28aabd72:/app/views/layouts/map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 6e6caf95c..528d45c49 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,34 +4,64 @@
 
 <% content_for(:body_class) { "map-layout" } %>
 
+<% 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 dropdown-item",
+                :data => { :lat => current_user.home_lat,
+                           :lon => current_user.home_lon,
+                           :zoom => 15 } %>
+  <% end %>
+<% end %>
+
+<% content_for :header do %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
-    <%= form_tag url_for(:controller => :geocoder, :action => :search), :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'),
-                    { :controller => :geocoder, :action => :description },
-                    { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
-      </div>
-    <% end %>
+    <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
-    <div id="sidebar_content">
-      <% if STATUS == :database_offline or STATUS == :api_offline %>
-        <p class="alert"><%= t 'layouts.osm_offline' %></p>
-      <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-        <p class="alert"><%= t 'layouts.osm_read_only' %></p>
-      <% end %>
+    <div id="flash">
+      <%= render :partial => "layouts/flash" %>
+    </div>
+
+    <div id="browse_status"></div>
 
+    <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>
+
+    <% 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.hosting_partners_html",
+                 :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.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 id="noscript">
-      <p><%= t 'site.index.js_1' %></p>
-      <p><%= t 'site.index.js_2' %></p>
+      <p><%= t "site.index.js_1" %></p>
+      <p><%= t "site.index.js_2" %></p>
     </div>
   </noscript>
 
@@ -42,16 +72,16 @@
   </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>
+        <td class="attribution_license"><%= t "site.index.license.license_url" %></td>
+        <td class="attribution_project"><%= t "site.index.license.project_url" %></td>
       </tr>
       <tr>
-        <td colspan="2" class="attribution_notice"><%= t 'site.index.license.copyright' %></td>
+        <td colspan="2" class="attribution_notice"><%= t "site.index.license.copyright" %></td>
       </tr>
     </table>
   </div>
 <% end %>
 
-<%= render :template => 'layouts/site' %>
+<%= render :template => "layouts/site" %>