From 33744f3b8d3a7545c8200c2999475bc4dd94a73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Wed, 25 Dec 2019 00:59:44 +0100 Subject: [PATCH] show report missing location in the first popup level already --- src/c3nav/site/static/site/js/c3nav.js | 10 ++++++++-- src/c3nav/site/templates/site/map.html | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index 9422e23b..defc0d4a 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -818,6 +818,8 @@ c3nav = { c3nav._click_anywhere_load(false); } else if ($(this).is('.show-nearby')) { c3nav._click_anywhere_load(true); + } else if ($(this).is('a')) { + c3nav._modal_link_click.call(this, e); } } }, @@ -1270,8 +1272,12 @@ c3nav = { _click_anywhere_popup: null, _click_anywhere: function(e) { if (e.originalEvent.target.id !== 'map') return; - var popup = L.popup(c3nav._add_map_padding({className: 'location-popup', maxWidth: 500}, 'autoPanPaddingTopLeft', 'autoPanPaddingBottomRight')); - popup.setLatLng(e.latlng).setContent($('#anywhere-popup-buttons').html()); + var popup = L.popup(c3nav._add_map_padding({className: 'location-popup', maxWidth: 500}, 'autoPanPaddingTopLeft', 'autoPanPaddingBottomRight')), + level = c3nav._levelControl.currentLevel, + name = 'c:'+String(c3nav.level_labels_by_id[level])+':'+Math.round(e.latlng.lng*100)/100+':'+Math.round(e.latlng.lat*100)/100; + var buttons = $('#anywhere-popup-buttons').clone(); + buttons.find('.report').attr('href', '/report/l/' + name + '/'); + popup.setLatLng(e.latlng).setContent(buttons.html()); c3nav._click_anywhere_popup = popup; popup.on('remove', function() { c3nav._click_anywhere_popup = null }).openOn(c3nav.map); }, diff --git a/src/c3nav/site/templates/site/map.html b/src/c3nav/site/templates/site/map.html index 0e45eb8f..041d9faa 100644 --- a/src/c3nav/site/templates/site/map.html +++ b/src/c3nav/site/templates/site/map.html @@ -42,6 +42,12 @@ {% trans 'Show nearby locations' %} +
+ + feedback + {% trans 'Report missing location' %} + +