Merge pull request #3690 from AntonKhorev/search-form-no-group

[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 b3c85d918343a8bda723390035b5c0411be012f6..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"),
                 "#",


@@ -41,7 +41,7 @@
     </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>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <div>
           <p><%= t "layouts.intro_text" %></p>