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 0cabc0c2df3437e92c77d718945709c76dac6a8d..bf5376fb55bd1be2e10c321ba756492c6b63f6ea 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,57 +1,53 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "index" %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <h2><%= t 'export.start_rjs.export' %></h2>
-  <%= form_tag :controller => "export", :action => "finish" do %>
-    <%= hidden_field_tag 'format', 'osm' %>
-
-    <div class="export_bounds inner22">
-      <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") %>
+<% set_title(t('export.title')) %>
+
+<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_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>
       </div>

-      <a id="drag_box" class='export_hint button' 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><%= t'export.start.licence' %></h4>
-
-      <div class="export_details inner22">
-        <p><%= raw t'export.start.export_details' %></p>
-      </div>
+  <h4><%= t'export.start.licence' %></h4>
+  <p><%= raw t 'export.start.export_details' %></p>

 
 

-      <div  id="export_osm_too_large">
-        <h4><%= t'export.start.too_large.heading' %></h4>
+  <div id="export_osm_too_large">
+    <p class="warning">
+      <%= t'export.start.too_large.body' %>
+    </p>
+  </div>

 
 

-        <div class="export_details inner22">
-          <p><%= 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>
+  <div id="export_commit">
+    <div class="export_button">
+      <%= submit_tag t('export.start.export_button') %>
+    </div>

 
 

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

 
 

-    <div class="inner12">
-      <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
-    </div>
-  <% end %>
+    <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 %>

-
-<%= render :template => 'layouts/map' %>