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

[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 f1eed33cf778bdc88e0d65653a2dd5e1fc4a8e59..d277f344e4530a3a3f6dd467ff35fd5d192daeb3 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,43 +1,40 @@
 <% set_title(t(".title")) %>
 
 <% set_title(t(".title")) %>
 

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

 
 <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
 
 <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>

-  <%= hidden_field_tag "format", "osm" %>
-
-  <div class='export_area_inputs'>
-    <div class='export_boxy'>
-      <%= 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") %>
+  <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
+
+  <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">
+        <%= 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>
+      <%= 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">
 
   <div id="export_osm_too_large">

-    <p class="warning">
+    <p class="alert alert-warning">

       <%= t ".too_large.body" %>
     </p>
   </div>
 
   <div id="export_commit">
       <%= t ".too_large.body" %>
     </p>
   </div>
 
   <div id="export_commit">

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

     </div>
     </div>

-
-    <p><%= t ".too_large.advice" %></p>

   </div>
 
   </div>
 

-  <dl class="inner12">
+  <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 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>