rejiggered layout

- removed newbods and honks
HansAcker · Jul 12, 2024 · 39bb977 · 39bb977
1 parent ec720f2
commit 39bb977
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/html/index.html b/html/index.html
@@ -28,29 +28,49 @@
 <tbody id="routes"></tbody>
 </table>
 
+<table class="narrow">
+<caption>Stars discovered</caption>
+<thead>
+	<tr><th>Discovered Star</th><th style="width: 20%;">Class</th></tr>
+</thead>
+<tbody id="newstars"></tbody>
+</table>
+
+<table class="wide">
+<caption>Planets discovered</caption>
+<thead>
+	<tr><th>Discovered Body</th><th style="width: 25%;">Class</th><th style="width: 20%;">Atmosphere</th><th style="width: 15%;">Landable</th></tr>
+</thead>
+<tbody id="newplanets"></tbody>
+</table>
+
+<!-- 
 <table>
 <caption>New Discoveries</caption>
 <thead>
 	<tr><th>Discovered Body</th><th style="width: 30%;">Scan Type</th></tr>
 </thead>
 <tbody id="newbods"></tbody>
 </table>
+-->
 
 <table>
-<caption>Known Bodies</caption>
+<caption>Scanned Bodies</caption>
 <thead>
 	<tr><th>Scanned Body</th><th style="width: 30%;">Scan Type</th></tr>
 </thead>
-<tbody id="oldbods"></tbody>
+<tbody id="scanbods"></tbody>
 </table>
 
+<!-- 
 <table>
 <caption>Discovery Scans</caption>
 <thead>
 	<tr><th>Honked</th><th style="width: 15%;">Bodies</th><th style="width: 15%;">Other</th></tr>
 </thead>
 <tbody id="honks"></tbody>
 </table>
+-->
 
 <table>
 <caption>Settlement Approach</caption>
@@ -76,20 +96,12 @@
 <tbody id="updates"></tbody>
 </table>
 
-<table class="narrow">
-<caption>Stars discovered</caption>
-<thead>
-	<tr><th>Discovered Star</th><th style="width: 20%;">Class</th></tr>
-</thead>
-<tbody id="newstars"></tbody>
-</table>
-
-<table class="wide">
-<caption>Planets discovered</caption>
+<table class="wider">
+<caption>Jumps to inhabited systems</caption>
 <thead>
-	<tr><th>Discovered Body</th><th style="width: 25%;">Class</th><th style="width: 20%;">Atmosphere</th><th style="width: 15%;">Landable</th></tr>
+	<tr><th style="width: 25%;">System Visited</th><th style="width: 15%;">Population</th><th style="width: 15%;">Allegiance</th><th>Faction</th><th style="width: 10%;">State</th><!-- <th>Conflicts</th>--></tr>
 </thead>
-<tbody id="newplanets"></tbody>
+<tbody id="visits"></tbody>
 </table>
 
 <table class="wider">
@@ -100,14 +112,6 @@
 <tbody id="codex"></tbody>
 </table>
 
-<table class="wider">
-<caption>Jumps to inhabited systems</caption>
-<thead>
-	<tr><th style="width: 25%;">System Visited</th><th style="width: 15%;">Population</th><th style="width: 15%;">Allegiance</th><th>Faction</th><th style="width: 10%;">State</th><!-- <th>Conflicts</th>--></tr>
-</thead>
-<tbody id="visits"></tbody>
-</table>
-
 <table id="statstable">
 <caption>Stats</caption>
 <thead>

diff --git a/html/js/board.js b/html/js/board.js
@@ -158,12 +158,9 @@ ws.onmessage = (event) => {
 
 		if (message.event === "Scan") {
 			tr.append(makeTd(message.BodyName), makeTd(message.ScanType));
+			addRow(scanbods, tr);
 
-			if (message.WasDiscovered !== false || message.ScanType === "NavBeaconDetail") {
-				addRow(oldbods, tr);
-			} else {
-				addRow(newbods, tr);
-
+			if (message.WasDiscovered === false && message.ScanType !== "NavBeaconDetail") {
 				if (message.StarType) {
 					const tr = document.createElement("tr");
 					tr.classList.add(gameType);
@@ -205,10 +202,12 @@ ws.onmessage = (event) => {
 			}
 		}
 
+/*
 		else if (message.event === "FSSDiscoveryScan") {
 			tr.append(makeTd(message.SystemName), makeTd(message.BodyCount), makeTd(message.NonBodyCount));
 			addRow(honks, tr);
 		}
+*/
 
 		else if (message.event === "NavRoute") {
 			const route = message.Route || [];

diff --git a/html/js/board.min.js b/html/js/board.min.js