2.8.16

application/config/migration.php

@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 272;
+$config['migration_version'] = 273;
 
 /*
 |--------------------------------------------------------------------------

application/migrations/273_tag_2_8_16.php

@@ -0,0 +1,30 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.8.16 Migration
+*/
+
+class Migration_tag_2_8_16 extends CI_Migration {
+
+    public function up()
+    {
+
+        // Tag Cloudlog 2.8.16
+        $this->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'));
+    }
+}

application/views/dashboard/index.php

@@ -43,6 +43,9 @@
 					</div>
 				<?php } ?>
 			</div>
+			<div class="small text-muted mb-2 d-none d-lg-block">
+				<span id="todays-qso-loading" class="htmx-indicator ms-2"><i class="fas fa-spinner fa-spin"></i> Updating...</span>
+			</div>
 		<?php } ?>
 
 		<?php if ($current_active == 0) { ?>

application/views/interface_assets/footer.php

@@ -36,18 +36,26 @@
 <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/bootstrap.bundle.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/Control.FullScreen.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Maidenhead.qrb.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Terminator.js"></script>
-<?php if ($this->uri->segment(1) == "activators") { ?>
-    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Maidenhead.activators.js"></script>
+<?php
+$load_leaflet = in_array($this->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));
+?>
+<?php if ($load_leaflet) { ?>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/Control.FullScreen.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Maidenhead.qrb.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Terminator.js"></script>
+    <?php if ($this->uri->segment(1) == "activators") { ?>
+        <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Maidenhead.activators.js"></script>
+    <?php } ?>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.geodesic.js"></script>
 <?php } ?>
-<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.geodesic.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/radiohelpers.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/darkmodehelpers.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/easyprint.js"></script>
+<?php if ($load_leaflet) { ?>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/easyprint.js"></script>
+<?php } ?>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/common.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/eqslcharcounter.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/version_dialog.js"></script>
@@ -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('<div id="mapqrbcontainer" style="Height: 500px"></div>');
-        }
-
-        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 = '<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>';
-        var osmAttrib = 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> 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;

application/views/interface_assets/header.php

@@ -26,9 +26,16 @@
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/flag-icons.min.css" />
 
+	<?php
+	$load_leaflet = in_array($this->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));
+	?>
+
 	<!-- Maps -->
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/Control.FullScreen.css" />
+	<?php if ($load_leaflet) { ?>
+		<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
+		<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/Control.FullScreen.css" />
+	<?php } ?>
 
 	<?php if ($this->uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?>
 		<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/query-builder.default.min.css" />

application/views/interface_assets/mini_header.php

@@ -15,10 +15,15 @@
 
 	   <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
 
-    <!-- Maps -->
-    <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
+    <?php
+    $load_leaflet = in_array($this->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));
+    ?>
 
-	<?php if (file_exists(APPPATH.'../assets/css/custom.css')) { echo '<link rel="stylesheet" href="'.base_url().'assets/css/custom.css">'; } ?>
+    <!-- Maps -->
+    <?php if ($load_leaflet) { ?>
+        <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
+    <?php } ?>
 
     <link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
 

application/views/labels/index.php

@@ -98,7 +98,7 @@
 		</div>
 		<div class="card-body p-0">
 			<div class="table-responsive">
-				<table class="table table-hover table-striped mb-0">
+				<table class="table table-hover table-striped mb-0 labeltable">
 					<thead class="table-light">
 						<tr>
 							<th scope="col">Name</th>

application/views/qrbcalc/index.php

@@ -22,4 +22,78 @@
     </div>
 </form>
 <div class="qrbResult"></div>
-<div id="mapqrb"><div id="mapqrbcontainer" style="Height: 500px"></div></div>
+<div id="mapqrb"><div id="mapqrbcontainer" style="Height: 500px"></div></div>
+
+<script type="text/javascript">
+    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('<div id="mapqrbcontainer" style="Height: 500px"></div>');
+        }
+
+        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 = '<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>';
+        var osmAttrib = 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> 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);
+    }
+</script>