From 93fef370338c0f28620c0a5d12ea7a5f24344306 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Tue, 23 May 2023 14:09:55 +0200
Subject: [PATCH] add option to show hovered label only on top menu

---
 lib/Controller/JsController.php   |  2 +-
 src/AppMenu.vue                   | 29 ++++++++++++++++++++++-------
 src/l10n/fixtures/cs.yaml         |  1 +
 src/l10n/fixtures/de.yaml         |  1 +
 src/l10n/fixtures/es.yaml         |  1 +
 src/l10n/fixtures/fr.yaml         |  1 +
 src/l10n/fixtures/nl.yaml         |  1 +
 src/l10n/fixtures/ru.yaml         |  1 +
 src/l10n/fixtures/tpl/base.yaml   |  1 +
 src/l10n/fixtures/zh_CN.yaml      |  1 +
 templates/settings/admin-form.php |  2 +-
 11 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php
index 3abcdba..13d803e 100644
--- a/lib/Controller/JsController.php
+++ b/lib/Controller/JsController.php
@@ -171,7 +171,7 @@ class JsController extends Controller
             'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
             'top-side-menu-apps' => $topSideMenuApps,
-            'top-menu-mouse-over-hidden-label' => $this->config->getAppValueBool(
+            'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt(
                 'top-menu-mouse-over-hidden-label',
                 '0'
             ),
diff --git a/src/AppMenu.vue b/src/AppMenu.vue
index 0e550d7..52a9810 100644
--- a/src/AppMenu.vue
+++ b/src/AppMenu.vue
@@ -24,14 +24,14 @@
   <nav class="app-menu show">
     <ul
       class="app-menu-main"
-      :class="{ 'app-menu-main__hidden-label': hiddenLabels }"
+      :class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
       v-if="apps !== null"
       >
       <li v-for="app in mainAppList()"
         :key="app.id"
         :data-app-id="app.id"
         class="app-menu-entry"
-        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels }"
+        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
         :style="makeStyle(app)"
         >
         <a :href="app.href"
@@ -233,8 +233,8 @@ $header-icon-size: 20px;
       overflow: hidden;
     }
 
-    &:not(.app-menu-entry__hidden-label):hover,
-    &:not(.app-menu-entry__hidden-label):focus-within {
+    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
+    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
       opacity: 1;
       .app-menu-entry--label {
         opacity: 1;
@@ -245,7 +245,6 @@ $header-icon-size: 20px;
         overflow: visible;
       }
     }
-
   }
 
   // Show labels
@@ -256,8 +255,8 @@ $header-icon-size: 20px;
     opacity: 1;
   }
 
-  &:not(.app-menu-main__hidden-label):hover,
-  &:not(.app-menu-main__hidden-label):focus-within,
+  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):hover,
+  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
   .app-menu-entry:not(.app-menu-entry__hidden-label):hover,
   .app-menu-entry:not(.app-menu-entry__hidden-label):focus {
     img {
@@ -273,6 +272,22 @@ $header-icon-size: 20px;
       opacity: 0;
     }
   }
+
+  &.app-menu-main__show-hovered .app-menu-entry:hover,
+  &.app-menu-main__show-hovered .app-menu-entry:focus {
+    img {
+      margin-top: -6px;
+    }
+
+    .app-menu-entry--label {
+      opacity: 1;
+      bottom: 0;
+    }
+
+    &::before, .app-menu-entry::before {
+      opacity: 0;
+    }
+  }
 }
 
 ::v-deep .app-menu-more .button-vue--vue-tertiary {
diff --git a/src/l10n/fixtures/cs.yaml b/src/l10n/fixtures/cs.yaml
index 8659c98..e92d3f3 100644
--- a/src/l10n/fixtures/cs.yaml
+++ b/src/l10n/fixtures/cs.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
 "These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
 "Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši"
+"Except the hovered app": "Except the hovered app"
diff --git a/src/l10n/fixtures/de.yaml b/src/l10n/fixtures/de.yaml
index a8a2ed9..a58dcd9 100644
--- a/src/l10n/fixtures/de.yaml
+++ b/src/l10n/fixtures/de.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Hide labels on mouse over"
+"Except the hovered app": "Except the hovered app"
diff --git a/src/l10n/fixtures/es.yaml b/src/l10n/fixtures/es.yaml
index 2a401dd..46df437 100644
--- a/src/l10n/fixtures/es.yaml
+++ b/src/l10n/fixtures/es.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
 "These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
 "Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
+"Except the hovered app": "Except the hovered app"
diff --git a/src/l10n/fixtures/fr.yaml b/src/l10n/fixtures/fr.yaml
index 7e60e75..cde508a 100644
--- a/src/l10n/fixtures/fr.yaml
+++ b/src/l10n/fixtures/fr.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications conservées dans le menu supérieur mais également affichées dans le menu latéral"
 "These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente."
 "Hide labels on mouse over": "Masquer le libellé des applications au passage de la souris"
+"Except the hovered app": "À l'exception de l'application survolée"
diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml
index cabc8d0..9e60180 100644
--- a/src/l10n/fixtures/nl.yaml
+++ b/src/l10n/fixtures/nl.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applicaties blijven in het topmenu maar worden ook in het zijmenu getoond"
 "These applications must be selected in the previous option.": "Deze toepassingen moeten bij de vorige optie zijn geselecteerd."
 "Hide labels on mouse over": "Hide labels on mouse over"
+"Except the hovered app": "Except the hovered app"
diff --git a/src/l10n/fixtures/ru.yaml b/src/l10n/fixtures/ru.yaml
index 62d3430..2673a4e 100644
--- a/src/l10n/fixtures/ru.yaml
+++ b/src/l10n/fixtures/ru.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Скрыть название при наведении мыши"
+"Except the hovered app": "Except the hovered app"
diff --git a/src/l10n/fixtures/tpl/base.yaml b/src/l10n/fixtures/tpl/base.yaml
index 2ae231f..01dbccf 100644
--- a/src/l10n/fixtures/tpl/base.yaml
+++ b/src/l10n/fixtures/tpl/base.yaml
@@ -93,3 +93,4 @@
 "Applications kept in the top menu but also shown in side menu": ""
 "These applications must be selected in the previous option.": ""
 "Hide labels on mouse over": ""
+"Except the hovered app": ""
diff --git a/src/l10n/fixtures/zh_CN.yaml b/src/l10n/fixtures/zh_CN.yaml
index 9c446a8..9a73922 100644
--- a/src/l10n/fixtures/zh_CN.yaml
+++ b/src/l10n/fixtures/zh_CN.yaml
@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Hide labels on mouse over"
+"Except the hovered app": "Except the hovered app"
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 29bed67..824d633 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -880,7 +880,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-top-menu-mouse-over-hidden-label" name="top-menu-mouse-over-hidden-label" class="side-menu-setting">
-                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                        <?php foreach (array_merge($choicesYesNo, ['Except the hovered app' => '2']) as $label => $value): ?>
                             <option value="<?php echo $value ?>" <?php if ($value === $_['top-menu-mouse-over-hidden-label']): ?>selected<?php endif; ?>>
                                 <?php echo $l->t($label);  ?>
                             </option>