From 4464530c0e26949407cde1d84779ec31be96c19c Mon Sep 17 00:00:00 2001
From: Matthias Wirth <matthias.wirth@gmail.com>
Date: Wed, 24 Mar 2021 15:57:37 +0100
Subject: [PATCH] rearrange gear menu a bit

---
 html/script.js | 155 +++++++++++++++++++++++++------------------------
 1 file changed, 78 insertions(+), 77 deletions(-)

diff --git a/html/script.js b/html/script.js
index bae6eec..55754cd 100644
--- a/html/script.js
+++ b/html/script.js
@@ -936,62 +936,6 @@ function initPage() {
         }
     });
 
-    new Toggle({
-        key: "darkerColors",
-        display: "Darker Colors",
-        container: "#settingsRight",
-        init: false,
-        setState: function(state) {
-            if (loadFinished) {
-                refreshFeatures();
-                remakeTrails();
-            }
-        }
-    });
-
-    tableColorsLight = tableColors;
-    tableColorsDark = JSON.parse(JSON.stringify(tableColors));
-    let darkVals = Object.values(tableColorsDark);
-    for (let i in darkVals) {
-        let obj = darkVals[i];
-        let keys = Object.keys(obj)
-        for (let j in keys) {
-            let key = keys[j];
-            let hsl = hexToHSL(obj[key]);
-            hsl[1] *= 0.5;
-            hsl[2] *= 0.6;
-            obj[key] = hslToRgb(hsl);
-        }
-    }
-    new Toggle({
-        key: "darkMode",
-        display: "Dark Mode",
-        container: "#settingsRight",
-        init: false,
-        setState: function(state) {
-            let root = document.documentElement;
-            if (state) {
-                document.body.style.background = '#989898'
-                root.style.setProperty("--BGCOLOR1", '#989898');
-                root.style.setProperty("--BGCOLOR2", '#A8A8A8');
-                tableColors = tableColorsDark;
-            } else {
-                document.body.style.background = '#F8F8F8'
-                root.style.setProperty("--BGCOLOR1", '#F8F8F8');
-                root.style.setProperty("--BGCOLOR2", '#C8C8C8');
-                tableColors = tableColorsLight;
-            }
-            if (loadFinished) {
-                TAR.planeMan.redraw();
-                refreshFilter();
-            }
-
-            initLegend(tableColors.unselected);
-            initSourceFilter(tableColors.unselected);
-            initFlagFilter(tableColors.unselected);
-        }
-    });
-
     if (globeIndex) {
         function setGlobeTableLimit() {
             let mult = 1 + 4 * toggles['moreTableLines1'].state + 16 * (toggles['moreTableLines2'] && toggles['moreTableLines2'].state);
@@ -1047,6 +991,27 @@ function initPage() {
         },
     });
 
+    new Toggle({
+        key: "showPictures",
+        display: "Show Pictures",
+        container: "#settingsRight",
+        init: showPictures,
+        setState: function(state) {
+            showPictures = state;
+            if (state) {
+                $('#photo_container').removeClass('hidden');
+            } else {
+                $('#photo_container').addClass('hidden');
+            }
+            if (showPictures && planespottersAPI && !flightawareLinks) {
+                $('#photoLinkRow').addClass('hidden');
+            } else {
+                $('#photoLinkRow').removeClass('hidden');
+            }
+            refreshSelected();
+        }
+    });
+
     new Toggle({
         key: "wideInfoblock",
         display: "Wide infoblock",
@@ -1799,6 +1764,63 @@ function initMap() {
         //toggleLayer('#acpositions_checkbox', 'webglLayer');
     });
 
+    new Toggle({
+        key: "darkerColors",
+        display: "Darker Colors",
+        container: "#settingsLeft",
+        init: false,
+        setState: function(state) {
+            if (loadFinished) {
+                refreshFeatures();
+                remakeTrails();
+            }
+        }
+    });
+
+    tableColorsLight = tableColors;
+    tableColorsDark = JSON.parse(JSON.stringify(tableColors));
+    let darkVals = Object.values(tableColorsDark);
+    for (let i in darkVals) {
+        let obj = darkVals[i];
+        let keys = Object.keys(obj)
+        for (let j in keys) {
+            let key = keys[j];
+            let hsl = hexToHSL(obj[key]);
+            hsl[1] *= 0.5;
+            hsl[2] *= 0.6;
+            obj[key] = hslToRgb(hsl);
+        }
+    }
+    new Toggle({
+        key: "darkMode",
+        display: "Dark Mode",
+        container: "#settingsLeft",
+        init: false,
+        setState: function(state) {
+            let root = document.documentElement;
+            if (state) {
+                document.body.style.background = '#989898'
+                root.style.setProperty("--BGCOLOR1", '#989898');
+                root.style.setProperty("--BGCOLOR2", '#A8A8A8');
+                tableColors = tableColorsDark;
+            } else {
+                document.body.style.background = '#F8F8F8'
+                root.style.setProperty("--BGCOLOR1", '#F8F8F8');
+                root.style.setProperty("--BGCOLOR2", '#C8C8C8');
+                tableColors = tableColorsLight;
+            }
+            if (loadFinished) {
+                TAR.planeMan.redraw();
+                refreshFilter();
+            }
+
+            initLegend(tableColors.unselected);
+            initSourceFilter(tableColors.unselected);
+            initFlagFilter(tableColors.unselected);
+        }
+    });
+
+
     new Toggle({
         key: "MapDim",
         display: "Dim Map",
@@ -1823,27 +1845,6 @@ function initMap() {
         }
     });
 
-    new Toggle({
-        key: "showPictures",
-        display: "Show Pictures",
-        container: "#settingsLeft",
-        init: showPictures,
-        setState: function(state) {
-            showPictures = state;
-            if (state) {
-                $('#photo_container').removeClass('hidden');
-            } else {
-                $('#photo_container').addClass('hidden');
-            }
-            if (showPictures && planespottersAPI && !flightawareLinks) {
-                $('#photoLinkRow').addClass('hidden');
-            } else {
-                $('#photoLinkRow').removeClass('hidden');
-            }
-            refreshSelected();
-        }
-    });
-
     window.addEventListener('keydown', function(e) {
         active();
         if (e.defaultPrevented ) {