Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs

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

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index b7ad7d7e4b782e338a8515f56a95cdb0a7d24fe5..0a5aae4ad29b824f384b3af260f34d958f75c69b 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -1,3 +1,4 @@
+

 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links


@@ -9,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;
 
   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;
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;


@@ -24,7 +25,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
     node.href = setArgs(node.href, args);
   }
 

-  node = document.getElementById("viewanchor");
+  node = $("viewanchor");

   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;


@@ -36,7 +37,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
     node.href = setArgs(node.href, args);
   }
 

-  node = document.getElementById("exportanchor");
+  node = $("exportanchor");

   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;


@@ -48,22 +49,27 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
     node.href = setArgs(node.href, args);
   }
 

-  node = document.getElementById("editanchor");
+  node = $("editanchor");

   if (node) {
     if (zoom >= 13) {
       var args = new Object();
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;
   if (node) {
     if (zoom >= 13) {
       var args = new Object();
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;

+      if (objtype && objid) {
+        args[objtype] = objid;
+      }

       node.href = setArgs("/edit", args);
       node.href = setArgs("/edit", args);

-      node.style.fontStyle = 'normal';
+      node.title = i18n("javascripts.site.edit_tooltip");
+      node.removeClassName("disabled");

     } else {
     } else {

-      node.href = 'javascript:alert("zoom in to edit map");';
-      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();
   if (node) {
     if (zoom >= 11) {
       var args = new Object();


@@ -72,23 +78,25 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
          typeof minlat == "number" &&
          typeof maxlon == "number" &&
          typeof maxlat == "number") {
          typeof minlat == "number" &&
          typeof maxlon == "number" &&
          typeof maxlat == "number") {

-      
+

         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;
         maxlon = Math.round(maxlon * decimals) / decimals;
         maxlat = Math.round(maxlat * decimals) / decimals;
         args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
       }
         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;
         maxlon = Math.round(maxlon * decimals) / decimals;
         maxlat = Math.round(maxlat * decimals) / decimals;
         args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
       }

-      
+

       node.href = setArgs("/history", args);
       node.href = setArgs("/history", args);

-      node.style.fontStyle = 'normal';
+      node.title = i18n("javascripts.site.history_tooltip");
+      node.removeClassName("disabled");

     } else {
     } else {

-      node.href = 'javascript:alert("zoom in to see editing history");';
-      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);
   if (node) {
     var args = getArgs(node.href);
     var code = makeShortCode(lat, lon, zoom);


@@ -105,6 +113,9 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     if (layers && (layers != "B000FTF") && (layers != "B000FTFT")) {
       args["layers"] = layers;
     }
     if (layers && (layers != "B000FTF") && (layers != "B000FTFT")) {
       args["layers"] = layers;
     }

+    else {
+      delete args["layers"];
+    }

 
     // Here we're assuming that all parameters but ?layers= and
     // ?{node,way,relation}= can be safely omitted from the shortlink
 
     // Here we're assuming that all parameters but ?layers= and
     // ?{node,way,relation}= can be safely omitted from the shortlink


@@ -125,7 +136,7 @@ function shortlinkPrefix() {
   if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
     return "http://osm.org";
   } else {
   if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
     return "http://osm.org";
   } else {

-    return "";     
+    return "";

   }
 }
 
   }
 }
 


@@ -195,15 +206,17 @@ function getStyle(el, property) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {
  * 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");
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
     var re = new RegExp(re_key, "g");

-      
+

     string = string.replace(re, keys[key]);
   }
     string = string.replace(re, keys[key]);
   }

-   
+

   return string;
   return string;

-} 
+}

 
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
 
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";


@@ -231,7 +244,7 @@ function makeShortCode(lat, lon, zoom) {
        str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {
        str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {

-       str += "=";
+       str += "-";

     }
     return str;
 }
     }
     return str;
 }