Merge remote-tracking branch 'openstreetmap/pull/1085'

[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 475313399507fc4caa67bd6865b95afcf55a7b94..6bf33653562479adb68a7187e585f35d6c30c13c 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -2,20 +2,21 @@
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t 'export.start_rjs.export' %>
+  <%= t 'export.title' %>

 </h2>
 
 <%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %>
   <%= hidden_field_tag 'format', 'osm' %>
 
   <div class='export_area_inputs'>
 </h2>
 
 <%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %>
   <%= hidden_field_tag 'format', 'osm' %>
 
   <div class='export_area_inputs'>

-    <%= 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/>
-    <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
-    <br/>
+    <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>

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


@@ -23,24 +24,33 @@
   <p><%= raw t 'export.start.export_details' %></p>
 
   <div id="export_osm_too_large">
   <p><%= raw t 'export.start.export_details' %></p>
 
   <div id="export_osm_too_large">

-    <h4><%= t'export.start.too_large.heading' %></h4>
-    <p><%= 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>
+    <p class="warning">
+      <%= t'export.start.too_large.body' %>
+    </p>
+  </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="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>
+
+    <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://mapzen.com/metro-extracts/"><%= t'export.start.too_large.metro.title' %></a></dt>
+    <dd><%= t'export.start.too_large.metro.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>
+  </dl>

 <% end %>
 <% end %>