Merge remote-tracking branch 'upstream/pull/2997' into master

[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 534ff13c019117aedb8a9e1c76e769247d25ba75..33737ae23843080c4d66d454a19fed3b752c5bac 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -9,7 +9,7 @@
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",
     <%= link_to t("layouts.home"),
                 "#",
                 :id => "homeanchor",

-                :class => "set_position",
+                :class => "set_position dropdown-item",

                 :data => { :lat => current_user.home_lat,
                            :lon => current_user.home_lon,
                            :zoom => 15 } %>
                 :data => { :lat => current_user.home_lat,
                            :lon => current_user.home_lon,
                            :zoom => 15 } %>


@@ -31,7 +31,7 @@
     <div id="browse_status"></div>
 
     <div id="sidebar_loader">
     <div id="browse_status"></div>
 
     <div id="sidebar_loader">

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

     </div>
 
     <div id="sidebar_content">
     </div>
 
     <div id="sidebar_content">


@@ -40,17 +40,17 @@
 
     <% unless current_user %>
       <div class="welcome">
 
     <% 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'), "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/") %>
+        <%= render "sidebar_header", :title => t("layouts.intro_header") %>
+        <p><%= t "layouts.intro_text" %></p>
+        <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>
         </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 class="standard-form">
+          <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>

       </div>
     <% end %>
 
       </div>
     <% end %>
 


@@ -61,8 +61,8 @@
 
   <noscript>
     <div id="noscript">
 
   <noscript>
     <div id="noscript">

-      <p><%= t 'site.index.js_1' %></p>
-      <p><%= t 'site.index.js_2' %></p>
+      <p><%= t "site.index.js_1" %></p>
+      <p><%= t "site.index.js_2" %></p>

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


@@ -75,14 +75,14 @@
   <div id="attribution">
     <table>
       <tr>
   <div id="attribution">
     <table>
       <tr>

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

       </tr>
       <tr>
       </tr>
       <tr>

-        <td colspan="2" class="attribution_notice"><%= t 'site.index.license.copyright' %></td>
+        <td colspan="2" class="attribution_notice"><%= t "site.index.license.copyright" %></td>

       </tr>
     </table>
   </div>
 <% end %>
 
       </tr>
     </table>
   </div>
 <% end %>
 

-<%= render :template => 'layouts/site' %>
+<%= render :template => "layouts/site" %>