X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/716262f211a8983a4272eabf3fdba9877b068b65..bd12ec7a8bfdc244756272a2f4fec1f645a6d852:/app/views/browse/_map.html.erb
diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index b84f7a483..2c29a0d00 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -11,12 +11,12 @@
<%= t 'browse.map.loading' %>
<%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
- <%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
+ <%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "â¾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
<% unless map.instance_of? Changeset %>
- <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
+ <%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
- <%= link_to("", { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
+ <%= link_to(h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "â¾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
<% end %>
<% else %>
<%= t 'browse.map.deleted' %>
@@ -50,19 +50,19 @@
var bottom = bbox.bottom - 0.0001;
var loaded = false;
- $("linkloader").observe("load", function () { loaded = true; });
+ $("#linkloader").load(function () { loaded = true; });
if (select) {
- $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select;
+ $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
} else {
- $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom;
+ $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
}
setTimeout(function () {
- if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+ if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
}, 1000);
- event.stop();
+ return false;
}
function init() {
@@ -70,7 +70,7 @@
controls: [ new OpenLayers.Control.Navigation() ]
});
- <% if map.instance_of? Changeset %>
+ <% if map.instance_of? Changeset -%>
<% bbox = map.bbox.to_unscaled %>
var minlon = <%= bbox.min_lon %>;
var minlat = <%= bbox.min_lat %>;
@@ -79,32 +79,29 @@
var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
var centre = bbox.getCenterLonLat();
- setMapExtent(bbox);
+ map.zoomToExtent(proj(bbox));
addBoxToMap(bbox);
- $("loading").style.display = "none";
+ $("#loading").hide();
+ $("#browse_map .geolink").show();
- $$("#browse_map .geolink").each(function (link) {
- link.style.display = "inline";
+ $("#remote_area_edit").click(function (event) {
+ return remoteEditHandler(event, bbox);
});
- $("remote_area_edit").observe("click", function (event) {
- remoteEditHandler(event, bbox);
+ <% if preferred_editor == "remote" -%>
+ $("#area_edit").click(function (event) {
+ return remoteEditHandler(event, bbox);
});
+ <% end -%>
- <% if preferred_editor == "remote" %>
- $("area_edit").observe("click", function (event) {
- remoteEditHandler(event, bbox);
- });
- <% end %>
-
- updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
- <% else %>
+ updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat);
+ <% else -%>
var obj_type = "<%= map.class.name.downcase %>";
var obj_id = <%= map.id %>;
var obj_version = <%= map.version %>;
var obj_visible = <%= map.visible %>;
- var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
+ var url = "/api/<%= API_VERSION %>/<%= map.class.name.downcase %>/<%= map.id %>";
if (obj_type != "node") {
url += "/full";
@@ -113,46 +110,50 @@
url += "/" + previous_version;
}
- addObjectToMap(url, true, function(extent) {
- $("loading").style.display = "none";
+ $("#object_larger_map").hide();
+ $("#object_edit").hide();
- $$("#browse_map .geolink").each(function (link) {
- link.style.display = "inline";
- });
+ addObjectToMap(url, true, function(extent) {
+ $("#loading").hide();
+ $("#browse_map .geolink").show();
if (extent) {
extent.transform(map.getProjectionObject(), map.displayProjection);
var centre = extent.getCenterLonLat();
- $("remote_area_edit").observe("click", function (event) {
- remoteEditHandler(event, extent);
+ $("#remote_area_edit").click(function (event) {
+ return remoteEditHandler(event, extent);
});
- <% if preferred_editor == "remote" %>
- $("area_edit").observe("click", function (event) {
- remoteEditHandler(event, extent);
- });
- <% end %>
+ <% if preferred_editor == "remote" -%>
+ $("#area_edit").click(function (event) {
+ return remoteEditHandler(event, extent);
+ });
+ <% end -%>
- <% unless map.instance_of? Changeset %>
- $("remote_object_edit").observe("click", function (event) {
- remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
- });
+ $("#remote_object_edit").click(function (event) {
+ return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+ });
+
+ <% if preferred_editor == "remote" -%>
+ $("#object_edit").click(function (event) {
+ return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+ });
+ <% end -%>
- $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
- $("object_edit").innerHTML = "<%= t('browse.map.edit.' + map.class.to_s.downcase) %>";
- <% end %>
+ $("#object_larger_map").show();
+ $("#object_edit").show();
- updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>)
+ updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);
} else {
- $("small_map").style.display = "none";
+ $("#small_map").hide();
}
});
- <% end %>
+ <% end -%>
- createMenu("area_edit", "area_edit_menu", 1000, "right");
- createMenu("object_edit", "object_edit_menu", 1000, "right");
+ createMenu("area_edit", "area_edit_menu", "right");
+ createMenu("object_edit", "object_edit_menu", "right");
}
window.onload = init;