Merge pull request 'release v3.8.0' (#255) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/255

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -26,7 +26,7 @@ body:
     id: configuration
     attributes:
       label: Configuration
-      description: Export the configuration using the admin page and copy/paste here.
+      description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/tips/#export-the-configuration)).
       value: |
         ```
         {

.woodpecker.yml

@@ -1,47 +1,78 @@
 pipeline:
   dependencies:
-    image: gitnet.fr/deblan/devenv
+    image: node:16
+    pull: true
     commands:
-      - make dep
+      - npm i
     when:
       event: [tag, push, pull_request]
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
 
-  osv_detector:
+  osv-detector:
-    image: gitnet.fr/deblan/docker-osv-detector:v0.9
+    image: gitnet.fr/deblan/osv-detector:v0.10
     commands:
       - osv-detector package-lock.json
     failure: ignore
 
-  build:
+  build-js:
-    image: gitnet.fr/deblan/devenv
+    image: node:16
     commands:
-      - make build
+      - npm run build
     when:
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
-      event: [push, pull_request]
+      event: [tag, push, pull_request]
 
-  code_quality:
+  build-translations:
-    image: sonarsource/sonar-scanner-cli
+    image: deblan/php:8.0
-    secrets: [sonar_token, sonar_host, sonar_project]
     commands:
-      - sonar-scanner
+      - php bin/generate_l10n.php
-        -Dsonar.projectKey=$SONAR_PROJECT
-        -Dsonar.sources=.
-        -Dsonar.host.url=$SONAR_HOST
-        -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
-        -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
-        -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
-    failure: ignore
     when:
-      event: [pull_request]
+      branch: [master, develop, feature/*, fix/*, translations]
+      event: [tag, push, pull_request]
 
-  package:
+  create-signature:
-    image: gitnet.fr/deblan/devenv
+    image: nextcloud:25
+    secrets: [app_certificate, app_public_certificate]
+    environment:
+      SQLITE_DATABASE: /var/www/data/data.db
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: admin
+    commands:
+      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
+      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
+      - mkdir /tmp/app
+      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
+      - /usr/src/nextcloud/occ integrity:sign-app
+        --privateKey=/tmp/side_menu.key
+        --certificate=/tmp/side_menu.crt
+        --path=/tmp/app
+      - mv /tmp/app/appinfo/signature.json appinfo/
+    when:
+      event: [tag]
+
+  # check-code-quality:
+  #   image: sonarsource/sonar-scanner-cli
+  #   secrets: [sonar_token, sonar_host, sonar_project]
+  #   commands:
+  #     - sonar-scanner
+  #       -Dsonar.projectKey=$SONAR_PROJECT
+  #       -Dsonar.sources=.
+  #       -Dsonar.host.url=$SONAR_HOST
+  #       -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
+  #       -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
+  #       -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
+  #   failure: ignore
+  #   when:
+  #     event: [pull_request]
+
+  create-package:
+    image: deblan/php:8.0
     volumes:
       - /var/www/html/artifacts:/var/www/html/artifacts
     secrets: [app_certificate]
     commands:
+      - apt-get update
+      - apt-get install -y zip make
       - mkdir -p "$HOME/.nextcloud/certificates"
       - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
       - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
@@ -50,7 +81,7 @@ pipeline:
     when:
       event: [tag]
 
-  release:
+  push-release:
     image: plugins/gitea-release
     volumes:
       - /var/www/html/artifacts:/var/www/html/artifacts

CHANGELOG.md

@@ -1,5 +1,38 @@
 ## [Unreleased]
 
+## 3.8.0
+### Added
+* add option to show hovered label only on top menu (fix #253)
+
+## 3.7.4
+### Fixed
+* fix Integrity failed (#247)
+
+## 3.7.3
+### Fixed
+* fix #244: use app href for redirection
+### Added
+* add signature on build
+
+## 3.7.2
+### Added
+* update pipeline conditions allowing `fix/*`
+### Fixed
+* fix #233: load configuration and then retrieve apps in default side menu display
+
+## 3.7.1
+### Fixed
+* fix build process (#230)
+
+## 3.7.0
+### Added
+* add translations (thanks to AHOHNMYC)
+* add compatibility with NC26
+
+## 3.6.0
+### Added
+* add hidden apps compatible with default menu (#219)
+
 ## 3.5.2
 ### Fixed
 * add check if menu exists before adding event listeners (#210)

Makefile

@@ -9,7 +9,7 @@ dep:
 	npm link @nextcloud/vue || sudo npm link @nextcloud/vue
 
 .ONESHELL:
-release: build translations
+release:
 	if [ -z "$$VERSION" ]; then
 		echo "VERSION required"
 		exit 1

README.md

@@ -3,6 +3,7 @@
 
 [![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
 [![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/)
+![Downloads](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=downloads&query=%24.K_downloads&suffix=K&url=https%3A%2F%2Fapi-side-menu.deblan.org%2Fdownloads.php)
 
 Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
 You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.
@@ -18,6 +19,8 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark).
 
 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
 
+## [📘 Read the documentation](https://deblan.gitnet.page/side_menu_doc/)
+
 Requirements
 ------------
 

appinfo/info.xml

@@ -32,12 +32,12 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.5.2</version>
+    <version>3.8.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
     <documentation>
-        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
+        <admin>https://deblan.gitnet.page/side_menu_doc/</admin>
         <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
     </documentation>
     <category>customization</category>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="25"/>
+        <nextcloud min-version="25" max-version="26"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

lib/Controller/AppController.php

@@ -78,29 +78,33 @@ class AppController extends Controller
                 continue;
             }
 
-            return $this->redirectToApp($app['id']);
+            return $this->redirectToApp($app, true);
         }
 
         return $this->redirectToApp('files');
     }
 
-    protected function redirectToApp($appId): RedirectResponse
+    protected function redirectToApp($app, bool $isHref = false): RedirectResponse
     {
-        $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
+        if (!$isHref) {
-            'htaccess.IgnoreFrontController',
+            $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
-            false
+                'htaccess.IgnoreFrontController',
-        );
+                false
+            );
 
-        $isFrontControllerActive = 'true' === getenv('front_controller_active');
+            $isFrontControllerActive = 'true' === getenv('front_controller_active');
 
-        if ($isIgnoreFrontController || $isFrontControllerActive) {
+            if ($isIgnoreFrontController || $isFrontControllerActive) {
-            $path = '/apps/%s/';
+                $path = '/apps/%s/';
+            } else {
+                $path = '/index.php/apps/%s/';
+            }
+
+            $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $app));
         } else {
-            $path = '/index.php/apps/%s/';
+            $url = $app['href'];
         }
 
-        $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId));
-
         return new RedirectResponse($url);
     }
 }

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'
             ),

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):not(.app-menu-entry__show-hovered):hover,
-    &:not(.app-menu-entry__hidden-label):focus-within {
+    &: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):not(.app-menu-main__show-hovered):hover,
-  &:not(.app-menu-main__hidden-label):focus-within,
+  &: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 {

src/SideMenu.vue

@@ -41,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <ul class="side-menu-apps-list">
       <SideMenuApp
         v-for="(app, key) in apps"
+        v-if="!hiddenApps.includes(app.id)"
         v-bind:classes="{'side-menu-app': true, 'active': app.active}"
         v-bind:key="key"
         v-bind:icon="app.icon"
@@ -76,6 +77,7 @@ export default {
       avatar: null,
       forceLightIcon: false,
       targetBlankApps: [],
+      hiddenApps: [],
       settings: null,
     }
   },
@@ -91,7 +93,11 @@ export default {
 
       for (let id in ncApps) {
         if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
-          continue;
+          continue
+        }
+
+        if (this.hiddenApps.includes(id)) {
+          continue
         }
 
         let app = ncApps[id]
@@ -102,10 +108,10 @@ export default {
 
       finalApps.sort((a, b) => {
         if (a.order === null || b.order === null) {
-          return a.name < b.name ? -1 : 1;
+          return a.name < b.name ? -1 : 1
         }
 
-        return a.order < b.order ? -1 : 1;
+        return a.order < b.order ? -1 : 1
       })
 
       this.apps = finalApps
@@ -116,23 +122,23 @@ export default {
     },
 
     retrieveConfig() {
-      axios
-        .get(OC.generateUrl('/apps/side_menu/js/config'))
-        .then((response) => {
-          const config = response.data
-
-          this.targetBlankApps = config['target-blank-apps']
-          this.forceLightIcon = config['force-light-icon']
-          this.avatar = config['avatar']
-          this.logo = config['logo']
-          this.logoLink = config['logo-link']
-          this.settings = config['settings']
-        })
     },
   },
   mounted() {
-    this.retrieveConfig()
+    axios
-    this.retrieveApps()
+      .get(OC.generateUrl('/apps/side_menu/js/config'))
+      .then((response) => {
+        const config = response.data
+
+        this.targetBlankApps = config['target-blank-apps']
+        this.forceLightIcon = config['force-light-icon']
+        this.avatar = config['avatar']
+        this.logo = config['logo']
+        this.logoLink = config['logo-link']
+        this.settings = config['settings']
+        this.hiddenApps = config['big-menu-hidden-apps']
+        this.retrieveApps()
+      })
   }
 }
 </script>

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"

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"

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"

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"

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"

src/l10n/fixtures/ru.yaml

@@ -7,7 +7,7 @@
 : 'Используйте сочетание клавиш <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>, чтобы открыть или скрыть боковое меню. Используйте <span class="keyboard-key">Tab</span> для навигации.'
 "Top menu": "Верхнее меню"
 "Apps that not must be moved in the side menu": "Приложения не перемещаемые в боковое меню"
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
+"If there is no selection then the global configuration is applied.": "Если тут ничего не отмечено, применяются глобальные настройки."
 "Experimental": "Экспериментальный"
 "Save": "Сохранить"
 "You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать меня?"
@@ -16,11 +16,11 @@
 "Small": "Маленький"
 "Normal": "Средний"
 "Big": "Большой"
-"Hidden icon": "Скрытая иконка"
+"Hidden icon": "Без иконки"
 "Small icon": "Маленькая иконка"
 "Normal icon": "Средняя иконка"
 "Big icon": "Большая иконка"
-"Hidden text": "Скрытый текст"
+"Hidden text": "Без текста"
 "Small text": "Маленький текст"
 "Normal text": "Средний текст"
 "Big text": "Большой текст"
@@ -35,44 +35,44 @@
 "Transparent": "Прозрачный"
 "Opaque": "Непрозрачный"
 "Opener": "Открывалка"
-"Default": "По-умолчанию"
+"Default": "По умолчанию"
-"Default (dark)": "По-умолчанию (тёмный)"
+"Default (dark)": "По умолчанию (тёмный)"
 "Hamburger": "Гамбургер"
 "Hamburger (dark)": "Гамбургер (тёмный)"
 "Hamburger 2": "Гамбургер 2"
 "Hamburger 2 (dark)": "Гамбургер 2 (тёмный)"
 "Before the logo": "Перед логотипом"
 "After the logo": "После логотипа"
-"Position": "Позиция"
+"Position": "Положение"
 "Show only the opener (hidden logo)": "Показать только открывающую часть (скрытый логотип)"
 "Do not display the side menu and the opener if there is no application (eg: public pages).": "Не отображать боковое меню и открывалку, если нет приложения (например, публичные страницы)."
-"Panel": "Панеот"
+"Panel": "Панель"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Открывать меню при наведении мыши на экран (автоматически отключается на сенсорных экранах)"
 "Display the big menu": "Отобразить большое меню"
-"Display the logo": "Показать лого"
+"Display the logo": "Показать логотип"
 "Icons and texts": "Иконки и текст"
-"Loader enabled": "Loader enabled"
+"Loader enabled": "Загрузчик включен"
 "Tips": "Советы"
 "Always displayed": "Всегда отображается"
 "This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Не совместимо с сенсорными экранами"
+"Not compatible with touch screens.": "Не совместимо с сенсорными экранами."
 "Big menu": "Большое меню"
 "Live preview": "Live preview"
 "Open apps in new tab": "Открывать приложения в новой вкладке"
-"Use the global setting": "Use the global setting"
+"Use the global setting": "Использовать глобальные настройки"
-"Use my selection": "Use my selection"
+"Use my selection": "Использовать мои настройки"
 "Show and hide the list of applications": "Показать или скрыть список приложений"
 "Use the avatar instead of the logo": "Использовать аватар вместо логотипа"
-"You do not have permission to change the settings.": "У вас нет разрешения изменять настройки"
+"You do not have permission to change the settings.": "У вас нет разрешения изменять настройки."
 "Force this configuration to users": "Force this configuration to users"
 "Export the configuration": "Экспортировать конфигурацию"
 "Purge the cache": "Очистить кэш"
 "Show the link to settings": "Показать ссылку на настройки"
-"The menu is enabled by default for users": "The menu is enabled by default for users"
+"The menu is enabled by default for users": "Это меню включено по умолчанию для пользователей"
 "Except when the configuration is forced.": "Except when the configuration is forced."
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
+"Apps that should not be displayed in the menu": "Ппрограммы, скрытые из меню"
 "This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
+"The logo is a link to the default app": "Логотип открывает приложение по умолчанию"
 "Others": "Прочие"
 "Categories": "Категории"
 "Customize sorting": "Настроить сортировку"
@@ -80,14 +80,15 @@
 "Name": "Название"
 "Customed": "Customed"
 "Show and hide the list of categories": "Показать или скрыть список категорий"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Эти настройки используются темами Тёмная и Тёмная Breeze."
 "Dark mode colors": "Цвета тёмной темы"
 "With categories": "С категориями"
-"Custom categories": "Custom categories"
+"Custom categories": "Пользовательские категории"
-"Customize application categories": "Customize application categories"
+"Customize application categories": "Изменить категории приложений"
-"Reset to default": "Сбросить к значениям по-умолчанию"
+"Reset to default": "Сбросить к значениям по умолчанию"
 "Applications": "Приложения"
 "Applications kept in the top menu": "Applications kept in the top menu"
 "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"
+"Hide labels on mouse over": "Скрыть название при наведении мыши"
+"Except the hovered app": "Except the hovered app"

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": ""

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"

templates/settings/admin-form.php

@@ -41,6 +41,7 @@ $choicesSizes = [
 
 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
+$labelDefault = 'Default';
 $labelWithCategories = 'With categories';
 $labelBigMenu = 'Big menu';
 $labelAlwaysDisplayed = 'Always displayed';
@@ -64,7 +65,7 @@ $labelAlwaysDisplayed = 'Always displayed';
 
         <div>
             <label>
-                <?php p($l->t('Default')); ?>
+                <?php p($l->t($labelDefault)); ?>
             </label>
         </div>
         <p>
@@ -73,7 +74,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                 data-alwaysdiplayed="0"
                 data-bigmenu="0"
                 data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t($labelDefault)); ?>">
         </p>
 
         <div>
@@ -150,7 +151,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -312,7 +313,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         <div class="side-menu-setting-table">
             <?php
                 $choices = [
-                    'Default' => 'side-menu-opener',
+                    $labelDefault => 'side-menu-opener',
                     'Default (dark)' => 'side-menu-opener-dark',
                     'Hamburger' => 'side-menu-opener-hamburger',
                     'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -341,7 +342,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -505,7 +506,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         <div class="side-menu-setting-table">
             <?php
                 $choices = [
-                    'Default' => 'side-menu-opener',
+                    $labelDefault => 'side-menu-opener',
                     'Default (dark)' => 'side-menu-opener-dark',
                     'Hamburger' => 'side-menu-opener-hamburger',
                     'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -536,7 +537,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -621,7 +622,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('Display the logo')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -640,7 +641,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('Use the avatar instead of the logo')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -659,7 +660,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('The logo is a link to the default app')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -678,8 +679,10 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('Apps that should not be displayed in the menu')); ?>
 
                     <div class="badges">
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                         <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
                         <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+                        <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -801,7 +804,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -875,9 +878,15 @@ $labelAlwaysDisplayed = 'Always displayed';
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Hide labels on mouse over')); ?>
                 </div>
+                <?php
+                    $choices = array_merge(
+                        $choicesYesNo,
+                        ['Except the hovered app' => '2']
+                    );
+                ?>
                 <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 ($choices 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>
@@ -894,7 +903,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -1056,7 +1065,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>