cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make permalinks draggable

Browse source 
Move the div containing the permalinks outside the map div so that
they aren't affected by the OpenLayers event handlers and hence get
the normal drag handling for links. Closes #3251.
This commit is contained in:
Tom Hughes 2010-10-11 08:39:05 +01:00
parent 59e86dc07a
commit 1a80a11c4c
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/views/site/index.html.erb
View file

@ -17,11 +17,12 @@
</noscript>
<div id="map">
<div id="permalink">
<a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
<a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
</div>
</div>
</div>
<div id="permalink">
<a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
<a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
</div>
<div id="attribution">
<table width="100%">
@ -40,7 +41,7 @@
</div>
<%
if params['mlon'] and params['mlat']
if params['mlon'] and params['mlat']
marker = true
mlon = h(params['mlon'])
mlat = h(params['mlat'])
@ -68,7 +69,7 @@ if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat
minlat = h(params['minlat'])
maxlon = h(params['maxlon'])
maxlat = h(params['maxlat'])
box = true if params['box']=="yes"
box = true if params['box']=="yes"
object_zoom = false
end
@ -80,14 +81,14 @@ if params['lon'] and params['lat']
layers = h(params['layers'])
object_zoom = false
elsif params['mlon'] and params['mlat']
lon = h(params['mlon'])
lon = h(params['mlon'])
lat = h(params['mlat'])
zoom = h(params['zoom'] || '12')
layers = h(params['layers'])
object_zoom = false
elsif cookies.key?("_osm_location")
lon,lat,zoom,layers = cookies["_osm_location"].split("|")
elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
lon = @user.home_lon
lat = @user.home_lat
zoom = '10'
@ -101,12 +102,12 @@ else
maxlon = session[:location][:maxlon]
maxlat = session[:location][:maxlat]
else
lon = '-0.1'
lat = '51.5'
zoom = h(params['zoom'] || '5')
lon = '-0.1'
lat = '51.5'
zoom = h(params['zoom'] || '5')
end
layers = h(params['layers'])
layers = h(params['layers'])
end
%>
@ -229,7 +230,7 @@ end
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
expiry.setYear(expiry.getFullYear() + 10);
expiry.setYear(expiry.getFullYear() + 10);
document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
}
@ -241,7 +242,7 @@ end
content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
}
function resizeMap() {
var centre = map.getCenter();
var zoom = map.getZoom();
@ -265,7 +266,7 @@ end
resizeMap();
}
mapInit();
window.onload = handleResize;