Use dynamic error pages built through the asset pipeline

[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 4715570536f53cb3dcb6f002b30fd9635ffe70b0..534ff13c019117aedb8a9e1c76e769247d25ba75 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,34 +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="sotm">
-      <a href="http://www.stateofthemap.org/?l=en"><%= image_tag "sotm.png" %></a>
-      <h2>
-        <a><span class="icon close"></span></a>
-        <a href="http://www.stateofthemap.org/?l=en"><%= t 'layouts.sotm_header' %></a>
-      </h2>
-      <p><a href="http://www.stateofthemap.org/?l=en">
-        <%= t 'layouts.sotm_line_1' %>
-      <br />
-        <%= t 'layouts.sotm_line_2' %>
-      <br />
-        <%= t 'layouts.sotm_line_3' %>
-      </a></p>
-    </div>
-

     <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>
 


@@ -59,14 +38,25 @@
       <%= yield %>
     </div>
 
       <%= yield %>
     </div>
 

-    <% unless @user %>
+    <% unless current_user %>

       <div class="welcome">
       <div class="welcome">

-        <h2><a><span class="icon close"></span></a><%= t 'layouts.intro_header' %></h2>
+        <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.intro_text' %></p>

+        <p><%= t 'layouts.partners_html',
+               :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>
         <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
       </div>
     <% end %>
         <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>
     <% end %>

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

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


@@ -83,7 +73,7 @@
   </div>
 
   <div id="attribution">
   </div>
 
   <div id="attribution">

-    <table width="100%">
+    <table>

       <tr>
         <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
         <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>
       <tr>
         <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
         <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>