From f7d463e734c15f24ff32fe15aa84a64cedaf2ae3 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Mon, 26 Dec 2022 00:56:27 +0100
Subject: [PATCH 1/4] add hiddenLabels variables to show or hide of top menu
 items on mouse over

---
 src/AppMenu.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/AppMenu.vue b/src/AppMenu.vue
index 8f043e8..eb9c10a 100644
--- a/src/AppMenu.vue
+++ b/src/AppMenu.vue
@@ -22,12 +22,16 @@
 
 <template>
   <nav class="app-menu show">
-    <ul class="app-menu-main" v-if="apps !== null">
+    <ul
+      class="app-menu-main"
+      :class="{ 'app-menu-main__hidden-label': hiddenLabels }"
+      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 }"
+        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels }"
         :style="makeStyle(app)"
         >
         <a :href="app.href"
@@ -77,6 +81,7 @@ export default {
       appLimit: 0,
       observer: null,
       targetBlankApps: [],
+      hiddenLabels: true
     }
   },
   mounted() {
@@ -220,8 +225,8 @@ $header-icon-size: 20px;
       overflow: hidden;
     }
 
-    &:hover,
-    &:focus-within {
+    &:not(.app-menu-entry__hidden-label):hover,
+    &:not(.app-menu-entry__hidden-label):focus-within {
       opacity: 1;
       .app-menu-entry--label {
         opacity: 1;
@@ -241,7 +246,12 @@ $header-icon-size: 20px;
   .app-menu-entry:hover,
   .app-menu-entry:focus {
     opacity: 1;
+  }
 
+  &:not(.app-menu-main__hidden-label):hover,
+  &:not(.app-menu-main__hidden-label):focus-within,
+  .app-menu-entry:not(.app-menu-entry__hidden-label):hover,
+  .app-menu-entry:not(.app-menu-entry__hidden-label):focus {
     img {
       margin-top: -6px;
     }

From 37e00c51c3d0a2dcc4d04125a17dce3485e9c85f Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Mon, 26 Dec 2022 12:56:32 +0100
Subject: [PATCH 2/4] add the 'top-menu-mouse-over-hidden-label'

---
 lib/Settings/Admin.php            |  4 ++++
 templates/settings/admin-form.php | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index b1e2781..86ddac4 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -168,6 +168,10 @@ class Admin implements ISettings
             'force' => $this->config->getAppValue('force', '0'),
             'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
             'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
+            'top-menu-mouse-over-hidden-label' => $this->config->getAppValue(
+                'top-menu-mouse-over-hidden-label',
+                '0'
+            ),
             'apps-order' => $this->config->getAppValueArray('apps-order', '[]'),
             'ordered-apps' => $this->appRepository->getOrderedApps(),
             'top-side-menu-apps' => $this->config->getAppValueArray('top-side-menu-apps', '[]'),
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 5a4e149..d4dff7b 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -871,6 +871,20 @@ $labelAlwaysDisplayed = 'Always displayed';
                     </div>
                 </div>
             </div>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Hide labels on mouse over')); ?>
+                </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): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['top-menu-mouse-over-hidden-label']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
         </div>
     </div>
 

From 4258327a7050b90f94c42fe3f9f73926f18a6f35 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Mon, 26 Dec 2022 12:57:07 +0100
Subject: [PATCH 3/4] add 'top-menu-mouse-over-hidden-label' as window property
 and use it in the AppMenu component

---
 lib/Controller/JsController.php | 4 ++++
 src/AppMenu.vue                 | 1 +
 templates/js/script.php         | 1 +
 3 files changed, 6 insertions(+)

diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php
index 2ba62ed..3abcdba 100644
--- a/lib/Controller/JsController.php
+++ b/lib/Controller/JsController.php
@@ -171,6 +171,10 @@ 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',
+                '0'
+            ),
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),
diff --git a/src/AppMenu.vue b/src/AppMenu.vue
index eb9c10a..9251446 100644
--- a/src/AppMenu.vue
+++ b/src/AppMenu.vue
@@ -101,6 +101,7 @@ export default {
     })
 
     this.targetBlankApps = window.targetBlankApps
+    this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
     this.observer = new ResizeObserver(this.resize)
     this.observer.observe(this.$el)
     this.resize()
diff --git a/templates/js/script.php b/templates/js/script.php
index 2607866..3770873 100644
--- a/templates/js/script.php
+++ b/templates/js/script.php
@@ -27,6 +27,7 @@ if ($_['always-displayed']) {
   window.topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
   window.topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']), "\n"; ?>
   window.menuAppsOrder = <?php echo json_encode($_['apps-order']), "\n"; ?>
+  window.topMenuAppsMouseOverHiddenLabel = <?php echo json_encode($_['top-menu-mouse-over-hidden-label']), "\n"; ?>
 
   <?php if ($display === 'big-menu'): ?>
     sideMenu.setAttribute('data-bigmenu', '1')

From 785edbf5c5fff690648ac9d389926ff96a8b5895 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Mon, 26 Dec 2022 12:59:19 +0100
Subject: [PATCH 4/4] add translation configuration

---
 src/l10n/fixtures/tpl/base.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/l10n/fixtures/tpl/base.yaml b/src/l10n/fixtures/tpl/base.yaml
index eb9bdab..2ae231f 100644
--- a/src/l10n/fixtures/tpl/base.yaml
+++ b/src/l10n/fixtures/tpl/base.yaml
@@ -92,3 +92,4 @@
 "Applications kept in the top menu": ""
 "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": ""