Merge pull request #4278 from tomhughes/rails71

[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 7a0ca0ed714c3bde95ade620844d7dfee23d97f9..377f961499cb7154f07a712701330ad867268cf3 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,7 +4,7 @@
 
 <% content_for(:body_class) { "map-layout" } %>
 
 
 <% 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"),
                 "#",
   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",


@@ -30,8 +30,10 @@
 
     <div id="browse_status"></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 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">
     </div>
 
     <div id="sidebar_content">


@@ -39,12 +41,13 @@
     </div>
 
     <% unless current_user %>
     </div>
 
     <% unless current_user %>

-      <div class="welcome p-3">
+      <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"),
         <%= 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>
                    :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>