Merge branch 'master' into moderation

[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 176507207030bae77284cc61049e97d5111d8091..bf5376fb55bd1be2e10c321ba756492c6b63f6ea 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -9,7 +9,7 @@
   <%= hidden_field_tag 'format', 'osm' %>
 
   <div class='export_area_inputs'>
   <%= hidden_field_tag 'format', 'osm' %>
 
   <div class='export_area_inputs'>

-    <div class='export_boxy' style="border: 1px solid #ccc;">
+    <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('maxlat', nil, :size => 10, :class => "export_bound") %>
       <br/>
       <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>


@@ -27,22 +27,27 @@
     <p class="warning">
       <%= t'export.start.too_large.body' %>
     </p>
     <p class="warning">
       <%= t'export.start.too_large.body' %>
     </p>

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

 
 

-      <dt><a href="http://metro.teczno.com/"><%= t'export.start.too_large.metro.title' %></a></dt>
-      <dd><%= t'export.start.too_large.metro.description' %></dd>
+  <div id="export_commit">
+    <div class="export_button">
+      <%= submit_tag t('export.start.export_button') %>
+    </div>

 
 

-      <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>
-    </dl>
+    <p><%= t'export.start.too_large.advice' %></p>

   </div>
 
   </div>
 

-  <div class="export_button">
-    <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
-  </div>
+  <dl class="inner12">  
+    <dt><a id="export_overpass" href="https://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="https://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
+    <dd><%= t'export.start.too_large.planet.description' %></dd>
+
+    <dt><a href="https://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://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
+    <dd><%= t'export.start.too_large.other.description' %></dd>
+  </dl>

 <% end %>
 <% end %>