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

[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 1f8366ccbb76035141555fe837d6e787d2fb7cc2..0630dace5bc0f93e3ebbbae7e646f7a216a5cc5f 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"),
                 "#",


@@ -21,7 +21,7 @@
 <% end %>
 
 <% content_for :content do %>
 <% end %>
 
 <% content_for :content do %>

-  <div id="sidebar">
+  <div id="sidebar" class="bg-body z-1">

     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <div id="flash">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <div id="flash">


@@ -30,54 +30,53 @@
 
     <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>
 

-    <div id="sidebar_content">
+    <div id="sidebar_content" class="p-3">

       <%= yield %>
     </div>
 
     <% unless current_user %>
       <%= 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_2024_html",
+                                       :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
+                                       :corpmembers => link_to(t("layouts.partners_corpmembers"), "https://osmfoundation.org/wiki/Corporate_Members"),
+                                       :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>

         </p>
         </p>

-        <div class="standard-form">
-          <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 gap-2">
+          <a class="btn btn-primary w-100 d-flex align-items-center justify-content-center" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
+          <a class="btn btn-primary w-100 d-flex align-items-center justify-content-center" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>

         </div>
       </div>
     <% end %>
 
         </div>
       </div>
     <% end %>
 

-    <div id="banner">
-      <%= render :partial => "layouts/banner" %>
-    </div>
+    <%= render :partial => "layouts/banner" %>

   </div>
 
   <noscript>
   </div>
 
   <noscript>

-    <div id="noscript">
+    <div class="mt-5 p-3">

       <p><%= t "site.index.js_1" %></p>
       <p><%= t "site.index.js_2" %></p>
     </div>
   </noscript>
 
       <p><%= t "site.index.js_1" %></p>
       <p><%= t "site.index.js_2" %></p>
     </div>
   </noscript>
 

-  <div id="map-ui">
+  <div id="map-ui" class="bg-body z-2">

   </div>
 
   </div>
 

-  <div id="map" tabindex="2">
+  <div id="map" tabindex="2" class="bg-body-secondary z-0">

   </div>
 
   </div>
 

-  <div id="attribution">
+  <div id="attribution" class="d-none">

     <table>
       <tr>
     <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>
       </tr>
       <tr>
         <td colspan="2" class="attribution_notice"><%= t "site.index.license.copyright" %></td>