X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/043d29fd7eb72048cf5d07edfbc20ec5c25af708..e2cb2327f9e5a3a107dbe249e4fe503cbde45d24:/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 6607bf7a5..40f06a899 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,14 +4,14 @@
 
 <% content_for(:body_class) { "map-layout" } %>
 
-<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if current_user&.has_home? %>
   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",
-                :class => "set_position",
-                :data => { :lat => @user.home_lat,
-                           :lon => @user.home_lon,
+                :class => "set_position dropdown-item",
+                :data => { :lat => current_user.home_lat,
+                           :lon => current_user.home_lon,
                            :zoom => 15 } %>
   <% end %>
 <% end %>
@@ -24,33 +24,42 @@
   <div id="sidebar">
     <%= 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 %>
-
     <div id="flash">
       <%= render :partial => "layouts/flash" %>
     </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 id="sidebar_loader" class="my-3 text-center loader">
+      <div class="spinner-border" role="status">
+        <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+      </div>
     </div>
 
     <div id="sidebar_content">
       <%= yield %>
     </div>
 
-    <% unless @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>
-        <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>
+    <% unless current_user %>
+      <div class="welcome p-3" hidden>
+        <%= render "sidebar_header", :title => t("layouts.intro_header") %>
+        <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"),
+                   :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
+                   :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>
+          <div class="d-flex mx-n1">
+            <div class="w-50 px-1">
+              <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
+            </div>
+            <div class="w-50 px-1">
+              <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
+            </div>
+          </div>
+        </div>
       </div>
     <% end %>
 
@@ -61,8 +70,8 @@
 
   <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>
 
@@ -75,14 +84,14 @@
   <div id="attribution">
     <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" %>