X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f8a68371ad34594cce4aadf5fef229588fd4ddc..c03c8f4749c176df8107ef8e66b9a55db9875089:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 35509f4e0..f816dddd2 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,6 +1,6 @@
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
-<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<%= link_to_function t('site.index.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>
 
@@ -10,24 +10,24 @@
 
 <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 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">
   <table width="100%">
     <tr>
-      <td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
-      <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 align="center"><%=
+        I18n.t('site.index.license.notice',
+          :license_name => ('<a href="' + t('site.index.license.license_url') + '">' + t('site.index.license.license_name') + '</a>'),
+          :project_name => ('<a href="' + t('site.index.license.project_url') + '">' + t('site.index.license.project_name') + '</a>'))
+        %></td>
     </tr>
   </table>
 </div>
@@ -45,6 +45,7 @@ if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat
 	minlat = h(params['minlat'])
 	maxlon = h(params['maxlon'])
 	maxlat = h(params['maxlat'])
+	box = true if params['box']=="yes" 
 end
 
 # Decide on a lat lon to initialise the map with. Various ways of doing this
@@ -96,6 +97,8 @@ end
   var marker;
   var map;
 
+  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+
   function mapInit(){
     map = createMap("map");
 
@@ -109,13 +112,17 @@ end
     var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
     setMapExtent(bbox);
+    <%    if box %>
+    // 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 %>);
     var zoom = <%= zoom %>;
 
-    <% if params['scale'] and params['scale'].length > 0 then %>
+    <%    if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
-    <% end %>
+    <%    end %>
 
     setMapCenter(centre, zoom);
     <% end %>
@@ -165,10 +172,12 @@ end
     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() {