Merge branch 'master' into openstreetbugs

[rails.git] / public / javascripts / site.js

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 17b2f066875c1ed487c9b15c29b1b106bb9031ae..0e2c5aeb7d12f0d69c5ac3a77b3c955cab1a2778 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -10,7 +10,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
   lat = Math.round(lat * decimals) / decimals;
   lon = Math.round(lon * decimals) / decimals;
 
-  node = document.getElementById("permalinkanchor");
+  node = $("permalinkanchor");
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
@@ -25,7 +25,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
-  node = document.getElementById("viewanchor");
+  node = $("viewanchor");
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
@@ -37,7 +37,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
-  node = document.getElementById("exportanchor");
+  node = $("exportanchor");
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
@@ -49,7 +49,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
-  node = document.getElementById("editanchor");
+  node = $("editanchor");
   if (node) {
     if (zoom >= 13) {
       var args = new Object();
@@ -60,14 +60,16 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
         args[objtype] = objid;
       }
       node.href = setArgs("/edit", args);
-      node.style.fontStyle = 'normal';
+      node.title = i18n("javascripts.site.edit_tooltip");
+      node.removeClassName("disabled");
     } else {
-      node.href = 'javascript:alert(rails_i18n["layouts.edit_zoom_alert"]);';
-      node.style.fontStyle = 'italic';
+      node.href = 'javascript:alert(i18n("javascripts.site.edit_zoom_alert"));';
+      node.title = i18n("javascripts.site.edit_disabled_tooltip");
+      node.addClassName("disabled");
     }
   }
 
-  node = document.getElementById("historyanchor");
+  node = $("historyanchor");
   if (node) {
     if (zoom >= 11) {
       var args = new Object();
@@ -85,14 +87,16 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       }
 
       node.href = setArgs("/history", args);
-      node.style.fontStyle = 'normal';
+      node.title = i18n("javascripts.site.history_tooltip");
+      node.removeClassName("disabled");
     } else {
-      node.href = 'javascript:alert(rails_i18n["layouts.history_zoom_alert"]);';
-      node.style.fontStyle = 'italic';
+      node.href = 'javascript:alert(i18n("javascripts.site.history_zoom_alert"));';
+      node.title = i18n("javascripts.site.history_disabled_tooltip");
+      node.addClassName("disabled");
     }
   }
 
-  node = document.getElementById("shortlinkanchor");
+  node = $("shortlinkanchor");
   if (node) {
     var args = getArgs(node.href);
     var code = makeShortCode(lat, lon, zoom);
@@ -103,10 +107,8 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       args[objtype] = objid;
     }
 
-    // This is a hack to omit the default mapnik layer (B000FTF) from
-    // the shortlink. B000FTFT is then the "Object" layer which we get
-    // on /?{node,way,relation}=id
-    if (layers && (layers != "B000FTF") && (layers != "B000FTFT")) {
+    // This is a hack to omit the default mapnik layer from the shortlink.
+    if (layers && layers != "M") {
       args["layers"] = layers;
     }
     else {
@@ -202,6 +204,8 @@ function getStyle(el, property) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {
+  string = i18n_strings[string] || string
+
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
     var re = new RegExp(re_key, "g");