Merge remote-tracking branch 'upstream/pull/3936'

[rails.git] / app / views / site / export.html.erb

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 9ac03e70d5944e51cbc8878d120f68eac8c1028a..a314cb151416c836a7bfa6e5d79f1c889f6906ce 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,56 +1,50 @@
-<% set_title(t('export.title')) %>
+<% set_title(t(".title")) %>

 
 

-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t 'export.title' %>
-</h2>
+<%= render "sidebar_header", :title => t(".title") %>

 
 

-<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %>
-  <%= hidden_field_tag 'format', 'osm' %>
+<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
+  <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>

 
   <div class='export_area_inputs'>
 
   <div class='export_area_inputs'>

-    <div class='export_boxy' style="border: 1px solid #ccc;">
-      <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
-      <br/>
-      <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
-      <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
-      <br/><br/>
-      <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
+    <div class='export_boxy border border-grey rounded'>
+      <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
+      <div class="clearfix">
+        <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %>
+        <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %>

       </div>
       </div>

-    <a id='drag_box' href="#"><%= t'export.start.manually_select' %></a>
+      <%= text_field_tag("minlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
+      </div>
+    <a id='drag_box' href="#"><%= t ".manually_select" %></a>

   </div>
 
   </div>
 

-  <h4><%= t'export.start.licence' %></h4>
-  <p><%= raw t 'export.start.export_details' %></p>
+  <h4><%= t ".licence" %></h4>
+  <p><%= t ".licence_details_html", :odbl_link => link_to(t(".odbl"), t(".odbl_url")) %></p>

 
   <div id="export_osm_too_large">
 
   <div id="export_osm_too_large">

-    <p class="warning">
-      <%= t'export.start.too_large.body' %>
+    <p class="alert alert-warning">
+      <%= t ".too_large.body" %>

     </p>
   </div>
 
   <div id="export_commit">
     </p>
   </div>
 
   <div id="export_commit">

-    <div class="export_button">
-      <%= submit_tag t('export.start.export_button') %>
+    <div class="mb-3 d-flex">
+      <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>

     </div>
     </div>

-
-    <p><%= t'export.start.too_large.advice' %></p>

   </div>
 
   </div>
 

-  <dl class="inner12">  
-    <dt><a id="export_overpass" href="http://overpass-api.de/api/map?bbox="><%= t'export.start.too_large.overpass.title' %></a></dt>
-    <dd><%= t'export.start.too_large.overpass.description' %></dd>
-    
-    <dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
-    <dd><%= t'export.start.too_large.planet.description' %></dd>
+  <p><%= t ".too_large.advice" %></p>
+
+  <dl class="px-3">
+    <dt><a id="export_overpass" href="https://overpass-api.de/api/map?bbox="><%= t ".too_large.overpass.title" %></a></dt>
+    <dd><%= t ".too_large.overpass.description" %></dd>

 
 

-    <dt><a href="http://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
-    <dd><%= t'export.start.too_large.geofabrik.description' %></dd>
+    <dt><a href="https://planet.openstreetmap.org/"><%= t ".too_large.planet.title" %></a></dt>
+    <dd><%= t ".too_large.planet.description" %></dd>

 
 

-    <dt><a href="https://mapzen.com/data/metro-extracts/"><%= t'export.start.too_large.metro.title' %></a></dt>
-    <dd><%= t'export.start.too_large.metro.description' %></dd>
+    <dt><a href="https://download.geofabrik.de/"><%= t ".too_large.geofabrik.title" %></a></dt>
+    <dd><%= t ".too_large.geofabrik.description" %></dd>

 
 

-    <dt><a href="http://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
-    <dd><%= t'export.start.too_large.other.description' %></dd>
+    <dt><a href="https://wiki.openstreetmap.org/wiki/Download"><%= t ".too_large.other.title" %></a></dt>
+    <dd><%= t ".too_large.other.description" %></dd>

   </dl>
 <% end %>
   </dl>
 <% end %>