Add a tooltip to help & wiki/news blog/shop/map key

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 53a4c9a07800aa27e44576fa278c46532942a4de..de1de19f4a3c505519b006bc9a6eb7e871d8428f 100644 (file)
--- 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? %>
 <% 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('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |

 <% end %>
 <% end %>
 
 <% end %>
 <% end %>
 


@@ -23,11 +23,11 @@
 <div id="attribution">
   <table width="100%">
     <tr>
 <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"><%= t 'site.index.license' %></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>
     </tr>
   </table>
 </div>


@@ -97,6 +97,8 @@ end
   var marker;
   var map;
 
   var marker;
   var map;
 

+  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+

   function mapInit(){
     map = createMap("map");
 
   function mapInit(){
     map = createMap("map");
 


@@ -170,10 +172,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.left, extents.bottom, extents.right, extents.top);
 
     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() {