diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 4d2776aad..76e701563 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -47,6 +47,7 @@ class Logbookadvanced extends CI_Controller { $pageData['sats'] = $this->bands->get_worked_sats(); $pageData['station_profile'] = $this->stations->all_of_user(); $pageData['active_station_info'] = $station_profile->row(); + $pageData['homegrid'] = explode(',', $this->stations->find_gridsquare()); $pageData['bands'] = $this->bands->get_worked_bands(); @@ -80,6 +81,7 @@ class Logbookadvanced extends CI_Controller { 'assets/js/sections/logbookadvanced.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/logbookadvanced.js")), 'assets/js/sections/cqmap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/cqmap_geojson.js")), 'assets/js/sections/itumap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/itumap_geojson.js")), + 'assets/js/leaflet/geocoding.js', ]; $this->load->view('interface_assets/header', $data); diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 701d2f335..d34749b8e 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -26,19 +26,6 @@ float: left; margin: 0 8px 0 0; } -.coordinates { - justify-content: center; - align-items: stretch; -} -.cohidden { - display:none; -} -#latDeg, #lngDeg { - width: 170px; -} -#locator, #distance, #bearing { - width: 120px; -}
diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 690e06a96..246301d5b 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -26,19 +26,6 @@ float: left; margin: 0 8px 0 0; } -.coordinates { - justify-content: center; - align-items: stretch; -} -.cohidden { - display:none; -} -#latDeg, #lngDeg { - width: 170px; -} -#locator, #distance, #bearing { - width: 120px; -}
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index b6e7d3db9..5a6618656 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -26,19 +26,6 @@ float: left; margin: 0 8px 0 0; } -.coordinates { - justify-content: center; - align-items: stretch; -} -.cohidden { - display:none; -} -#latDeg, #lngDeg { - width: 170px; -} -#locator, #distance, #bearing { - width: 120px; -}
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 2d8f4fd94..0d1ed7870 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -5,7 +5,13 @@ * */ var custom_date_format = ""; +var lang_gen_hamradio_latitude = ''; +var lang_gen_hamradio_longitude = ''; +var lang_gen_hamradio_gridsquare = ''; +var lang_gen_hamradio_distance = ''; +var lang_gen_hamradio_bearing = '';
'); + $(".qso_manager").append('
' + + '
' + lang_gen_hamradio_latitude + ' 
' + + '
' + + '
' + lang_gen_hamradio_longitude + ' 
' + + '
' + + '
' + lang_gen_hamradio_gridsquare + ' 
' + + '
' + + '
' + lang_gen_hamradio_distance + ' 
' + + '
' + + '
' + lang_gen_hamradio_bearing + ' 
' + + '
' + + '
'); + $('.cohidden').show(); } map = new L.Map('advancedmap', { @@ -1072,6 +1087,8 @@ function loadMap(data, iconsList) { exportOnly: true, hideControlContainer: true }).addTo(map); + + map.on('mousemove', onMapMove); } function createContentMessage(qso) {