weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict resolution

Browse Source
This commit is contained in:
PeekabooSteam
2023-05-24 23:32:53 +01:00
parent 05a8085e06 ec872e181d
commit 4b709ce33b
308 changed files with 5006 additions and 5171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
client/views/aic.ejs → client/views/aic/aic.ejs
View File

2
client/views/atc/addflight.ejs
View File

@@ -1,5 +1,5 @@
<form class="ol-strip-board-add-flight">
<div class="ol-auto-suggest"></div>
<input type="text" name="unitName" placeholder="Flight search" />
<button class="add-flight-by-click" title="Add unit via click"><img src="/images/icons/bullseye-solid.svg" /></button>
<button class="add-flight-by-click" title="Add unit via click"><img src="/resources/theme/images/icons/bullseye-solid.svg" /></button>
</form>

4
client/views/atc.ejs → client/views/atc/atc.ejs
View File

@@ -1,10 +1,10 @@
<%- include('atc/board.ejs', {
<%- include('board.ejs', {
"boardId": "strip-board-tower",
"boardType": "tower",
"headers": [ "Flight", "a. Alt", "alt", "a. Speed", "Speed" ]
}) %>
<%- include('atc/board.ejs', {
<%- include('board.ejs', {
"boardId": "strip-board-ground",
"boardType": "ground",
"headers": [ "Flight", "Status", "T/O Time", "TTG" ]

0
client/views/unitdatatable.ejs → client/views/atc/unitdatatable.ejs
View File

52
client/views/index.ejs
View File

@@ -2,45 +2,37 @@
<head>
<title>Olympus client</title>
<link rel="stylesheet" type="text/css" href="./themes/olympus/olympus.css" />
<link rel="stylesheet" type="text/css" href="stylesheets/olympus.css" />
<link rel="stylesheet" href="stylesheets/leaflet.css">
<link rel="stylesheet" type="text/css" href="stylesheets/leaflet/leaflet.css">
<link rel="stylesheet" type="text/css" href="/resources/theme/theme.css" /> <!-- Theme specifc css, autorouted to point to active theme -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600;700;800&display=swap" rel="stylesheet">
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-Z4L2TC3YX0"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-Z4L2TC3YX0');
</script>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600;700;800&display=swap">
</head>
<body>
<div id="map-container"></div>
<%- include('aic.ejs') %>
<%- include('atc.ejs') %>
<%- include('contextmenus.ejs') %>
<%- include('unitcontrolpanel.ejs') %>
<%- include('unitinfopanel.ejs') %>
<%- include('mouseinfopanel.ejs') %>
<%- include('navbar.ejs') %>
<%- include('connectionstatuspanel.ejs') %>
<%- include('dialogs.ejs') %>
<%- include('unitdatatable.ejs') %>
<%- include('popups.ejs') %>
<%- include('hotgrouppanel.ejs') %>
<div id="gray-out"></div>
<% /* %>
<%- include('log.ejs') %>
<% */ %>
<%- include('aic/aic.ejs') %>
<%- include('atc/atc.ejs') %>
<%- include('atc/unitdatatable.ejs') %>
<%- include('panels/unitcontrol.ejs') %>
<%- include('panels/unitinfo.ejs') %>
<%- include('panels/mouseinfo.ejs') %>
<%- include('panels/connectionstatus.ejs') %>
<%- include('panels/hotgroup.ejs') %>
<%- include('panels/navbar.ejs') %>
<%- include('other/dialogs.ejs') %>
<%- include('other/popups.ejs') %>
<%- include('other/contextmenus.ejs') %>
<div id="gray-out"></div> <!-- Used to provide grayout effect of the background when login prompt is visible -->
<script src="javascripts/bundle.js"></script>
</body>

0
client/views/log.ejs → client/views/log/log.ejs
View File

0
client/views/contextmenus.ejs → client/views/other/contextmenus.ejs
View File

2
client/views/dialogs.ejs → client/views/other/dialogs.ejs
View File

@@ -67,7 +67,7 @@
</div>
<div id="prohibit-air-wpn-checkbox" class="ol-checkbox">
<label title="The unit will not engage A/A weapons (e.g. SAM sites will not engage HARMs)">
<label title="The unit will not engage air weapons (e.g. SAM sites will not engage HARMs)">
<input type="checkbox" />
Prohibit air wpn engage
</label>

0
client/views/popups.ejs → client/views/other/popups.ejs
View File

0
client/views/connectionstatuspanel.ejs → client/views/panels/connectionstatus.ejs
View File

0
client/views/hotgrouppanel.ejs → client/views/panels/hotgroup.ejs
View File

0
client/views/mouseinfopanel.ejs → client/views/panels/mouseinfo.ejs
View File

31
client/views/navbar.ejs → client/views/panels/navbar.ejs
View File

@@ -1,11 +1,10 @@
<nav id="primary-toolbar" class="ol-panel" oncontextmenu="return false;">
<div id="app-icon" class="ol-select ol-select-image">
<div class="ol-select-value icon">
<img src="images/icon.png" class="main-logo" />
</div>
</div>
<div class="ol-select-options">
<div id="olympus-toolbar-summary">
<div id="toolbar-summary">
<h3>DCS Olympus</h3>
<div class="accent-green app-version-number">version v0.2.1</div>
</div>
@@ -29,37 +28,39 @@
<!-- Here the available map sources will be listed-->
</div>
</div>
<div id="unit-visibility-control" class="ol-group">
<button id="unit-visibility-control-aircraft" title="Toggle aircrafts' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "aircraft" }'></button>
<button id="unit-visibility-control-groundunit" title="Toggle ground units' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "groundunit" }'></button>
<button id="unit-visibility-control-sam" title="Toggle SAMs' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "sam" }'></button>
<button id="unit-visibility-control-threat" title="Toggle threat rings' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "threat" }'></button>
<button id="unit-visibility-control-navyunit" title="Toggle navy units' visibility" data-on-click="toggleUnitVisibility" data-on-click-params='{ "category": "navyunit" }'></button>
<!-- Here the available visibility controls will be listed -->
</div>
<div id="coalition-visibility-control" class="ol-group ol-group-button-toggle">
<div>
<button id="coalition-visibility-control-blue" data-on-click="toggleCoalitionVisibility" data-on-click-params='{ "coalition": "blue" }'>View <span class="accent-bluefor">BLUEFOR</span></button>
<button id="coalition-visibility-control-blue" data-on-click="toggleCoalitionVisibility"
data-on-click-params='{ "coalition": "blue" }'>View <span class="accent-bluefor">BLUEFOR</span></button>
</div>
<div>
<button id="coalition-visibility-control-red" data-on-click="toggleCoalitionVisibility" data-on-click-params='{ "coalition": "red" }'>View <span class="accent-redfor">REDFOR</span></button>
<button id="coalition-visibility-control-red" data-on-click="toggleCoalitionVisibility"
data-on-click-params='{ "coalition": "red" }'>View <span class="accent-redfor">REDFOR</span></button>
</div>
<div>
<button id="coalition-visibility-control-neutral" data-on-click="toggleCoalitionVisibility" data-on-click-params='{ "coalition": "neutral" }'>View <span class="accent-neutral">NEUTRAL</span></button>
<button id="coalition-visibility-control-neutral" data-on-click="toggleCoalitionVisibility"
data-on-click-params='{ "coalition": "neutral" }'>View <span
class="accent-neutral">NEUTRAL</span></button>
</div>
</div>
<div id="atc-navbar-control" class="ol-group-container" data-feature-switch="atc">
<div class="ol-group-header">ATC</div>
<div class="ol-group">
<button data-on-click="toggleElements" data-on-click-params='{"selector": "#strip-board-ground"}'>GND</button>
<button data-on-click="toggleElements" data-on-click-params='{"selector": "#strip-board-tower"}'>TWR</button>
<button data-on-click="toggleElements"
data-on-click-params='{"selector": "#strip-board-ground"}'>GND</button>
<button data-on-click="toggleElements"
data-on-click-params='{"selector": "#strip-board-tower"}'>TWR</button>
</div>
</div>
</nav>

8
client/views/unitcontrolpanel.ejs → client/views/panels/unitcontrol.ejs
View File

@@ -40,21 +40,21 @@
<div id="roe">
<h4>Rules of engagement</h4>
<div id="roe-buttons-container" class="ol-group ol-button-box">
<div id="roe-buttons-container" class="ol-group ol-button-box ol-option-button">
<!-- This is where the roe buttons will be shown -->
</div>
</div>
<div id="threat">
<h4>Reaction to threat</h4>
<div id="reaction-to-threat-buttons-container" class="ol-group ol-button-box">
<div id="reaction-to-threat-buttons-container" class="ol-group ol-button-box ol-option-button">
<!-- This is where the reaction to threat buttons will be shown -->
</div>
</div>
<div id="emissions-countermeasures">
<h4>Emissions & countermeasures</h4>
<div id="emissions-countermeasures-buttons-container" class="ol-group ol-button-box">
<h4>Radar & ECM</h4>
<div id="emissions-countermeasures-buttons-container" class="ol-group ol-button-box ol-option-button">
<!-- This is where the emissions/countermeasures buttons will be shown -->
</div>
</div>

0
client/views/unitinfopanel.ejs → client/views/panels/unitinfo.ejs
View File

94
client/views/uikit.ejs → client/views/uikit/uikit.ejs
View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>Olympus UI Kit</title>
<link rel="stylesheet" type="text/css" href="./themes/olympus/olympus.css" />
<link rel="stylesheet" type="text/css" href="./resources/theme/olympus.css" />
<link rel="stylesheet" type="text/css" href="stylesheets/olympus.css" />
<link rel="stylesheet" type="text/css" href="stylesheets/units.css" />
<link rel="stylesheet" type="text/css" href="stylesheets/uikit.css" />
@@ -170,9 +170,9 @@
<div class="caption">Neutral</div>
<div data-object="unit-groundunit" data-coalition="">
<div data-object="unit-groundunit-other" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">Z</div>
</div>
@@ -182,9 +182,9 @@
<div class="caption">Blue</div>
<div data-object="unit-groundunit" data-coalition="blue">
<div data-object="unit-groundunit-other" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">Y</div>
</div>
@@ -194,9 +194,9 @@
<div class="caption">Red</div>
<div data-object="unit-groundunit" data-coalition="red">
<div data-object="unit-groundunit-other" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">X</div>
</div>
@@ -216,9 +216,9 @@
<div class="caption">Neutral</div>
<div data-object="unit-sam" data-coalition="">
<div data-object="unit-groundunit-sam" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">Z</div>
</div>
@@ -228,9 +228,9 @@
<div class="caption">Blue</div>
<div data-object="unit-sam" data-coalition="blue">
<div data-object="unit-groundunit-sam" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">Y</div>
</div>
@@ -240,9 +240,9 @@
<div class="caption">Red</div>
<div data-object="unit-sam" data-coalition="red">
<div data-object="unit-groundunit-sam" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">X</div>
</div>
@@ -263,7 +263,7 @@
<div data-object="unit-navyunit" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">Z</div>
</div>
@@ -275,7 +275,7 @@
<div data-object="unit-navyunit" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">Y</div>
</div>
@@ -287,7 +287,7 @@
<div data-object="unit-navyunit" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">X</div>
</div>
@@ -308,7 +308,7 @@
<div data-object="unit-building" data-coalition="">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">J</div>
</div>
@@ -320,7 +320,7 @@
<div data-object="unit-building" data-coalition="blue">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">K</div>
</div>
@@ -332,7 +332,7 @@
<div data-object="unit-building" data-coalition="red">
<div class="unit-selected-spotlight"></div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">L</div>
</div>
@@ -360,7 +360,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:0%;"></div>
@@ -384,7 +384,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:10%;"></div>
@@ -407,7 +407,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:20%;"></div>
@@ -430,7 +430,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:50%;"></div>
@@ -453,7 +453,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:75%;"></div>
@@ -476,7 +476,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -509,7 +509,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -539,7 +539,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -568,7 +568,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -598,7 +598,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -628,7 +628,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -657,7 +657,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -695,7 +695,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -725,7 +725,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -754,7 +754,7 @@
<div class="unit-hotgroup">
<div class="unit-hotgroup-id">4</div>
</div>
<div class="unit-marker"></div>
<div class="unit-icon"></div>
<div class="unit-short-label">18</div>
<div class="unit-fuel">
<div class="unit-fuel-level" style="width:100%;"></div>
@@ -791,7 +791,7 @@
<div class="example">
<div data-object="unit-missile">
<div class="unit-marker"></div>
<div class="unit-icon"></div>
</div>
</div>
@@ -800,7 +800,7 @@
<div class="example">
<div data-object="unit-missile" data-coalition="blue">
<div class="unit-marker" style="transform: rotate( 90deg );"></div>
<div class="unit-icon" style="transform: rotate( 90deg );"></div>
</div>
</div>
@@ -808,7 +808,7 @@
<div class="example">
<div data-object="unit-missile" data-coalition="red">
<div class="unit-marker" style="transform: rotate( 225deg );"></div>
<div class="unit-icon" style="transform: rotate( 225deg );"></div>
</div>
</div>
@@ -1183,19 +1183,19 @@
<div class="caption">Actions</div>
<div class="icon-list">
<div>
<img src="/themes/olympus/images/icons_actions_gas_dark.svg" />
<img src="/resources/theme/images/icons_actions_gas_dark.svg" />
<span>icons_actions_gas</span>
</div>
<div>
<img src="/themes/olympus/images/icons_actions_nothing_dark.svg" />
<img src="/resources/theme/images/icons_actions_nothing_dark.svg" />
<span>icons_actions_nothing</span>
</div>
<div>
<img src="/themes/olympus/images/icons_actions_rtb_dark.svg" />
<img src="/resources/theme/images/icons_actions_rtb_dark.svg" />
<span>icons_actions_rtb</span>
</div>
<div>
<img src="/themes/olympus/images/icons_actions_search_dark.svg" />
<img src="/resources/theme/images/icons_actions_search_dark.svg" />
<span>icons_actions_search</span>
</div>
</div>
@@ -1205,19 +1205,19 @@
<div class="caption">RoE</div>
<div class="icon-list">
<div>
<img src="/themes/olympus/images/icons_roe_free_dark.svg" />
<img src="/resources/theme/images/icons_roe_free_dark.svg" />
<span>icons_roe_free</span>
</div>
<div>
<img src="/themes/olympus/images/icons_roe_return_dark.svg" />
<img src="/resources/theme/images/icons_roe_return_dark.svg" />
<span>icons_roe_return</span>
</div>
<div>
<img src="/themes/olympus/images/icons_roe_stop_dark.svg" />
<img src="/resources/theme/images/icons_roe_stop_dark.svg" />
<span>icons_roe_stop</span>
</div>
<div>
<img src="/themes/olympus/images/icons_roe_target_dark.svg" />
<img src="/resources/theme/images/icons_roe_target_dark.svg" />
<span>icons_roe_target</span>
</div>
</div>
@@ -1227,11 +1227,11 @@
<div class="caption">Threat</div>
<div class="icon-list">
<div>
<img src="/themes/olympus/images/icons_threat_protect_dark.svg" />
<img src="/resources/theme/images/icons_threat_protect_dark.svg" />
<span>icons_threat_protect</span>
</div>
<div>
<img src="/themes/olympus/images/icons_threat_retreat_dark.svg" />
<img src="/resources/theme/images/icons_threat_retreat_dark.svg" />
<span>icons_threat_retreat</span>
</div>
</div>