mirror of
https://github.com/Pax1601/DCSOlympus.git
synced 2025-10-29 16:56:34 +00:00
Merge pull request #434 from Pax1601/433-remove-scale-tool-replace-with-space-efficient-version-of-server-performance-monitor
433 remove scale tool replace with space efficient version of server performance monitor
This commit is contained in:
Pax1601
GitHub
commit
63acc94558
@ -1,5 +1,6 @@
|
||||
import { OlympusPlugin } from "interfaces";
|
||||
|
||||
|
||||
const SHOW_CONTROL_TIPS = "Show control tips"
|
||||
|
||||
export class ControlTipsPlugin implements OlympusPlugin {
|
||||
|
||||
@ -99,6 +99,6 @@
|
||||
},
|
||||
"include": [
|
||||
"src/*.ts",
|
||||
"../../@types/*.d.ts"
|
||||
"../../@types/olympus/*.d.ts"
|
||||
]
|
||||
}
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -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";
|
||||
|
||||
|
||||
@ -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') %>
|
||||
|
||||
@ -1,5 +1,22 @@
|
||||
<div id="log-panel" oncontextmenu="return false;">
|
||||
<div class="ol-panel" data-on-click="toggleLogPanel"><div id="log-panel-header">Server log</div><img src="/resources/theme/images/icons/chevron-down.svg" inject-svg></div>
|
||||
<div class="ol-panel" data-on-click="toggleLogPanel">
|
||||
<div id="log-panel-header">Server log</div>
|
||||
|
||||
<div id="log-panel-header-right">
|
||||
<div id="server-status-panel" oncontextmenu="return false;">
|
||||
<dl>
|
||||
<dt><abbr title="Server frame rate (approx)">FPS</abbr>:</dt>
|
||||
<dd id="server-frame-rate"></dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt><abbr title="Server load">Load</abbr>:</dt>
|
||||
<dd id="server-load"></dd>
|
||||
</dl>
|
||||
</div>
|
||||
<img src="/resources/theme/images/icons/chevron-down.svg" inject-svg>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="ol-panel ol-scrollable closed">
|
||||
</div>
|
||||
</div>
|
||||
@ -81,10 +81,10 @@
|
||||
</div>
|
||||
|
||||
<div id="rapid-controls" class="ol-panel">
|
||||
<button title="Increase units altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "climb" }'><img src="/resources/theme/images/icons/climb.svg" inject-svg></button>
|
||||
<button title="Descrease units altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "descend" }'><img src="/resources/theme/images/icons/descent.svg" inject-svg></button>
|
||||
<button title="Increase units speed" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "fast" }'><img src="/resources/theme/images/icons/speed-increase.svg" inject-svg></button>
|
||||
<button title="Decrease units speed" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "slow" }'><img src="/resources/theme/images/icons/speed-decrease.svg" inject-svg></button>
|
||||
<button title="Increase altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "climb" }'><img src="/resources/theme/images/icons/climb.svg" inject-svg></button>
|
||||
<button title="Decrease altitude" class="ol-button" data-on-click="selectedUnitsChangeAltitude" data-on-click-params='{ "type": "descend" }'><img src="/resources/theme/images/icons/descent.svg" inject-svg></button>
|
||||
<button title="Increase speed" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "fast" }'><img src="/resources/theme/images/icons/speed-increase.svg" inject-svg></button>
|
||||
<button title="Decrease speed" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "slow" }'><img src="/resources/theme/images/icons/speed-decrease.svg" inject-svg></button>
|
||||
<button title="Stop unit and go back to idle state" class="ol-button" data-on-click="selectedUnitsChangeSpeed" data-on-click-params='{ "type": "stop" }'><img src="/resources/theme/images/icons/hand-solid.svg" inject-svg></button>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<div id="unit-list-panel" class="ol-panel">
|
||||
<div id="unit-list-panel" class="ol-panel hide">
|
||||
<h3>Unit List</h3>
|
||||
<div class="unit-list-unit headers">
|
||||
<div data-sort-field="unitName">Name</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user