bugfixes, new options in settings panel

web/js/confighandler.js

@@ -4,12 +4,22 @@ function submitData() {
     const tuningLimit = $('#tuning-limit').is(":checked") || false;
     const tuningLowerLimit = $('#tuning-lower-limit').val() || '0';
     const tuningUpperLimit = $('#tuning-upper-limit').val() || '108';
+    const chatEnabled = $("#chat-switch").length > 0 ? $("#chat-switch").is(":checked") : true;
+
+    var themeSelectedValue = $("#selected-theme").val();
+    var themeDataValue = $(".option:contains('" + themeSelectedValue + "')").attr('data-value') || 'theme1';
+
+    const defaultTheme = themeDataValue;
+    
     let presets = [];
     presets.push($('#preset1').val() || '87.5');
     presets.push($('#preset2').val() || '87.5');
     presets.push($('#preset3').val() || '87.5');
     presets.push($('#preset4').val() || '87.5');
 
+    const enableDefaultFreq = $('#default-freq-enable').is(":checked") || false;
+    const defaultFreq = $('#default-freq').val() || '87.5';
+
     let banlist = [];
     if($('#ip-addresses').length > 0) {
       validateAndAdd(banlist);
@@ -50,6 +60,8 @@ function submitData() {
         tuningLimit,
         tuningLowerLimit,
         tuningUpperLimit,
+        chatEnabled,
+        defaultTheme,
         presets,
         banlist
       },
@@ -80,6 +92,8 @@ function submitData() {
       lockToAdmin,
       autoShutdown,
       antennaSwitch,
+      enableDefaultFreq,
+      defaultFreq,
     };
 
     if(adminPass.length < 1) {
@@ -118,7 +132,17 @@ function submitData() {
         $('#tuning-limit').prop("checked", data.webserver.tuningLimit);
         $('#tuning-lower-limit').val(data.webserver.tuningLowerLimit || "");
         $('#tuning-upper-limit').val(data.webserver.tuningUpperLimit || "");
+        $("#chat-switch").prop("checked", data.webserver.chatEnabled || false);
 
+        $('#selected-theme').val(data.webserver.defaultTheme || 'Default');
+
+        var selectedTheme = $(".option[data-value='" + data.webserver.defaultTheme + "']");
+        
+        // If the option exists, set its text as the value of the input
+        if (selectedTheme.length > 0) {
+            $("#selected-theme").val(selectedTheme.text());
+        }
+        
         if(Array.isArray(data.webserver.presets)) {
           $('#preset1').val(data.webserver.presets[0] || "");
           $('#preset2').val(data.webserver.presets[1] || "");
@@ -126,6 +150,9 @@ function submitData() {
           $('#preset4').val(data.webserver.presets[3] || "");
         }
 
+        $("#default-freq-enable").prop("checked", data.enableDefaultFreq || false);
+        $('#default-freq').val(data.defaultFreq || "87.5");
+
         $('#ip-addresses').val(data.webserver.banlist?.join('\n') || "");
 
         $('#xdrd-ip').val(data.xdrd.xdrdIp);

web/js/init.js

@@ -9,6 +9,7 @@ function getInitialSettings() {
             localStorage.setItem('qthLatitude', data.qthLatitude);
             localStorage.setItem('qthLongitude', data.qthLongitude);
             localStorage.setItem('streamEnabled', data.streamEnabled);
+            localStorage.setItem('defaultTheme', data.defaultTheme);
             localStorage.setItem('preset1', data.presets[0]);
             localStorage.setItem('preset2', data.presets[1]);
             localStorage.setItem('preset3', data.presets[2]);

web/js/main.js

@@ -362,7 +362,7 @@ function getCurrentFreq() {
 function checkKey(e) {
     e = e || window.event;
 
-    if ($('#password:focus').length > 0) {
+    if ($('#password:focus').length > 0 || $('#chat-send-message:focus').length > 0) {
         return; 
     }
 

web/js/settings.js

@@ -29,8 +29,13 @@
         // Theme Selector
         const themeSelector = $('#theme-selector');
         const savedTheme = localStorage.getItem('theme');
+        const defaultTheme = localStorage.getItem('defaultTheme');
         const savedUnit = localStorage.getItem('signalUnit');
-        
+
+        if(defaultTheme && themes[defaultTheme]) {
+            setTheme(defaultTheme);
+        }
+
         if (savedTheme && themes[savedTheme]) {
             setTheme(savedTheme);
             themeSelector.find('input').val(themeSelector.find('.option[data-value="' + savedTheme + '"]').text());

web/js/setup.js

@@ -8,12 +8,6 @@ var mapAttrib='&copy; <a href="http://www.openstreetmap.org/copyright">OpenStree
 $(document).ready(function() {
   MapCreate();
   fetchData();
-  
-  setTimeout( function() {
-    if ($('.nav li.active[data-panel="status"]').length > 0) {
-      $('#submit-config').hide();
-    }
-  }, 50 )
 
   map.on('click', function(ev) {
     $('#lat').val((ev.latlng.lat).toFixed(6));
@@ -31,7 +25,7 @@ $(document).ready(function() {
     }
   });
 
-  $('#status').show();
+  $('#dashboard').show();
   showPanelFromHash();
   $('.nav li').click(function() {
     // Remove background color from all li elements
@@ -54,12 +48,6 @@ $(document).ready(function() {
             map.invalidateSize();
         }, 200);
     }
-
-    if(panelId == 'status') {
-      $('#submit-config').hide();
-    } else {
-      $('#submit-config').show();
-    }
   });