diff --git a/src/c3nav/site/static/site/css/c3nav.scss b/src/c3nav/site/static/site/css/c3nav.scss index a484b2fe..afb20f34 100644 --- a/src/c3nav/site/static/site/css/c3nav.scss +++ b/src/c3nav/site/static/site/css/c3nav.scss @@ -131,6 +131,9 @@ main.account form { #modal-content :last-child { margin-bottom: 0; } +.app-download-buttons { + margin-top: 20px; +} #map { position: absolute; diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index 5312c836..11963e47 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -705,6 +705,7 @@ c3nav = { .on('blur', c3nav._locationinput_blur) .on('keydown', c3nav._locationinput_keydown); $('.locationinput .clear').on('click', c3nav._locationinput_clear); + $('.locationinput .locate').on('click', c3nav._locationinput_locate); $('#autocomplete').on('mouseover', '.location', c3nav._locationinput_hover_suggestion) .on('click', '.location', c3nav._locationinput_click_suggestion); $('html').on('focus', '*', c3nav._locationinput_global_focuschange) @@ -738,6 +739,11 @@ c3nav = { c3nav.update_state(); $(this).parent().find('input').focus(); }, + _locationinput_locate: function () { + if (!window.mobileclient) { + c3nav.open_modal($('#app-ad').html()); + } + }, _locationinput_reset_autocomplete: function () { // hide autocomplete var $autocomplete = $('#autocomplete'); @@ -937,7 +943,7 @@ c3nav = { }, _modal_link_click: function(e) { var location = $(this).attr('href'); - if (location.startsWith('/control/')) { + if ($(this).is('[target]') || location.startsWith('/control/')) { $(this).attr('target', '_blank'); return; } diff --git a/src/c3nav/site/templates/site/map.html b/src/c3nav/site/templates/site/map.html index 1730c5eb..3d8655fa 100644 --- a/src/c3nav/site/templates/site/map.html +++ b/src/c3nav/site/templates/site/map.html @@ -29,7 +29,7 @@ {% trans 'Route from here' %} - Share + {% trans 'Share' %} @@ -37,6 +37,13 @@ {% trans 'create shortcut' %} + + {% trans 'Wifi-based location' %} + {% trans 'Get the c3nav app for Android to see your location on the map.' %} + + Google Play + +
@@ -37,6 +37,13 @@ {% trans 'create shortcut' %}
{% trans 'Get the c3nav app for Android to see your location on the map.' %}
+ Google Play +