Use correct extension and type for avatar images attached to mails

[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 0403bc889634ebf25a43467ee0cefd06e6f12010..6d983d30ea153454ed225068d3baa97f79cd5c66 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -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">
+      <div class="welcome p-3" hidden>

         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>

-        <div class="px-3 pb-3">
+        <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"),
           <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>