Remove mention of Tiles@Home from noscript text

[rails.git] / app / views / site / index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index e268d5d3c8ea4076b3844e1b019a0ae10b081926..0c7b53203c88dd7817bb9b8114c5aeae19638da7 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -12,7 +12,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 +134,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,18 +145,18 @@ 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) });
         <% end %>
       <% else %>
         var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
+        <% if params[:scale].to_f > 0 then -%>
+        var zoom = <%= scale_to_zoom params[:scale] %>;
+        <% else -%>
         var zoom = <%= zoom %>;
-
-        <% if params[:scale] and params[:scale].length > 0 and params[:scale].to_f > 0 then %>
-            zoom = <%= Math.log(360.0 / (params[:scale].to_f * 512.0)) / Math.log(2.0) %>;
-        <% end %>
+        <% end -%>
 
         setMapCenter(centre, zoom);
       <% end %>
@@ -186,12 +187,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 +197,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);
     }