Merge 7744:7922 from trunk.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index f924f7a1431e8f3a4b7b301eb0da0c6dfad2250c..656db99c80008a3b8757d061bf25d12f52dad4d1 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -8,9 +8,13 @@
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 

-<noscript><div id="noscript"><p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
-<p>OpenStreetMap uses javascript for its slippy map.</p>
-<p>Try the <a href="http://tah.openstreetmap.org/Browse/">OpenStreetMap static tile browser</a>.</p></div></noscript>
+<noscript>
+  <div id="noscript">
+    <p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
+    <p>OpenStreetMap uses javascript for its slippy map.</p>
+    <p>You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.</p>
+  </div>
+</noscript>

 
 <div id="map">
 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
 
 <div id="map">
 <div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>


@@ -90,6 +94,10 @@ by the OpenStreetMap project and its contributors.
   function mapInit(){
     map = createMap("map");
 
   function mapInit(){
     map = createMap("map");
 

+    map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+    map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+    map.addLayer(map.dataLayer);
+

     <% if bbox %>
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
     <% if bbox %>
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 


@@ -122,6 +130,14 @@ by the OpenStreetMap project and its contributors.
     handleResize();
   }
 
     handleResize();
   }
 

+  function toggleData() {
+    if (map.dataLayer.visibility) {
+      <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
+    } else {
+      closeSidebar();
+    }
+  }
+

   function getPosition() {
     return getMapCenter();
   }
   function getPosition() {
     return getMapCenter();
   }