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

[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 4d37cdfb8f4200a07185f99292395d5373ceffa2..377f961499cb7154f07a712701330ad867268cf3 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,12 +4,12 @@
 
 <% content_for(:body_class) { "map-layout" } %>
 
-<% if current_user and !current_user.home_lon.nil? and !current_user.home_lat.nil? %>
+<% if current_user&.home_location? %>
   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",
-                :class => "set_position",
+                :class => "set_position dropdown-item",
                 :data => { :lat => current_user.home_lat,
                            :lon => current_user.home_lon,
                            :zoom => 15 } %>
@@ -30,8 +30,10 @@
 
     <div id="browse_status"></div>
 
-    <div id="sidebar_loader">
-      <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">
@@ -39,17 +41,25 @@
     </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 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 %>