From 6d39b92d5c4a8fbc8ecd128be333f6c441f65b93 Mon Sep 17 00:00:00 2001 From: abarrau Date: Sat, 9 Dec 2023 10:44:26 +0100 Subject: [PATCH 1/2] add special class for all map --- application/views/activated_gridmap/index.php | 2 +- application/views/awards/cq/index.php | 2 +- application/views/awards/dxcc/index.php | 2 +- application/views/awards/ffma/index.php | 2 +- application/views/awards/gridmaster/index.php | 2 +- application/views/awards/iota/index.php | 2 +- application/views/awards/ja_gridmaster/index.php | 2 +- application/views/awards/waja/index.php | 2 +- application/views/dashboard/index.php | 4 ++-- application/views/gridmap/index.php | 2 +- application/views/map/custom_date.php | 2 +- application/views/qso/index.php | 2 +- application/views/view_log/index.php | 2 +- application/views/view_log/qso.php | 2 +- assets/js/sections/cqmap.js | 2 +- assets/js/sections/dxccmap.js | 2 +- assets/js/sections/ffma.js | 2 +- assets/js/sections/gridmap.js | 2 +- assets/js/sections/gridmaster.js | 2 +- assets/js/sections/iotamap.js | 2 +- assets/js/sections/ja_gridmaster.js | 2 +- assets/js/sections/wajamap.js | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index efc8e24f7..701d2f335 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -129,7 +129,7 @@
-
+
: 
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 8d3c47b5b..60b3be9da 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -150,7 +150,7 @@

-
+
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 7d2242757..58959d311 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -195,7 +195,7 @@

-
+
diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index 14e1d206e..d86334ea4 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -65,7 +65,7 @@
-
+
:
diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 948734c01..2b6d8a1dd 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -65,7 +65,7 @@
-
+
:
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index 9cc568dfb..594a64625 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -177,7 +177,7 @@

-
+
diff --git a/application/views/awards/ja_gridmaster/index.php b/application/views/awards/ja_gridmaster/index.php index 875310315..9568b622f 100644 --- a/application/views/awards/ja_gridmaster/index.php +++ b/application/views/awards/ja_gridmaster/index.php @@ -68,7 +68,7 @@
-
+
:
diff --git a/application/views/awards/waja/index.php b/application/views/awards/waja/index.php index cb2a9af94..8f193087e 100644 --- a/application/views/awards/waja/index.php +++ b/application/views/awards/waja/index.php @@ -169,7 +169,7 @@

