Merge branch '489-show-all-the-action-options-of-the-selected-units-even-if-some-units-dont-have-them' of https://github.com/Pax1601/DCSOlympus into 489-show-all-the-action-options-of-the-selected-units-even-if-some-units-dont-have-them

client/public/images/favicons/site.webmanifest

@@ -0,0 +1,16 @@
+{
+    "name": "DCS Olympus",
+    "short_name": "DCS Olympus",
+    "icons": [{
+        "src": "/images/favicons/android-chrome-192x192.png",
+        "sizes": "192x192",
+        "type": "image/png"
+    }, {
+        "src": "/images/favicons/android-chrome-512x512.png",
+        "sizes": "512x512",
+        "type": "image/png"
+    }],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}

client/public/stylesheets/style/style.css

@@ -687,6 +687,19 @@ nav.ol-panel> :last-child {
     width:10px;
 }
 
+@keyframes lock-prompt {
+    100% {
+        opacity: 1;
+    }
+    0% {
+        opacity: 0;
+    }
+}
+
+.ol-navbar-buttons-group > .protectable > button[data-protected].lock.prompt svg {
+    animation: lock-prompt .25s alternate infinite;
+}
+
 .ol-navbar-buttons-group > .protectable > button.lock svg.locked * {
     fill:white !important;
 }

client/src/unit/unit.ts

@@ -682,13 +682,14 @@ export abstract class Unit extends CustomMarker {
             /* Hide the unit if it does not belong to the commanded coalition and it is not detected by a method that can pinpoint its location (RWR does not count) */
             (!this.belongsToCommandedCoalition() && (this.#detectionMethods.length == 0 || (this.#detectionMethods.length == 1 && this.#detectionMethods[0] === RWR))) ||
             /* Hide the unit if grouping is activated, the unit is not the group leader, it is not selected, and the zoom is higher than the grouping threshold */
-            (getApp().getMap().getVisibilityOptions()[HIDE_GROUP_MEMBERS] && !this.#isLeader && this.getCategory() == "GroundUnit" && getApp().getMap().getZoom() < GROUPING_ZOOM_TRANSITION &&
-                (this.belongsToCommandedCoalition() || (!this.belongsToCommandedCoalition() && this.#detectionMethods.length == 0)))) &&
-            !(this.getSelected()
-            );
+            (getApp().getMap().getVisibilityOptions()[HIDE_GROUP_MEMBERS] && !this.#isLeader && this.getCategory() == "GroundUnit" && getApp().getMap().getZoom() < GROUPING_ZOOM_TRANSITION && 
+            (this.belongsToCommandedCoalition() || (!this.belongsToCommandedCoalition() && this.#detectionMethods.length == 0))));
 
         /* Force dead units to be hidden */
-        this.setHidden(hidden || !this.#alive);
+        this.setHidden(hidden || !this.getAlive());
+
+        /* Force hidden units to be unselected */
+        this.setSelected(this.getSelected() && !this.getHidden());
     }
 
     setHidden(hidden: boolean) {

client/src/unit/unitsmanager.ts

@@ -260,6 +260,10 @@ export class UnitsManager {
             if (options.showProtectionReminder === true && numProtectedUnits > selectedUnits.length && selectedUnits.length === 0) {
                 const messageText = (numProtectedUnits === 1) ? `Unit is protected` : `All selected units are protected`;
                 (getApp().getPopupsManager().get("infoPopup") as Popup).setText(messageText);
+                //  Cheap way for now until we use more locks
+                let lock = <HTMLElement>document.querySelector("#unit-visibility-control button.lock");
+                lock.classList.add("prompt");
+                setTimeout(() => lock.classList.remove("prompt"), 4000);
             }
 
             if (options.onlyOnePerGroup) {
@@ -891,7 +895,7 @@ export class UnitsManager {
      */
     delete(explosion: boolean = false, explosionType: string = "", units: Unit[] | null = null) {
         if (units === null)
-            units = this.getSelectedUnits({ excludeProtected: true }); /* Can be applied to humans too */
+            units = this.getSelectedUnits({ excludeProtected: true, showProtectionReminder: true }); /* Can be applied to humans too */
 
         if (units.length === 0)
             return;

client/views/index.ejs

@@ -3,14 +3,18 @@
 <head>
   <title>Olympus client</title>
   <link rel="stylesheet" type="text/css" href="stylesheets/olympus.css" />
-  <link rel="stylesheet" type="text/css" href="stylesheets/leaflet/leaflet.css">
-  <link rel="stylesheet" type="text/css" href="stylesheets/leaflet/leaflet-gesture-handling.css">
+  <link rel="stylesheet" type="text/css" href="stylesheets/leaflet/leaflet.css" />
+  <link rel="stylesheet" type="text/css" href="stylesheets/leaflet/leaflet-gesture-handling.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 rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600;700;800&display=swap"> 
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600;700;800&display=swap" />
+
+  <link rel="icon" href="/images/favicons/favicon.ico" />
+  <link rel="apple-touch-icon" href="images/favicons/apple-touch-icon.png"/>
+  <link rel="manifest" href="/images/favicons/site.webmanifest" />
 </head>
 
 <body>