X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1df50231faed168460a305be281355fd7e2a05c1..d4954bc7b1bc06431bea4e97af401e3ea6acd0e6:/app/views/export/_start.rhtml?ds=sidebyside

diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.rhtml
index 41fd790f2..9776261ea 100644
--- a/app/views/export/_start.rhtml
+++ b/app/views/export/_start.rhtml
@@ -1,103 +1,79 @@
-<% form_tag :action => 'next' do %>
+<% form_tag :action => "finish" do %>
 
   <p class="export_heading">Area to Export</p>
 
   <div class="export_bounds">
-    <%= text_field('export', 'maxlat', { :size => 10, :class => "export_bound" }) %>
+    <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
     <br/>
-    <%= text_field('export', 'minlon', { :size => 10, :class => "export_bound" }) %>
-    <%= text_field('export', 'maxlon', { :size => 10, :class => "export_bound" }) %>
+    <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
+    <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
     <br/>
-    <%= text_field('export', 'minlat', { :size => 10, :class => "export_bound" }) %>
+    <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
+    <p class="export_hint">
+      <a id='drag_box' href="#" onclick="return startBox();">Manually select a different area</a>  
+    </p>
   </div>
 
   <p class="export_heading">Format to Export</p>
 
   <div class="export_details">
-    <%= radio_button('export', 'format', 'osm' ) %>OpenStreetMap XML Data
-    <br/>
-    <%= radio_button('export', 'format', 'png' ) %>PNG Image
-    <br/>
-    <%= radio_button('export', 'format', 'pdf' ) %>PDF Document
-    <br/>
-    <%= radio_button('export', 'format', 'svg' ) %>SVG Document
+    <p>
+      <%= radio_button_tag("format", "osm") %> OpenStreetMap XML Data
+      <br/>
+      <%= radio_button_tag("format", "mapnik") %> Mapnik Image
+      <br/>
+      <%= radio_button_tag("format", "osmarender") %> Osmarender Image
+      <br/>
+      <%= radio_button_tag("format", "html") %> Embeddable HTML
+    </p>
   </div>
 
   <div id="export_osm">
     <p class="export_heading">Licence</p>
 
     <div class="export_details">
-      <p>OSM license agreement blah blah blah...</p>
-    </div
+      <p>OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>
+    </div>
   </div>
 
   <div id="export_mapnik">
     <p class="export_heading">Options</p>
 
     <div class="export_details">
-      <p>Scale 1 : <%= text_field('export', 'mapnik_scale', { :size => 10 }) %></p>
+      <p>Format <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"], ["Postscript", "ps"]], "png")) %></p>
+      <p>Scale 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> <span class="export_hint">(max 1 : <span id="mapnik_max_scale"></span>)</span></p>
+      <p>Image Size <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span></p>
     </div>
   </div>
 
-<% end %>
-
-<script type="text/javascript">
-  <!--
-  function startExport() {
-    var vectors = new OpenLayers.Layer.Vector("Vector Layer", {
-      displayInLayerSwitcher: false,
-    });
-    map.addLayer(vectors);
-
-    var box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, { 
-      handlerOptions: {
-        keyMask: OpenLayers.Handler.MOD_CTRL,
-        sides: 4,
-        snapAngle: 90,
-        irregular: true,
-        persist: true,
-        callbacks: { done: boxComplete }
-      }
-    });
-    map.addControl(box);
-
-    box.activate();
-
-    map.events.register("moveend", map, mapMoved);
-    updateRegion(map.getExtent());
-  }
-
-  function setFormat(format) {
-    $("export_osm").style.display = "none";
-    $("export_mapnik").style.display = "none";
-    $("export_" + format).style.display = "inline";
-  }
-
-  $("export_format_osm").onclick = function() { setFormat("osm") };
-  $("export_format_png").onclick = function() { setFormat("mapnik") };
-  $("export_format_pdf").onclick = function() { setFormat("mapnik") };
-  $("export_format_svg").onclick = function() { setFormat("mapnik") };
-
-  function mapMoved() {
-    updateRegion(map.getExtent());
-  }
+  <div id="export_osmarender">
+    <p class="export_heading">Options</p>
 
-  function boxComplete(box) {
-    map.events.unregister("moveend", map, mapMoved);
-    updateRegion(box.getBounds());
-  }
+    <div class="export_details">
+      <p>Format <%= select_tag("osmarender_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"]], "png")) %></p>
+      <p>Zoom <%= select_tag("osmarender_zoom", options_for_select([4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17])) %></p>
+    </div>
+  </div>
+  
+  <div id="export_html">
+    <p class="export_heading">Options</p>
+    <div class="export_details">
+      <p><a id="add_marker" href="#">Add a marker to the map</a></p>
+      <p id="marker_inputs" style="display:none">
+        Lat: <input type="text" id="marker_lat" size="9" />
+        Lon: <input type="text" id="marker_lon" size="9" />
+      </p>
+    </div>
 
-  function updateRegion(bounds) {
-    var decimals = Math.pow(10, Math.floor(map.getZoom() / 3));
-    var bl = mercatorToLonLat(new OpenLayers.LonLat(bounds.left, bounds.bottom));
-    var tr = mercatorToLonLat(new OpenLayers.LonLat(bounds.right, bounds.top));
+    <p class="export_heading">Output</p>
+    <div class="export_details">
+      <p><input type="text" id="export_html_text" style="width:95%" /></p>
+      <p>Paste HTML to embed in website</p>
+    </div>
+  </div>
 
-    $("export_maxlat").value = Math.round(tr.lat * decimals) / decimals;
-    $("export_minlon").value = Math.round(bl.lon * decimals) / decimals;
-    $("export_maxlon").value = Math.round(tr.lon * decimals) / decimals;
-    $("export_minlat").value = Math.round(bl.lat * decimals) / decimals;
-  }
+  <div class="export_buttons">
+    <p><%= submit_tag "Export", :id => "export_commit" %></p>
+  </div>
 
-  startExport();
-  // -->
-</script>
+<% end %>