-
+
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index a1cb3b02a..336187f5e 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -114,7 +114,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { optionslib->get_option('dashboard_map') != "false" && $this->optionslib->get_option('dashboard_map') != "map_at_right") { ?> -
+
@@ -184,7 +184,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
optionslib->get_option('dashboard_map') == "map_at_right") { ?> -
+
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index 95c3679ac..b6e7d3db9 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -131,7 +131,7 @@
-
+
: 
diff --git a/application/views/map/custom_date.php b/application/views/map/custom_date.php index a1dd4fea2..ead97d0f7 100644 --- a/application/views/map/custom_date.php +++ b/application/views/map/custom_date.php @@ -88,6 +88,6 @@
-
+
\ No newline at end of file diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 4daae12e9..498e655cf 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -575,7 +575,7 @@
-
+
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index d2246acf3..5cd0afa11 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -18,7 +18,7 @@ optionslib->get_option('logbook_map') != "false") { ?> -
+
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 881589a40..3b6f1c9eb 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -372,7 +372,7 @@
-
+
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
diff --git a/assets/js/sections/cqmap.js b/assets/js/sections/cqmap.js index 3cae92f19..7a0549c5c 100644 --- a/assets/js/sections/cqmap.js +++ b/assets/js/sections/cqmap.js @@ -116,7 +116,7 @@ function load_cq_map2(data) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#cqmaptab").append('
'); + $("#cqmaptab").append('
'); } var map = new L.Map('cqmap', { diff --git a/assets/js/sections/dxccmap.js b/assets/js/sections/dxccmap.js index 73bde64e8..26006fa3a 100644 --- a/assets/js/sections/dxccmap.js +++ b/assets/js/sections/dxccmap.js @@ -39,7 +39,7 @@ function load_dxcc_map2(data, worked, confirmed, notworked) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#dxccmaptab").append('
'); + $("#dxccmaptab").append('
'); } var map = new L.Map('dxccmap', { diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index d6496d5bb..2930cd34b 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -13,7 +13,7 @@ function gridPlot(form) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); } ajax_url = site_url + '/awards/getFfmaGridsjs'; diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index f4b1d3867..c2992463e 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -27,7 +27,7 @@ function gridPlot(form, visitor=true) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); } if (typeof type == 'undefined') { type=''; } diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index b4d8c5f5c..5a8ed303e 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -13,7 +13,7 @@ function gridPlot(form) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); } ajax_url = site_url + '/awards/getGridmasterGridsjs'; diff --git a/assets/js/sections/iotamap.js b/assets/js/sections/iotamap.js index 9df3a0544..3d1687730 100644 --- a/assets/js/sections/iotamap.js +++ b/assets/js/sections/iotamap.js @@ -39,7 +39,7 @@ function load_iota_map2(data, worked, confirmed, notworked) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#iotamaptab").append('
'); + $("#iotamaptab").append('
'); } var map = new L.Map('iotamap', { diff --git a/assets/js/sections/ja_gridmaster.js b/assets/js/sections/ja_gridmaster.js index f80b4c306..4835a676d 100644 --- a/assets/js/sections/ja_gridmaster.js +++ b/assets/js/sections/ja_gridmaster.js @@ -13,7 +13,7 @@ function gridPlot(form) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); } ajax_url = site_url + '/awards/getJaGridmasterGridsjs'; diff --git a/assets/js/sections/wajamap.js b/assets/js/sections/wajamap.js index b72688646..ce4cdefab 100644 --- a/assets/js/sections/wajamap.js +++ b/assets/js/sections/wajamap.js @@ -87,7 +87,7 @@ function load_waja_map2(data) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#wajamaptab").append('
'); + $("#wajamaptab").append('
'); } map = new L.Map('wajamap', { From fc4071d8f42a4abe73a48513195e51cdab79756d Mon Sep 17 00:00:00 2001 From: abarrau Date: Sat, 9 Dec 2023 10:54:18 +0100 Subject: [PATCH 2/2] add new class on dark css theme --- assets/css/blue/overrides.css | 8 ++------ assets/css/blue_wide/overrides.css | 8 ++------ assets/css/cyborg/overrides.css | 8 ++------ assets/css/cyborg_wide/overrides.css | 8 ++------ assets/css/darkly/overrides.css | 8 ++------ assets/css/darkly_wide/overrides.css | 8 ++------ assets/css/superhero/overrides.css | 8 ++------ assets/css/superhero_wide/overrides.css | 8 ++------ 8 files changed, 16 insertions(+), 48 deletions(-) diff --git a/assets/css/blue/overrides.css b/assets/css/blue/overrides.css index bcbb2a248..8a17cd6dd 100644 --- a/assets/css/blue/overrides.css +++ b/assets/css/blue/overrides.css @@ -51,12 +51,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.4) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #2e3e50; +.map-leaflet { + background-color: #2e3e50!important; } /* diff --git a/assets/css/blue_wide/overrides.css b/assets/css/blue_wide/overrides.css index c92af248b..f356c7677 100644 --- a/assets/css/blue_wide/overrides.css +++ b/assets/css/blue_wide/overrides.css @@ -51,12 +51,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.4) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #2e3e50; +.map-leaflet { + background-color: #2e3e50!important; } /* diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index aa0821709..04347ff1a 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -40,12 +40,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.25) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #2d3537; +.map-leaflet { + background-color: #2d3537!important; } .leaflet-popup-content h3 { diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index 24a2640c3..c849ac0aa 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -40,12 +40,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.25) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #2d3537; +.map-leaflet { + background-color: #2d3537!important; } .leaflet-popup-content h3 { diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 23390c1be..919eb5312 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -63,12 +63,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.25) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #343d3f; +.map-leaflet { + background-color: #343d3f!important; } /* diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index 8b4dd2d6b..5027a0fb1 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -63,12 +63,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.25) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #343d3f; +.map-leaflet { + background-color: #343d3f!important; } /* diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 3ccb43d76..b8f883a8e 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -51,12 +51,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.4) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #353c4a; +.map-leaflet { + background-color: #353c4a!important; } /* diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index eee6a7052..1d8fb064a 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -62,12 +62,8 @@ path.grid-worked { stroke: rgba(220, 50, 50, 0.4) !important; } -#map, -#qsomap, -#mapqso, -#gridsquare_map, -#custommap { - background-color: #353c4a; +.map-leaflet { + background-color: #353c4a!important; } #map {