Use CanCanCan for messages controller

[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 3f11edf59cfd275a0323bb9b20031a63653e0919..05f070914b2cd7e235fc9f0fd477eca235c749db 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",
                 :class => "set_position",
   <% 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 %>
                            :zoom => 15 } %>
   <% end %>
 <% end %>


@@ -24,19 +24,13 @@
   <div id="sidebar">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
   <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>
 
     <div id="browse_status"></div>
 
     <div id="flash">
       <%= render :partial => "layouts/flash" %>
     </div>
 
     <div id="browse_status"></div>
 

-    <div id="sidebar_loader" style="display: none;">
+    <div id="sidebar_loader">

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


@@ -44,15 +38,14 @@
       <%= yield %>
     </div>
 
       <%= 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>
       <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"),
+        <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/") %>
         </p>
         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
                :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>