Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

[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 978244db485c6a4679b7b4c00347a62c8878c963..128db59928e8c1ae67af6dbf387fa840d4b0f5ad 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,46 +1,56 @@
-<h2><%= t 'export.start_rjs.export' %></h2>
+<% set_title(t('export.title')) %>
 
-<%= form_tag :controller => "export", :action => "finish" do %>
+<h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t 'export.title' %>
+</h2>
+
+<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %>
   <%= hidden_field_tag 'format', 'osm' %>
 
-  <div class="export_bounds inner22">
-    <div class='export_area_inputs'>
+  <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/><br/>
       <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
-    </div>
-    <a id="drag_box" class='export_hint' href="#"><%= t'export.start.manually_select' %></a>
+      </div>
+    <a id='drag_box' href="#"><%= t'export.start.manually_select' %></a>
   </div>
 
-  <div id="export_osm">
-    <h4><strong><%= t'export.start.licence' %></strong><br>
-    <%= raw t'export.start.export_details' %></h4>
+  <h4><%= t'export.start.licence' %></h4>
+  <p><%= raw t 'export.start.export_details' %></p>
 
-    <div  id="export_osm_too_large">
-      <div class="export_details">
-        <h4><strong class="red"><%= t'export.start.too_large.heading' %></strong><br>
-        <%= t'export.start.too_large.body' %></p>
-        <dl>
-          <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="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_osm_too_large">
+    <p class="warning">
+      <%= t'export.start.too_large.body' %>
+    </p>
+  </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>
-      </div>
+  <div id="export_commit">
+    <div class="export_button">
+      <%= submit_tag t('export.start.export_button') %>
     </div>
-  </div>
 
-  <div class="inner12">
-    <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
+    <p><%= t'export.start.too_large.advice' %></p>
   </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/data/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 %>