reworked showing of tabs

For easier mainainance and for future developments configuration is modified
Please take a look at config.js

html/index.html

@@ -37,25 +37,25 @@
 		</nav>
 		
 		<ul class="nav nav-tabs" id="myTab" role="tablist">
-			<li class="nav-item">
+			<li class="nav-item" name="currtx">
 				<a class="nav-link" id="currtx-tab" data-toggle="tab" href="#currtx" role="tab" aria-controls="currtx" aria-selected="true">Currently TXing</a>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item" name="lastheard">
 				<a class="nav-link" id="lastheard-tab" data-toggle="tab" href="#lastheard" role="tab" aria-controls="lastheard" aria-selected="false">Last Heard</a>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item" name="localheard">
 				<a class="nav-link" id="localheard-tab" data-toggle="tab" href="#localheard" role="tab" aria-controls="localheard" aria-selected="false">Local Heard</a>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item" name="qso">
 				<a class="nav-link" id="qso-tab" data-toggle="tab" href="#qso" role="tab" aria-controls="qso" aria-selected="false">In QSO</a>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item" name="dapnet">
 				<a class="nav-link" id="dapnet-tab" data-toggle="tab" href="#dapnet" role="tab" aria-controls="dapnet" aria-selected="false">DAPNET Messages</a>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item" name="sysinfo">
 				<a class="nav-link" id="sysinfo-tab" data-toggle="tab" href="#sysinfo" role="tab" aria-controls="sysinfo" aria-selected="false">System Info</a>
 			</li>
-			<li class="nav-item">
+			<li class="nav-item" name="about">
 				<a class="nav-link" id="about-tab" data-toggle="tab" href="#about" role="tab" aria-controls="about" aria-selected="false">About</a>
 			</li>
 		</ul>
@@ -293,7 +293,7 @@
 				"order": [[ 0, "desc" ]]
 			} );
 			
-			if (showSysInfoTab) {
+			if (sysinfo > 0) {
 				var ws3 = new WebSocket("ws://" + window.location.hostname + ":5678/SYSINFO");
 				ws3.onmessage = function (event) {
 					getSysInfo(document, event);
@@ -327,7 +327,7 @@
 				t_qso.row('.selected').remove().draw( false );
 			} );
 			
-			if (showDAPNETMessagesTab) {
+			if (dapnet > 0) {
 				var ws2 = new WebSocket("ws://" + window.location.hostname + ":5678/DAPNET");
 				ws2.onmessage = function (event) {
 					getDapnetMessages(document, event);

html/js/config.js

@@ -10,13 +10,13 @@ var emergencylevel = 500;
 
 
 // 1 = show tab, 0 = suppress it
-var showCurrTXTab = 1;
+var currtx = 1;
-var showLastHeardTab = 1;
+var lastheard = 1;
-var showLocalHeadTab = 1;
+var localheard = 1;
-var showInQSOTab = 1;
+var qso = 1;
-var showDAPNETMessagesTab = 1;
+var dapnet = 1;
-var showSysInfoTab = 1;
+var sysinfo = 1;
-var showAboutTab = 1;
+var about = 1;
 
 // default-tab to show
 // chose from following list: CurrTXTab, LastHeardTab, LocalHeadTab, InQSOTab, DAPNETMessagesTab, SysInfoTab, AboutTab

html/js/functions.js

@@ -602,100 +602,48 @@ function getSysInfo(document, event) {
 	});
 }
 
-$(document).ready(function() {
+function activateDefaultTab(name) {
-	if(showCurrTXTab == 0){
+	var element = document.getElementById(name + "-tab");
-		document.getElementById("myTab").children[0].style.display="none";
+	element.classList.add("active");
-		document.getElementById("currtx").style.display="none";
+	
-	}
+	var element = document.getElementById(name);
-	if(showLastHeardTab == 0){
+	element.classList.add("show");
-		document.getElementById("myTab").children[1].style.display="none";
+	element.classList.add("active");
-		document.getElementById("lastheard").style.display="none";
-	}
-	if(showLocalHeadTab == 0){
-		document.getElementById("myTab").children[2].style.display="none";
-		document.getElementById("localheard").style.display="none";
-	}
-	if(showInQSOTab == 0){
-		document.getElementById("myTab").children[3].style.display="none";
-		document.getElementById("qso").style.display="none";
-	}
-	if(showDAPNETMessagesTab == 0){
-		document.getElementById("myTab").children[4].style.display="none";
-		document.getElementById("dapnet").style.display="none";
 }
-	if(showSysInfoTab == 0){
+
-		document.getElementById("myTab").children[5].style.display="none";
+$(document).ready(function() {
-		document.getElementById("sysinfo").style.display="none";
+	for (i = 0; i < document.getElementById("myTab").children.length; ++i) {
+		tabname = document.getElementById("myTab").children[i].getAttribute("name");
+		if (eval(tabname) == 0) {
+			document.getElementById("myTab").children[i].style.display="none";
+			document.getElementById(tabname).style.display="none";
 		}
-	if(showAboutTab == 0){
-		document.getElementById("myTab").children[6].style.display="none";
-		document.getElementById("about").style.display="none";
 	}
 	
 	switch (defaultTab) {
 		case "CurrTXTab":
-			var element = document.getElementById("currtx-tab");
+			activateDefaultTab("currtx");
-			element.classList.add("active");
-			
-			var element = document.getElementById("currtx");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		case "LastHeardTab":
-			var element = document.getElementById("lastheard-tab");
+			activateDefaultTab("lastheard");
-			element.classList.add("active");
-			
-			var element = document.getElementById("lastheard");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		case "LocalHeadTab":
-			var element = document.getElementById("localheard-tab");
+			activateDefaultTab("localheard");
-			element.classList.add("active");
-			
-			var element = document.getElementById("localheard");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		case "InQSOTab":
-			var element = document.getElementById("qso-tab");
+			activateDefaultTab("qso");
-			element.classList.add("active");
-			
-			var element = document.getElementById("qso");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		case "DAPNETMessagesTab":
-			var element = document.getElementById("dapnet-tab");
+			activateDefaultTab("dapnet");
-			element.classList.add("active");
-			
-			var element = document.getElementById("dapnet");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		case "SysInfoTab":
-			var element = document.getElementById("sysinfo-tab");
+			activateDefaultTab("sysinfo");
-			element.classList.add("active");
-			
-			var element = document.getElementById("sysinfo");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		case "AboutTab":
-			var element = document.getElementById("about-tab");
+			activateDefaultTab("about");
-			element.classList.add("active");
-			
-			var element = document.getElementById("about");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 		default:
-			var element = document.getElementById("currtx-tab");
+			activateDefaultTab("currtx");
-			element.classList.add("active");
-			
-			var element = document.getElementById("currtx");
-			element.classList.add("show");
-			element.classList.add("active");
 			break;
 	}
 });