X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..dff0eef78737dc54eb227af2080e80ecdd3e3999:/app/views/layouts/map.html.erb

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 471557053..9cd4f8a64 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -30,28 +30,13 @@
       <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="sidebar_loader" style="display: none;">
+    <div id="sidebar_loader">
       <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
     </div>
 
@@ -61,12 +46,23 @@
 
     <% unless @user %>
       <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.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>
       </div>
     <% end %>
+
+    <div id="banner">
+      <%= render :partial => "layouts/banner" %>
+    </div>
   </div>
 
   <noscript>
@@ -83,7 +79,7 @@
   </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>