fixed fatal error as a result of copy/paste programming

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 66f69960b496540e561f8bf50881dfe0f3210243..37004e25bdbf872c91259622b53c5c6036164f41 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -10,14 +10,14 @@
 
 <noscript>
   <div id="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>
+    <p><%= t 'site.index.js_1' %></p>
+    <p><%= t 'site.index.js_2' %></p>
+    <p><%= t 'site.index.js_3' %></p>

   </div>
 </noscript>
 
 <div id="map">
   </div>
 </noscript>
 
 <div id="map">

-<div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
+<div id="permalink"><a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a></div>

 </div> 
 
 <div id="attribution">
 </div> 
 
 <div id="attribution">


@@ -27,7 +27,7 @@
       <td align="right">http://openstreetmap.org/</td>
     </tr>
     <tr>
       <td align="right">http://openstreetmap.org/</td>
     </tr>
     <tr>

-      <td colspan="2" align="center">Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors.</td>
+      <td colspan="2" align="center"><%= t 'site.index.license' %></td>

     </tr>
   </table>
 </div>
     </tr>
   </table>
 </div>


@@ -111,7 +111,8 @@ end
 
     setMapExtent(bbox);
     <%    if box %>
 
     setMapExtent(bbox);
     <%    if box %>

-    box = addBoxToMap(bbox);
+    // IE requires Vector layers be initialised on page load, and not under deferred script conditions
+    Event.observe(window, 'load', function() {addBoxToMap(bbox)});

     <%    end %>
     <% else %>
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     <%    end %>
     <% else %>
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);


@@ -169,10 +170,12 @@ end
     var zoom = map.getZoom();
     var layers = getMapLayers();
     var extents = getMapExtent();
     var zoom = map.getZoom();
     var layers = getMapLayers();
     var extents = getMapExtent();

+    var expiry = new Date();

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents);
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top);

 
 

-    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
+    expiry.setYear(expiry.getFullYear() + 10); 
+    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();

   }
 
   function resizeContent() {
   }
 
   function resizeContent() {