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

[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 b3a3bd0e9596ece4dc5ff3336d340ddf255b1662..d277f344e4530a3a3f6dd467ff35fd5d192daeb3 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -5,20 +5,20 @@
 <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
   <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
 
 <%= 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_boxy border border-grey rounded'>
-      <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
+  <div class='export_area_inputs text-center mb-3'>
+    <div class='export_boxy border border-secondary-subtle rounded bg-body-secondary' dir='ltr'>
+      <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center mx-auto") %>

       <div class="clearfix">
       <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") %>
+        <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
+        <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>

       </div>
       </div>

-      <%= text_field_tag("minlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
+      <%= text_field_tag("minlat", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center mx-auto") %>

       </div>
     <a id='drag_box' href="#"><%= t ".manually_select" %></a>
   </div>
 
   <h4><%= t ".licence" %></h4>
       </div>
     <a id='drag_box' href="#"><%= t ".manually_select" %></a>
   </div>
 
   <h4><%= t ".licence" %></h4>

-  <p><%= t ".export_details_html" %></p>
+  <p><%= t ".licence_details_html", :odbl_link => link_to(t(".odbl"), t(".odbl_url")) %></p>

 
   <div id="export_osm_too_large">
     <p class="alert alert-warning">
 
   <div id="export_osm_too_large">
     <p class="alert alert-warning">


@@ -27,7 +27,7 @@
   </div>
 
   <div id="export_commit">
   </div>
 
   <div id="export_commit">

-    <div class="form-group d-flex">
+    <div class="mb-3 d-flex">

       <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>
     </div>
   </div>
       <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>
     </div>
   </div>