diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index f9158463a..bc7ca3394 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -279,6 +279,8 @@ end
}
function installEditHandler() {
+ $("josmanchor").onclick =josmEditHandler;
+
<% if preferred_editor == "josm" %>
$("editanchor").onclick =josmEditHandler;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cfaa07bf1..2b2694a11 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -912,6 +912,7 @@ en:
gps_traces_tooltip: Manage GPS traces
user_diaries: User Diaries
user_diaries_tooltip: View user diaries
+ edit_with: Edit with {{editor}}
tag_line: The Free Wiki World Map
intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
diff --git a/public/javascripts/menu.js b/public/javascripts/menu.js
new file mode 100644
index 000000000..7a0cbf419
--- /dev/null
+++ b/public/javascripts/menu.js
@@ -0,0 +1,62 @@
+/*
+ * Open a menu.
+ */
+function openMenu(anchor, menu) {
+ menu.style.display = "block";
+
+ menu.clonePosition(anchor, {
+ setLeft: true, setTop: true, setWidth: false, setHeight: false,
+ offsetLeft: 0, offsetTop: anchor.getHeight()
+ });
+}
+
+/*
+ * Callback called when the mouse enters a menu anchor.
+ */
+function enterMenuAnchor(event, anchor, menu, delay) {
+ clearTimeout(menu.timer);
+
+ if (delay > 0) {
+ menu.timer = setTimeout(function () { openMenu(anchor, menu) }, delay);
+ } else {
+ openMenu(event, menu);
+ }
+}
+
+/*
+ * Callback called when the mouse leaves a menu anchor.
+ */
+function leaveMenuAnchor(event, anchor, menu) {
+ var to = event.relatedTarget || event.toElement;
+
+ if (to != menu && !to.descendantOf(menu)) {
+ menu.style.display = "none";
+ }
+
+ clearTimeout(menu.timer);
+}
+
+/*
+ * Callback called when the mouse leaves a menu.
+ */
+function leaveMenu(event, anchor, menu) {
+ var to = event.relatedTarget || event.toElement;
+
+ if (to != anchor && !to.descendantOf(menu)) {
+ menu.style.display = "none";
+ }
+
+ clearTimeout(menu.timer);
+}
+
+/*
+ * Setup a menu, triggered by hovering over an anchor for a given time.
+ */
+function createMenu(anchorid, menuid, delay) {
+ var anchor = $(anchorid);
+ var menu = $(menuid);
+
+ anchor.onmouseover = function (event) { enterMenuAnchor(anchor, anchor, menu, delay) };
+ anchor.onmouseout = function (event) { leaveMenuAnchor(event, anchor, menu) };
+ menu.onmouseout = function (event) { leaveMenu(event, anchor, menu) };
+}
diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 0e2c5aeb7..b11a2e012 100644
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -1,4 +1,3 @@
-
/*
* Called as the user scrolls/zooms around to aniplate hrefs of the
* view tab and various other links
@@ -69,15 +68,54 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
}
}
+ node = $("potlatchanchor");
+ if (node) {
+ var args = new Object();
+ args.editor = "potlatch";
+ args.lat = lat;
+ args.lon = lon;
+ args.zoom = zoom;
+ if (objtype && objid) {
+ args[objtype] = objid;
+ }
+ node.href = setArgs("/edit", args);
+ }
+
+ node = $("potlatch2anchor");
+ if (node) {
+ var args = new Object();
+ args.editor = "potlatch2";
+ args.lat = lat;
+ args.lon = lon;
+ args.zoom = zoom;
+ if (objtype && objid) {
+ args[objtype] = objid;
+ }
+ node.href = setArgs("/edit", args);
+ }
+
+ node = $("josmanchor");
+ if (node) {
+ var args = new Object();
+ args.editor = "josm";
+ args.lat = lat;
+ args.lon = lon;
+ args.zoom = zoom;
+ if (objtype && objid) {
+ args[objtype] = objid;
+ }
+ node.href = setArgs("/edit", args);
+ }
+
node = $("historyanchor");
if (node) {
if (zoom >= 11) {
var args = new Object();
//set bbox param from 'extents' object
if (typeof minlon == "number" &&
- 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;
@@ -225,24 +263,24 @@ function makeShortCode(lat, lon, zoom) {
// z18 so we don't need to care for now.
var c1 = 0, c2 = 0;
for (var i = 31; i > 16; --i) {
- c1 = (c1 << 1) | ((x >> i) & 1);
- c1 = (c1 << 1) | ((y >> i) & 1);
+ c1 = (c1 << 1) | ((x >> i) & 1);
+ c1 = (c1 << 1) | ((y >> i) & 1);
}
for (var i = 16; i > 1; --i) {
- c2 = (c2 << 1) | ((x >> i) & 1);
- c2 = (c2 << 1) | ((y >> i) & 1);
+ c2 = (c2 << 1) | ((x >> i) & 1);
+ c2 = (c2 << 1) | ((y >> i) & 1);
}
var str = "";
for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
- digit = (c1 >> (24 - 6 * i)) & 0x3f;
- str += char_array.charAt(digit);
+ digit = (c1 >> (24 - 6 * i)) & 0x3f;
+ str += char_array.charAt(digit);
}
for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
- digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
- str += char_array.charAt(digit);
+ digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+ str += char_array.charAt(digit);
}
for (var i = 0; i < ((zoom + 8) % 3); ++i) {
- str += "-";
+ str += "-";
}
return str;
}
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 42f28612e..9535caacd 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -344,6 +344,27 @@ hr {
text-align: right;
}
+/* Rules for edit menu */
+
+#editmenu {
+ display: none;
+ z-index: 10000;
+ position: absolute;
+ background-color: #ffffff;
+ border: 1px solid black;
+}
+
+#editmenu ul {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+#editmenu li {
+ list-style-type: none;
+}
+
/* Rules for attribution text under the main map shown on printouts */
#attribution {