X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dff0eef78737dc54eb227af2080e80ecdd3e3999..0e0c89b95c16abd7bc548bea7bff03cbb715b3b3:/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 9cd4f8a64..534ff13c0 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -4,14 +4,14 @@
 
 <% 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",
                 :class => "set_position",
-                :data => { :lat => @user.home_lat,
-                           :lon => @user.home_lon,
+                :data => { :lat => current_user.home_lat,
+                           :lon => current_user.home_lon,
                            :zoom => 15 } %>
   <% end %>
 <% end %>
@@ -24,12 +24,6 @@
   <div id="sidebar">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
-    <% if STATUS == :database_offline or STATUS == :api_offline %>
-      <p class="error"><%= t 'layouts.osm_offline' %></p>
-    <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-      <p class="error"><%= t 'layouts.osm_read_only' %></p>
-    <% end %>
-
     <div id="flash">
       <%= render :partial => "layouts/flash" %>
     </div>
@@ -44,15 +38,15 @@
       <%= yield %>
     </div>
 
-    <% unless @user %>
+    <% 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.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"),
+               :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
+               :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.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/") %>
         </p>
         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>