diff --git a/application/config/migration.php b/application/config/migration.php index dd480fe85..54933358b 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ | */ -$config['migration_version'] = 272; +$config['migration_version'] = 273; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/273_tag_2_8_16.php b/application/migrations/273_tag_2_8_16.php new file mode 100644 index 000000000..fe995e21c --- /dev/null +++ b/application/migrations/273_tag_2_8_16.php @@ -0,0 +1,30 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.8.16')); + + // Trigger Version Info Dialog + $this->db->where('option_type', 'version_dialog'); + $this->db->where('option_name', 'confirmed'); + $this->db->update('user_options', array('option_value' => 'false')); + + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.8.15')); + } +} \ No newline at end of file diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index d91af440f..474ad4bc6 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -43,6 +43,9 @@ +
+ Updating... +
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 1417ced15..9ef4f4818 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -36,18 +36,26 @@ - - - - -uri->segment(1) == "activators") { ?> - +uri->segment(1), [NULL, '', 'dashboard', 'logbook', 'logbookadvanced', 'gridmap', 'activated_gridmap', 'qso', 'map', 'activators', 'activatorsmap'], true) + || ($this->uri->segment(1) == 'awards' && in_array($this->uri->segment(2), ['cq', 'iota', 'dxcc', 'ffma', 'gridmaster', 'waja', 'was', 'sota', 'pota'], true)); +?> + + + + + + uri->segment(1) == "activators") { ?> + + + - - + + + @@ -674,78 +682,6 @@ function printWarning() { } }; - function newpath(latlng1, latlng2, locator1, locator2) { - // If map is already initialized - var container = L.DomUtil.get('mapqrbcontainer'); - - if (container != null) { - container._leaflet_id = null; - container.remove(); - $("#mapqrb").append('
'); - } - - var map = new L.Map('mapqrbcontainer', { - fullscreenControl: true, - fullscreenControlOptions: { - position: 'topleft' - }, - }).setView([30, 0], 1.5); - - // Need to fix so that marker is placed at same place as end of line, but this only needs to be done when longitude is < -170 - if (latlng2[1] < -170) { - latlng2[1] = parseFloat(latlng2[1]) + 360; - } - if (latlng1[1] < -170) { - latlng1[1] = parseFloat(latlng1[1]) + 360; - } - - map.fitBounds([ - [latlng1[0], latlng1[1]], - [latlng2[0], latlng2[1]] - ]); - - var maidenhead = L.maidenheadqrb().addTo(map); - - var osmUrl = 'optionslib->get_option('option_map_tile_server'); ?>'; - var osmAttrib = 'Map data © OpenStreetMap contributors'; - var osm = new L.TileLayer(osmUrl, { - minZoom: 1, - maxZoom: 12, - attribution: osmAttrib - }); - - var redIcon = L.icon({ - iconUrl: icon_dot_url, - iconSize: [10, 10], // size of the icon - }); - - map.addLayer(osm); - - var marker = L.marker([latlng1[0], latlng1[1]], { - closeOnClick: false, - autoClose: false - }).addTo(map).bindPopup(locator1); - - var marker2 = L.marker([latlng2[0], latlng2[1]], { - closeOnClick: false, - autoClose: false - }).addTo(map).bindPopup(locator2); - - const multiplelines = []; - multiplelines.push( - new L.LatLng(latlng1[0], latlng1[1]), - new L.LatLng(latlng2[0], latlng2[1]) - ) - - const geodesic = L.geodesic(multiplelines, { - weight: 3, - opacity: 1, - color: 'red', - wrap: false, - steps: 100 - }).addTo(map); - } - function showActivatorsMap(call, count, grids) { let re = /,/g; diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 6afbc87f0..79fe057b6 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -26,9 +26,16 @@ + uri->segment(1), [NULL, '', 'dashboard', 'logbook', 'logbookadvanced', 'gridmap', 'activated_gridmap', 'qso', 'map', 'activators', 'activatorsmap'], true) + || ($this->uri->segment(1) == 'awards' && in_array($this->uri->segment(2), ['cq', 'iota', 'dxcc', 'ffma', 'gridmaster', 'waja', 'was', 'sota', 'pota'], true)); + ?> + - - + + + + uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?> diff --git a/application/views/interface_assets/mini_header.php b/application/views/interface_assets/mini_header.php index 826745453..9db3a3eff 100644 --- a/application/views/interface_assets/mini_header.php +++ b/application/views/interface_assets/mini_header.php @@ -15,10 +15,15 @@ - - + uri->segment(1), [NULL, '', 'dashboard', 'logbook', 'logbookadvanced', 'gridmap', 'activated_gridmap', 'qso', 'map', 'activators', 'activatorsmap'], true) + || ($this->uri->segment(1) == 'awards' && in_array($this->uri->segment(2), ['cq', 'iota', 'dxcc', 'ffma', 'gridmaster', 'waja', 'was', 'sota', 'pota'], true)); + ?> - '; } ?> + + + + diff --git a/application/views/labels/index.php b/application/views/labels/index.php index 913d0dd27..7bad67eb9 100644 --- a/application/views/labels/index.php +++ b/application/views/labels/index.php @@ -98,7 +98,7 @@
- +
diff --git a/application/views/qrbcalc/index.php b/application/views/qrbcalc/index.php index c85c9f788..89eccc7bf 100644 --- a/application/views/qrbcalc/index.php +++ b/application/views/qrbcalc/index.php @@ -22,4 +22,78 @@
-
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/application/views/qso/index.php b/application/views/qso/index.php index cc083ef88..e48c988fa 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -22,7 +22,59 @@ function switchMode(url) {
Name