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

[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 f11ad8d790a7b85a95f767b8c9de610f3625c5e3..bb66c665ad147445d2b337c6795997efb3301d40 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,53 +1,50 @@
-<% 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 %>
-  <%= 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_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") %>
+    <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 my-2") %>
+        <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control my-2") %>
       </div>
-    <a id='drag_box' href="#"><%= t '.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>
 
-  <h4><%= t '.licence' %></h4>
-  <p><%= raw t '.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">
-    <p class="warning">
-      <%= t '.too_large.body' %>
+    <p class="alert alert-warning">
+      <%= 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>
-
-    <p><%= t '.too_large.advice' %></p>
   </div>
 
-  <dl class="inner12">
-    <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>
+  <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="https://planet.openstreetmap.org/"><%= t '.too_large.planet.title' %></a></dt>
-    <dd><%= t '.too_large.planet.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://download.geofabrik.de/"><%= t '.too_large.geofabrik.title' %></a></dt>
-    <dd><%= t '.too_large.geofabrik.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="https://wiki.openstreetmap.org/wiki/Download"><%= t '.too_large.other.title' %></a></dt>
-    <dd><%= t '.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 %>