X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ababece2cc0e5caf946242d097e80ae7c3dc877d..8ec415b060c4321fad3fa42f3038148aa94c9b90:/app/views/site/index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 4c954e6cb..4e725f906 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,16 +1,16 @@
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
   <% content_for :greeting do %>
-    <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
+    <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> |
   <% end %>
 <% end %>
 
 <% unless STATUS == :api_offline or STATUS == :database_offline -%>
   <% content_for :editmenu do -%>
-    <li><%= link_to_function(t('browse.start_rjs.data_layer_name'), 'showData()') %></li>
+    <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
   <% end -%>
 <% end -%>
 
-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'sidebar' %>
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
@@ -125,17 +125,12 @@ else
 end
 %>
 
-<%= javascript_include_tag 'openlayers.js' %>
-<%= javascript_include_tag 'map.js' %>
-
 <%= render :partial => 'resize' %>
 
 <script type="text/javascript">
   var marker;
   var map;
 
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   function mapInit(){
     map = createMap("map");
 
@@ -193,27 +188,41 @@ end
     handleResize();
   }
 
-  function showData() {
-    $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
-  }
+  $(document).ready(function () {
+    $("#show_data").click(function (e) {
+      $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
+        startBrowse(sidebarHtml);
+      }});
+      e.preventDefault();
+    });
 
-  function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {
-    var centre = new OpenLayers.LonLat(lon, lat);
+    $("body").on("click", "a.set_position", function () {
+      var lat = parseFloat($(this).attr("data-lat"));
+      var lon = parseFloat($(this).attr("data-lon"));
+      var zoom = parseInt($(this).attr("data-zoom"));
+      var min_lon = parseFloat($(this).attr("data-min-lon"));
+      var min_lat = parseFloat($(this).attr("data-min-lat"));
+      var max_lon = parseFloat($(this).attr("data-max-lon"));
+      var max_lat = parseFloat($(this).attr("data-max-lat"));
+      var centre = new OpenLayers.LonLat(lon, lat);
 
-    if (min_lon && min_lat && max_lon && max_lat) {
-      var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
+      if (min_lon && min_lat && max_lon && max_lat) {
+        var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
 
-      map.zoomToExtent(proj(bbox));
-    } else {
-      setMapCenter(centre, zoom);
-    }
+        map.zoomToExtent(proj(bbox));
+      } else {
+        setMapCenter(centre, zoom);
+      }
 
-    if (marker) {
-      removeMarkerFromMap(marker);
-    }
+      if (marker) {
+        removeMarkerFromMap(marker);
+      }
 
-    marker = addMarkerToMap(centre, getArrowIcon());
-  }
+      marker = addMarkerToMap(centre, getArrowIcon());
+
+      return false;
+    });
+  });
 
   function updateLocation() {
     var lonlat = unproj(map.getCenter());
@@ -276,12 +285,14 @@ end
 
   $(document).ready(function () {
     $("#exportanchor").click(function (e) {
-      $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
-      Event.stop(e);
+      $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>", success: function (sidebarHtml) {
+        startExport(sidebarHtml);
+      }});
+      e.preventDefault();
     });
 
-    <% if params[:action] == 'export' -%>
-    $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+    <% if params[:export] -%>
+    $("#exportanchor").click();
     <% end -%>
 
     <% if params[:query] -%>