Merge pull request #3631 from AntonKhorev/bootstrap-close

[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 d8bf787a4a9319b3cdd30e73192f6c93784c6248..816f90c70e11d1b83b677bb2ce71c0b5acfebc12 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,14 +4,14 @@
 
 <% content_for(:body_class) { "map-layout" } %>
 
 
 <% content_for(:body_class) { "map-layout" } %>
 

-<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if current_user and !current_user.home_lon.nil? and !current_user.home_lat.nil? %>

   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",
   <% content_for :greeting do %>
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",

-                :class => "set_position",
-                :data => { :lat => @user.home_lat,
-                           :lon => @user.home_lon,
+                :class => "set_position dropdown-item",
+                :data => { :lat => current_user.home_lat,
+                           :lon => current_user.home_lon,

                            :zoom => 15 } %>
   <% end %>
 <% end %>
                            :zoom => 15 } %>
   <% end %>
 <% end %>


@@ -31,26 +31,33 @@
     <div id="browse_status"></div>
 
     <div id="sidebar_loader">
     <div id="browse_status"></div>
 
     <div id="sidebar_loader">

-      <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
+      <img alt="<%= t("browse.start_rjs.loading") %>" class="loader" src="<%= image_path("searching.gif") %>">

     </div>
 
     <div id="sidebar_content">
       <%= yield %>
     </div>
 
     </div>
 
     <div id="sidebar_content">
       <%= yield %>
     </div>
 

-    <% unless @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.partners_html',
-               :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
-               :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
-               :bytemark => link_to(t('layouts.partners_bytemark'), "http://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>
+    <% unless current_user %>
+      <div class="welcome p-3">
+        <%= 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 %>
 
       </div>
     <% end %>
 


@@ -61,8 +68,8 @@
 
   <noscript>
     <div id="noscript">
 
   <noscript>
     <div id="noscript">

-      <p><%= t 'site.index.js_1' %></p>
-      <p><%= t 'site.index.js_2' %></p>
+      <p><%= t "site.index.js_1" %></p>
+      <p><%= t "site.index.js_2" %></p>

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


@@ -75,14 +82,14 @@
   <div id="attribution">
     <table>
       <tr>
   <div id="attribution">
     <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 class="attribution_license"><%= t "site.index.license.license_url" %></td>
+        <td class="attribution_project"><%= t "site.index.license.project_url" %></td>

       </tr>
       <tr>
       </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 %>
 
       </tr>
     </table>
   </div>
 <% end %>
 

-<%= render :template => 'layouts/site' %>
+<%= render :template => "layouts/site" %>