X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/60cdce60b57e97fb1a607a6c552be6931740e618..d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f:/app/views/site/index.html.erb?ds=sidebyside
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index eac166c91..5f42f416d 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -17,16 +17,15 @@
-
-
@@ -95,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
@@ -254,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";
@@ -277,7 +282,7 @@ end
$("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.remote_failed') %>");
+ if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
}, 1000);
event.stop();