diff --git a/manager/ejs/connections.ejs b/manager/ejs/connections.ejs index d661c03b..da915406 100644 --- a/manager/ejs/connections.ejs +++ b/manager/ejs/connections.ejs @@ -1,31 +1,5 @@
@@ -42,7 +16,7 @@
-
+
Client port @@ -56,7 +30,7 @@
-
+
Backend port diff --git a/manager/ejs/connectionsType.ejs b/manager/ejs/connectionsType.ejs index a6a259f6..9ae0425c 100644 --- a/manager/ejs/connectionsType.ejs +++ b/manager/ejs/connectionsType.ejs @@ -15,10 +15,10 @@
-
+
Auto apply settings
-
+
Manually set
diff --git a/manager/ejs/expertsettings.ejs b/manager/ejs/expertsettings.ejs new file mode 100644 index 00000000..40c50302 --- /dev/null +++ b/manager/ejs/expertsettings.ejs @@ -0,0 +1,78 @@ + +
+
+
+ Edit Olympus instance +
+
+ Please note: you may be required to allow these ports through your firewall and modem/router via port forwarding.
+ Otherwise, others may not be able to connect to Olympus. +
+
+
+
+
+ Game Master Password + + +
+
+ Blue Commander Password + + +
+
+ Red Commander Password + + +
+
" style="color: var(--offwhite); font-size: var(--normal); color: var(--lightgray);"> + Note: to keep the old passwords, click Next without editing any value. +
+
+
+
+ Client port + + +
+ " + onchange="signal('onClientPortChanged', this.value)"> + +
+ Port already in use +
+
+
+
+ Backend port + + +
+ " + onchange="signal('onBackendPortChanged', this.value)"> + +
+ Port already in use +
+
+
+
+ +
Enable direct backend API connection + +
+
+
+
+
diff --git a/manager/ejs/instances.ejs b/manager/ejs/instances.ejs index d2fdbbaa..ab7a6b45 100644 --- a/manager/ejs/instances.ejs +++ b/manager/ejs/instances.ejs @@ -1,304 +1,111 @@ -
+
+ <% if (operation === 'INSTALL') { %> +
"> +
Olympus installed successfully in + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>!
+
+
"> +
An error occurred while installing Olympus in + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>
+
+ <% } else if (operation === 'EDIT') {%> +
"> +
Olympus settings updated for + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>!
+
+
"> +
An error occurred while updating Olympus settings for + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>
+
+ <% } else {%> +
"> +
Olympus removed successfully from + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>!
+
+
"> +
An error occurred while removing Olympus settings from + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>
+
+ <% } %> +
-
- +
+ View and manage installs - + The following DCS installations have been identified.
You can start an Olympus server, modify settings and uninstall below.
-
-
- <% for (let i = 0; i < instances.length; i++) {%> -
-
- <%= instances[i].name %> -
-
ACTIVE
-
OFFLINE
-
CONNECTED
-
DISCONNECTED
-
FPS: 0
-
Load: 0
-
-
+
"> + No instances detected! +
+
+
+ <% for (let i = 0; i < instances.length; i++) {%> +
+
+ <%= instances[i].name %> -
+ <%= instances[i].folder %> - - <%= instances[i].installed? (instances[i].error? 'Corrupted/outdated Olympus installation': 'Olympus installed'): 'Olympus not installed' %> - - <%= instances[i].folder %> -
-
-
Client port
-
<%= instances[i].installed? instances[i].clientPort: "N/A" %>
+
+
ACTIVE
+
OFFLINE
+
CONNECTED
+
DISCONNECTED
+
FPS: 0
+
Load: 0
+
-
-
Backend port
-
<%= instances[i].installed? instances[i].backendPort: "N/A" %>
-
-
-
Backend address
-
<%= instances[i].installed? instances[i].backendAddress: "N/A" %>
+ +
+ + + <%= instances[i].installed? (instances[i].error? 'Corrupted/outdated Olympus installation': 'Olympus installed'): 'Olympus not installed' %> + + +
+
+
Client port
+
<%= instances[i].installed? instances[i].clientPort: "N/A" %>
+
+
+
Backend port
+
<%= instances[i].installed? instances[i].backendPort: "N/A" %>
+
+
+
Backend address
+
<%= instances[i].installed? instances[i].backendAddress: "N/A" %>
+
+
+
+ Start Olympus +
+
Start server
+
Start client
+
+
+ +
Edit settings
+
Install Olympus
+
Uninstall Olympus
+
Open in browser
+
Stop Olympus
+
+
-
-
- Start Olympus -
-
Start server
-
Start client
-
-
- -
Edit settings
-
Install Olympus
-
Uninstall Olympus
-
Open in browser
-
Stop Olympus
-
-
Open logs
-
- <% } %> + <% } %> +
diff --git a/manager/ejs/menu.ejs b/manager/ejs/menu.ejs index 3454555e..5c7e444a 100644 --- a/manager/ejs/menu.ejs +++ b/manager/ejs/menu.ejs @@ -20,7 +20,7 @@ height: 110px; color: var(--offwhite); display: flex; - font-size: 18px; + font-size: var(--large); font-weight: 600; padding-left: 15px; align-items: start; @@ -36,7 +36,7 @@ } #manager-menu .option>div { - font-size: 14px; + font-size: var(--normal); font-weight: normal; } @@ -79,7 +79,7 @@
INSTALL WIZARD AND MANAGER
-
+
Using this manager, you can install Olympus, update settings, and view and manage instances
diff --git a/manager/ejs/passwords.ejs b/manager/ejs/passwords.ejs index 9d9907d6..58c6899f 100644 --- a/manager/ejs/passwords.ejs +++ b/manager/ejs/passwords.ejs @@ -19,21 +19,21 @@ Game Master Password - "> +
Blue Commander Password - "> +
Red Commander Password - "> +
-
" style="color: var(--offwhite); font-size: 14px; color: var(--lightgray);"> +
" style="color: var(--offwhite); font-size: var(--normal); color: var(--lightgray);"> Note: to keep the old passwords, click Next without editing any value.
diff --git a/manager/ejs/result.ejs b/manager/ejs/result.ejs index d13fb87f..be2d5c69 100644 --- a/manager/ejs/result.ejs +++ b/manager/ejs/result.ejs @@ -5,39 +5,7 @@ row-gap: 30px; padding: 60px 120px; } - - #result-page .result-summary { - padding: 25px 15px; - display: flex; - flex-direction: column; - row-gap: 10px; - } - - #result-page .result-summary .title { - font-weight: bold; - font-size: 15px; - display: flex; - align-items: center; - } - - #result-page .result-summary .title img { - margin-right: 10px; - } - - #result-page .result-summary .description { - font-size: 13px; - } - - #result-page .result-summary.success{ - color: var(--background-color); - background-color: var(--green); - } - - #result-page .result-summary.error{ - color: var(--background-color); - background-color: var(--red); - } - + #result-page .instructions-group { display: flex; color: var(--offwhite); @@ -62,7 +30,7 @@ row-gap: 5px; justify-items: center; align-items: start; - font-size: 13px; + font-size: var(--normal); } #result-page .usage-instructions>div>img { @@ -91,10 +59,10 @@
See the manager log located in <%= logLocation %> for more information.
-
+
How to launch Olympus
-
+
To launch Olympus, there are shortcuts available on the desktop and in the <%= activeInstance["name"] %> folder under Saved Games.
<% if (activeInstance["installationType"] === "singleplayer") { %> @@ -113,7 +81,7 @@
-
+
Alternatively, you can run the Olympus Server instead and visit in a web browser (Google Chrome recommended) to replace the first step above.
<% } else { %> @@ -139,7 +107,7 @@
-
+
To access Olympus from this PC, you need to visit in a web browser (Google Chrome recommended) instead.
<% } %> diff --git a/manager/ejs/settings.ejs b/manager/ejs/settings.ejs index 2b964070..70885c36 100644 --- a/manager/ejs/settings.ejs +++ b/manager/ejs/settings.ejs @@ -1,270 +1,81 @@ -
-
+
+
Back to menu
+ <% if (operation === 'EDIT') {%> +
"> +
Olympus settings updated for + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>!
+
+
"> +
An error occurred while updating Olympus settings for + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>
+
+ <% } else {%> +
"> +
Olympus removed successfully from + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>!
+
+
"> +
An error occurred while removing Olympus settings from + <%= typeof activeInstance !== 'undefined'? activeInstance["name"]: "" %>
+
+ <% } %>
-
- - View and manage installs +
+ + Change settings - - The following Olympus installations have been identified.
You can modify settings and uninstall below. + + Here you can see the DCS instances on your computer that have Olympus installed.
+ You can edit settings and uninstall Olympus from this screen.
-
-
- <% for (let i = 0; i < instances.length; i++) {%> - <% if (instances[i].installed) { %> -
-
- <%= instances[i].name %> - <%= instances[i].folder %> -
-
-
-
Client port
-
<%= instances[i].installed? instances[i].clientPort: "N/A" %>
-
-
-
Backend port
-
<%= instances[i].installed? instances[i].backendPort: "N/A" %>
-
-
-
Backend address
-
<%= instances[i].installed? instances[i].backendAddress: "N/A" %>
+
"> + No instances detected! +
+
+
+ <% for (let i = 0; i < instances.length; i++) {%> + <% if (instances[i].installed) { %> +
+
+ <%= instances[i].name %> + <%= instances[i].folder %> +
+ + <%= instances[i].installed? (instances[i].error? 'Corrupted/outdated Olympus installation': 'Olympus installed'): 'Olympus not installed' %> + +
+
+
Client port
+
<%= instances[i].installed? instances[i].clientPort: "N/A" %>
+
+
+
Backend port
+
<%= instances[i].installed? instances[i].backendPort: "N/A" %>
+
+
+
Backend address
+
<%= instances[i].installed? instances[i].backendAddress: "N/A" %>
+
+ +
+
+
Edit settings
+
Uninstall Olympus
-
Open logs
-
-
Edit settings
-
Uninstall Olympus
-
-
+ <% } %> <% } %> - <% } %> +
diff --git a/manager/ejs/type.ejs b/manager/ejs/type.ejs index ca654e86..4c6ac735 100644 --- a/manager/ejs/type.ejs +++ b/manager/ejs/type.ejs @@ -15,10 +15,10 @@
-
+
Singleplayer
-
+
Multiplayer
diff --git a/manager/ejs/welcome.ejs b/manager/ejs/welcome.ejs index 814fe9d9..87384c41 100644 --- a/manager/ejs/welcome.ejs +++ b/manager/ejs/welcome.ejs @@ -22,7 +22,7 @@ height: 70px; color: var(--offwhite); display: flex; - font-size: 18px; + font-size: var(--very-large); font-weight: 600; padding-left: 15px; align-items: center; diff --git a/manager/ejs/wizard.ejs b/manager/ejs/wizard.ejs index dc5a4ef8..cb162f38 100644 --- a/manager/ejs/wizard.ejs +++ b/manager/ejs/wizard.ejs @@ -7,40 +7,34 @@ max-height: 100%; } - .buttons-footer { - display: flex; - column-gap: 10px; - justify-content: start; - } - - .instructions { + .wizard-page .instructions { display: flex; flex-direction: column; row-gap: 15px; color: var(--offwhite); } - .instructions .step { - font-size: 14px; + .wizard-page .instructions .step { + font-size: var(--normal); color: var(--lightgray); } - .instructions .description { - font-size: 14px; + .wizard-page .instructions .description { + font-size: var(--normal); color: var(--lightgray); } - .instructions .title { + .wizard-page .instructions .title { font-size: 24px; font-weight: bold; } - .content { + .wizard-page .content { overflow-x: hidden; overflow-y: scroll; } - .content > div { + .wizard-page .content > div { height: 100%; width: 100%; display: flex; @@ -50,7 +44,7 @@ justify-content: center; } - .wizard-inputs { + .wizard-page .wizard-inputs { display: flex; flex-direction: column; row-gap: 10px; @@ -60,24 +54,24 @@ width: 300px; } - .note { + .wizard-page .note { width: 100%; background-color: var(--background-note); color: var(--offwhite); border-left: 5px solid var(--offwhite); - font-size: 14px; + font-size: var(--normal); padding: 15px; font-weight: 600; } - .warning { + .wizard-page .warning { background-color: var(--background-warning); border-left: 5px solid var(--orange); }
-
- Cancel install +
+ <%= operation === 'INSTALL'? "Cancel install": "Cancel editing" %>
diff --git a/manager/icons/triangle-exclamation-solid-orange.svg b/manager/icons/triangle-exclamation-solid-orange.svg new file mode 100644 index 00000000..cf198f5c --- /dev/null +++ b/manager/icons/triangle-exclamation-solid-orange.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/index.html b/manager/index.html index b51718a2..47a94e8a 100644 --- a/manager/index.html +++ b/manager/index.html @@ -34,10 +34,10 @@
-
+
Loading, please wait...
-
+