X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2c397321c9309eb9cd4dfed21375fc821a8d2d37..dd3b577bd5bbe4f9d9d1cac8e0f328a16b75f7f5:/app/views/site/index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 6cff7f133..4c954e6cb 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -4,6 +4,12 @@
   <% end %>
 <% end %>
 
+<% unless STATUS == :api_offline or STATUS == :database_offline -%>
+  <% content_for :editmenu do -%>
+    <li><%= link_to_function(t('browse.start_rjs.data_layer_name'), 'showData()') %></li>
+  <% end -%>
+<% end -%>
+
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
@@ -12,7 +18,6 @@
   <div id="noscript">
     <p><%= t 'site.index.js_1' %></p>
     <p><%= t 'site.index.js_2' %></p>
-    <p><%= t 'site.index.js_3' %></p>
   </div>
 </noscript>
 
@@ -135,8 +140,10 @@ end
     map = createMap("map");
 
     <% unless STATUS == :api_offline or STATUS == :database_offline %>
-      map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
-      map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
+      map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
+          visibility: false,
+          displayInLayerSwitcher: false
+      });
       map.addLayer(map.dataLayer);
     <% end %>
 
@@ -144,7 +151,7 @@ end
       <% if bbox %>
         var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
-        map.setExtent(proj(bbox));
+        map.zoomToExtent(proj(bbox));
 
         <% if box %>
           $(window).load(function() { addBoxToMap(bbox) });
@@ -186,12 +193,8 @@ end
     handleResize();
   }
 
-  function toggleData() {
-    if (map.dataLayer.visibility) {
-      $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
-    } else if (map.dataLayer.active) {
-      closeSidebar();
-    }
+  function showData() {
+    $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
   }
 
   function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {
@@ -200,7 +203,7 @@ end
     if (min_lon && min_lat && max_lon && max_lat) {
       var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
 
-      map.setExtent(proj(bbox));
+      map.zoomToExtent(proj(bbox));
     } else {
       setMapCenter(centre, zoom);
     }