From: Tom Hughes <tom@compton.nu>
Date: Sun, 28 Oct 2007 16:46:10 +0000 (+0000)
Subject: Fix tab breakage and make key update as zoom level changes.
X-Git-Tag: live~8106
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/877724813ce3b9bc8b3a33a1544bdc4e27d2f2af

Fix tab breakage and make key update as zoom level changes.
---

diff --git a/app/views/site/_key.rhtml b/app/views/site/_key.rhtml
index 54ec82909..320890078 100644
--- a/app/views/site/_key.rhtml
+++ b/app/views/site/_key.rhtml
@@ -5,12 +5,21 @@
 <script type="text/javascript">
 <!--
   function showKey() {
-	var zoomlevel=map.getZoom();
-	if      (zoomlevel<7 ) { var imgname='keymapnik6.png'; }
-	else if (zoomlevel<12) { var imgname='keymapnik'+zoomlevel+'.png'; }
-	else                   { var imgname='keymapnik12.png'; }
+    var zoomlevel = map.getZoom();
+
+    if (zoomlevel<7 )      { var imgname = 'keymapnik6.png'; }
+    else if (zoomlevel<12) { var imgname = 'keymapnik'+zoomlevel+'.png'; }
+    else                   { var imgname = 'keymapnik12.png'; }
+
     updateSidebar("Map key", "<p><img src='images/"+imgname+"' /></p>");
     openSidebar("210px");
   }
+
+  function updateKey() {
+    if (sidebarOpen("Map key")) 
+    {
+      showKey();
+    }
+  }
 // -->
 </script>
diff --git a/app/views/site/_sidebar.rhtml b/app/views/site/_sidebar.rhtml
index 8cf1ce62c..7addbe177 100644
--- a/app/views/site/_sidebar.rhtml
+++ b/app/views/site/_sidebar.rhtml
@@ -12,14 +12,17 @@
 <script type="text/javascript">
 <!--
   function openSidebar() {
-	if (arguments.length) { $("sidebar").style.width = arguments[0]; }
-	                 else { $("sidebar").style.width = "30%"; }
+    if (arguments.length) { $("sidebar").style.width = arguments[0]; }
+    else { $("sidebar").style.width = "30%"; }
+
     $("sidebar").style.display = "block";
+
     <%= onopen %>
   }
 
   function closeSidebar() {
     $("sidebar").style.display = "none";
+
     <%= onclose %>
   }
 
@@ -27,5 +30,10 @@
     $("sidebar_title").innerHTML = title;
     $("sidebar_content").innerHTML = content;
   }
+
+  function sidebarOpen(title) {
+    return $("sidebar").style.display == "block" &&
+           $("sidebar_title").innerHTML == title;
+  }
 // -->
 </script>
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 625f17a10..5ca8b0339 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -96,6 +96,8 @@
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 
+    map.events.register("zoomend", map, updateKey);
+
     map.events.register("moveend", map, updateLocation);
     updateLocation();