Make permalinks draggable

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.

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index ddd66a861553e79b32936b224a70b8bf16e1e876..a89212238a26e7706b18a3239b711b284a700abe 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -17,11 +17,12 @@
 </noscript>
 
 <div id="map">
 </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%">
 
 <div id="attribution">
   <table width="100%">


@@ -40,7 +41,7 @@
 </div>
 
 <%
 </div>
 
 <%

-if params['mlon'] and params['mlat'] 
+if params['mlon'] and params['mlat']

     marker = true
     mlon = h(params['mlon'])
     mlat = h(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'])
     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
 
     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']
     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("|")
     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'
     lon =  @user.home_lon
     lat =  @user.home_lat
     zoom = '10'


@@ -101,12 +102,12 @@ else
         maxlon = session[:location][:maxlon]
         maxlat = session[:location][:maxlat]
     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
 
     end
 

-    layers = h(params['layers']) 
+    layers = h(params['layers'])

 end
 %>
 
 end
 %>
 


@@ -229,7 +230,7 @@ end
 
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
 
 
     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();
   }
 
     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;
   }
     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();
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();


@@ -265,7 +266,7 @@ end
 
     resizeMap();
   }
 
     resizeMap();
   }

-  
+

   mapInit();
 
   window.onload = handleResize;
   mapInit();
 
   window.onload = handleResize;

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 2590c2d5f655a3d456bb320c7447643884e9b83a..42f28612ee809c73ab152df8d2b4a781801c7362 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -335,12 +335,12 @@ hr {
   display: none !important;
 }
 
   display: none !important;
 }
 

-#map #permalink {
-  z-index:10000;
-  position:absolute;
-  bottom:15px;
-  right:15px;
-  font-size:smaller;
+#permalink {
+  z-index: 10000;
+  position: absolute;
+  bottom: 15px;
+  right: 15px;
+  font-size: smaller;

   text-align: right;
 }
 
   text-align: right;
 }