diff --git a/client/plugins/controltips/index.js b/client/plugins/controltips/index.js
index 4acea1ed..ebd9f162 100644
--- a/client/plugins/controltips/index.js
+++ b/client/plugins/controltips/index.js
@@ -33,6 +33,7 @@ class ControlTipsPlugin {
}
initialize(app) {
__classPrivateFieldSet(this, _ControlTipsPlugin_app, app, "f");
+ debugger;
__classPrivateFieldSet(this, _ControlTipsPlugin_shortcutManager, __classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getShortcutManager(), "f");
__classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").onKeyDown(() => {
__classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
diff --git a/client/plugins/controltips/src/controltipsplugin.ts b/client/plugins/controltips/src/controltipsplugin.ts
index aec00a80..bda0eb38 100644
--- a/client/plugins/controltips/src/controltipsplugin.ts
+++ b/client/plugins/controltips/src/controltipsplugin.ts
@@ -1,5 +1,6 @@
import { OlympusPlugin } from "interfaces";
+
const SHOW_CONTROL_TIPS = "Show control tips"
export class ControlTipsPlugin implements OlympusPlugin {
@@ -22,7 +23,7 @@ export class ControlTipsPlugin implements OlympusPlugin {
initialize(app: any) {
this.#app = app;
-
+debugger;
this.#shortcutManager = this.#app.getShortcutManager();
this.#shortcutManager.onKeyDown(() => {
diff --git a/client/plugins/controltips/tsconfig.json b/client/plugins/controltips/tsconfig.json
index 2ba9ed01..ddbc11d9 100644
--- a/client/plugins/controltips/tsconfig.json
+++ b/client/plugins/controltips/tsconfig.json
@@ -99,6 +99,6 @@
},
"include": [
"src/*.ts",
- "../../@types/*.d.ts"
+ "../../@types/olympus/*.d.ts"
]
}
\ No newline at end of file
diff --git a/client/public/stylesheets/layout/layout.css b/client/public/stylesheets/layout/layout.css
index fdbcac50..f8c4609d 100644
--- a/client/public/stylesheets/layout/layout.css
+++ b/client/public/stylesheets/layout/layout.css
@@ -72,15 +72,6 @@
z-index: 9999;
}
-#server-status-panel {
- bottom: 20px;
- font-size: 12px;
- position: absolute;
- right: 200px;
- width: 300px;
- z-index: 9999;
-}
-
#mouse-info-panel {
bottom: 60px;
display: flex;
@@ -148,7 +139,7 @@
#log-panel {
position: absolute;
right: 0px;
- top: 220px;
+ top: 170px;
width: 310px;
height: fit-content;
z-index: 9990;
diff --git a/client/public/stylesheets/panels/logpanel.css b/client/public/stylesheets/panels/logpanel.css
index fc6aeb1e..1c5cd002 100644
--- a/client/public/stylesheets/panels/logpanel.css
+++ b/client/public/stylesheets/panels/logpanel.css
@@ -26,3 +26,55 @@
#log-panel.open>div:nth-child(2) {
display: block;
}
+
+
+#log-panel-header-right {
+ align-items: center;
+ column-gap: 16px;
+ display:flex;
+ flex-flow: row nowrap;
+}
+
+#server-status-panel abbr {
+ text-decoration: none;
+}
+
+#server-status-panel dl {
+ column-gap: 4px;
+ display:flex;
+ flex-direction: row;
+ width:fit-content;
+}
+
+#server-status-panel dl > * {
+ margin:0;
+ width:fit-content;
+}
+
+#server-status-panel dd {
+ font-weight: bold;
+}
+
+.fps-low {
+ color: red;
+}
+
+.fps-medium {
+ color: orange;
+}
+
+.fps-high {
+ color: lightgreen;
+}
+
+.load-low {
+ color: lightgreen;
+}
+
+.load-medium {
+ color: orange;
+}
+
+.load-high {
+ color: red;
+}
\ No newline at end of file
diff --git a/client/public/stylesheets/panels/serverstatus.css b/client/public/stylesheets/panels/serverstatus.css
index 3e9ea5f8..7afc8feb 100644
--- a/client/public/stylesheets/panels/serverstatus.css
+++ b/client/public/stylesheets/panels/serverstatus.css
@@ -5,31 +5,26 @@
column-gap: 10px;
}
-#server-status-panel .ol-data-grid {
- width: 100%;
+
+#log-panel-header-right {
+ align-items: center;
+ column-gap: 16px;
+ display:flex;
+ flex-flow: row nowrap;
}
-@media (min-width: 1525px) {
- #server-status-panel .ol-data-grid:first-of-type {
- border-right: 1px solid gray;
- padding-right: 10px;
- }
+#server-status-panel dl {
+ column-gap: 4px;
+ display:flex;
+ flex-direction: row;
+ width:fit-content;
}
-@media (max-width: 1525px) {
- #server-status-panel {
- flex-direction: column;
- row-gap: 10px;
- width: 180px;
- }
-
- #server-status-panel .ol-data-grid:first-of-type {
- border-bottom: 1px solid gray;
- padding-bottom: 10px;
- }
+#server-status-panel dl > * {
+ margin:0;
+ width:fit-content;
}
-
#server-status-panel dd {
font-weight: bold;
}
diff --git a/client/src/map/map.ts b/client/src/map/map.ts
index 30958ac6..c20d95b1 100644
--- a/client/src/map/map.ts
+++ b/client/src/map/map.ts
@@ -121,7 +121,7 @@ export class Map extends L.Map {
/* Scale */
//@ts-ignore TODO more hacking because the module is provided as a pure javascript module only
- L.control.scalenautic({ position: "topright", maxWidth: 300, nautic: true, metric: true, imperial: false }).addTo(this);
+ //L.control.scalenautic({ position: "topright", maxWidth: 300, nautic: true, metric: true, imperial: false }).addTo(this);
/* Map source dropdown */
this.#mapSourceDropdown = new Dropdown("map-type", (layerName: string) => this.setLayer(layerName), this.getLayers());
diff --git a/client/src/olympusapp.ts b/client/src/olympusapp.ts
index 8d9120e0..c073695a 100644
--- a/client/src/olympusapp.ts
+++ b/client/src/olympusapp.ts
@@ -15,7 +15,6 @@ import { PrimaryToolbar } from "./toolbars/primarytoolbar";
import { UnitsManager } from "./unit/unitsmanager";
import { WeaponsManager } from "./weapon/weaponsmanager";
import { Manager } from "./other/manager";
-import { ShortcutKeyboard } from "./shortcut/shortcut";
import { SVGInjector } from "@tanem/svg-injector";
import { ServerManager } from "./server/servermanager";
diff --git a/client/views/index.ejs b/client/views/index.ejs
index 88476a48..1dd037ec 100644
--- a/client/views/index.ejs
+++ b/client/views/index.ejs
@@ -28,7 +28,7 @@
<%- include('panels/unitinfo.ejs') %>
<%- include('panels/mouseinfo.ejs') %>
<%- include('panels/connectionstatus.ejs') %>
- <%- include('panels/serverstatus.ejs') %>
+
<%- include('panels/hotgroup.ejs') %>
<%- include('panels/logpanel.ejs') %>
<%- include('panels/unitlist.ejs') %>
diff --git a/client/views/panels/logpanel.ejs b/client/views/panels/logpanel.ejs
index 22edd364..719dc8a8 100644
--- a/client/views/panels/logpanel.ejs
+++ b/client/views/panels/logpanel.ejs
@@ -1,5 +1,22 @@
\ No newline at end of file
diff --git a/client/views/panels/unitlist.ejs b/client/views/panels/unitlist.ejs
index e91e8784..23514c55 100644
--- a/client/views/panels/unitlist.ejs
+++ b/client/views/panels/unitlist.ejs
@@ -1,4 +1,4 @@
-