X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b26adef905a900bb8d171e4fcb37098e4d7718b2..d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f:/app/views/site/index.html.erb
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 843d0d2de..5f42f416d 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,6 +1,6 @@
<% content_for :greeting do %>
<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
- <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |
+ <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
<% end %>
<% end %>
@@ -17,16 +17,15 @@
-
-
@@ -66,18 +65,17 @@ if params['node'] or params['way'] or params['relation']
end
end
+# Decide on a lat lon to initialise the map with. Various ways of doing this
if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
bbox = true
minlon = h(params['minlon'])
minlat = h(params['minlat'])
maxlon = h(params['maxlon'])
maxlat = h(params['maxlat'])
+ layers = h(params['layers'])
box = true if params['box']=="yes"
object_zoom = false
-end
-
-# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['lon'] and params['lat']
+elsif params['lon'] and params['lat']
lon = h(params['lon'])
lat = h(params['lat'])
zoom = h(params['zoom'] || '5')
@@ -96,7 +94,9 @@ elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
lat = @user.home_lat
zoom = '10'
else
- session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+ unless STATUS == :database_readonly or STATUS == :database_offline
+ session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+ end
if session[:location]
bbox = true
@@ -255,7 +255,11 @@ end
sidebar_width = sidebar_width + 5
}
+ <% if t('html.dir') == "ltr" -%>
$("map").style.left = (sidebar_width) + "px";
+ <% else -%>
+ $("map").style.right = (sidebar_width) + "px";
+ <% end -%>
$("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
$("map").style.height = ($("content").offsetHeight - 2) + "px";
@@ -270,40 +274,37 @@ end
resizeMap();
}
- function josmEditHandler() {
+ function remoteEditHandler(event) {
var extent = getMapExtent();
var loaded = false;
- $("linkloader").onload = function () { loaded = true; };
+ $("linkloader").observe("load", function () { loaded = true; });
$("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
setTimeout(function () {
- if (!loaded) alert("<%= t('site.index.josm_failed') %>");
+ if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
}, 1000);
- return false;
+ event.stop();
}
function installEditHandler() {
- $("josmanchor").onclick =josmEditHandler;
+ $("remoteanchor").observe("click", remoteEditHandler);
- <% if preferred_editor == "josm" %>
- $("editanchor").onclick =josmEditHandler;
+ <% if preferred_editor == "remote" %>
+ $("editanchor").observe("click", remoteEditHandler);
<% if params[:action] == "edit" %>
- josmEditHandler();
+ remoteEditHandler();
<% end %>
<% end %>
}
mapInit();
- window.onload = handleResize;
- window.onresize = handleResize;
-
- Event.observe(window, 'load', installEditHandler);
- Event.observe(window, 'load', handleResize);
- Event.observe(window, 'resize', handleResize);
+ Event.observe(window, "load", installEditHandler);
+ Event.observe(window, "load", handleResize);
+ Event.observe(window, "resize", handleResize);
<% if params['action'] == 'export' %>
<%= remote_function :url => { :controller => 'export', :action => 'start' } %>