X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd..c12f8959dd2059b4ea9d45caf716923d7589cbb0:/app/views/layouts/map.html.erb?ds=inline

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 05f070914..55066f25f 100644
--- 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,38 +30,44 @@
 
     <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 id="sidebar_content" class="p-3">
       <%= 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/") %>
+      <div class="welcome p-3" hidden>
+        <%= render "sidebar_header", :title => t("layouts.intro_header") %>
+        <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
+        <p class="fs-6 fw-light"><%= 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>
-        <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="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>
     <% end %>
 
-    <div id="banner">
-      <%= render :partial => "layouts/banner" %>
-    </div>
+    <%= render :partial => "layouts/banner" %>
   </div>
 
   <noscript>
-    <div id="noscript">
-      <p><%= t 'site.index.js_1' %></p>
-      <p><%= t 'site.index.js_2' %></p>
+    <div class="mt-5 p-3">
+      <p><%= t "site.index.js_1" %></p>
+      <p><%= t "site.index.js_2" %></p>
     </div>
   </noscript>
 
@@ -71,17 +77,17 @@
   <div id="map" tabindex="2">
   </div>
 
-  <div id="attribution">
+  <div id="attribution" class="d-none">
     <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><%= t "site.index.license.license_url" %></td>
+        <td><%= 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" %>