Merge pull request 'release v3.11.8' (#336) from develop into master

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

.gitea/issue_template/FEATURE_TEMPLATE.md

@@ -1,16 +0,0 @@
----
-name: "New feature"
-about: "Use this template if you want to request a feature"
-title: "[FEATURE] "
-labels:
-  - enhancement
----
-## Feature
-
-### Description
-
-...
-
-### Benefits
-
-...

.gitea/issue_template/FEATURE_TEMPLATE.yml

@@ -0,0 +1,34 @@
+name: New feature
+about: Use this template if you want to request a feature
+title: "[FEATURE] "
+labels:
+  - enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Describe the feature.
+    validations:
+      required: true
+
+  - type: textarea
+    id: benefits
+    attributes:
+      label: Benefits
+      description: Describe the benefits of this feature.
+    validations:
+      required: true
+
+  - type: textarea
+    id: extra
+    attributes:
+      label: More informations
+      description: If you want to share more things, this is here!
+    validations:
+      required: false

.gitea/issue_template/ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
----
-name: "New issue"
-about: "Use this template if you have a bug"
-title: "[BUG] "
-labels:
-  - bug
----
-## Issue
-
-### Environment
-
-* Custom menu version: 
-* Nextcloud version: 
-* PHP version: 
-* Web server (Nginx, Apache2): 
-* Web browser and version (Firefox 80, Google Chrome 74, etc): 
-
-```
-Insert your configuration here. You can export the configuration using the admin page.
-```
-
-### Steps to reproduce
-
-...
-
-### Observed Results
-
-...
-
-### Expected Results
-
-...

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -0,0 +1,69 @@
+name: New issue
+about: Use this template if you have a bug
+title: "[Bug] "
+labels:
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      value: |
+        * Custom menu version: 
+        * Nextcloud version: 
+        * PHP version: 
+        * Web server (Nginx, Apache2): 
+        * Web browser and version (Firefox 80, Google Chrome 74, etc): 
+    validations:
+      required: true
+
+  - type: textarea
+    id: configuration
+    attributes:
+      label: Configuration
+      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: |
+        ```
+        {
+          ...
+        }
+        ```
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: How reproduce the bug?
+    validations:
+      required: false
+
+  - type: textarea
+    id: resuts
+    attributes:
+      label: Observed Results
+      description: What happened?
+    validations:
+      required: false
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Results
+      description: What should happen?
+    validations:
+      required: false
+
+  - type: textarea
+    id: extra
+    attributes:
+      label: More informations
+      description: If you want to share more things, this is here!
+    validations:
+      required: false

.woodpecker.yml

@@ -1,26 +1,86 @@
-pipeline:
+steps:
-  dependencies:
+  "Verify tag and app version":
-    image: gitnet.fr/deblan/devenv
+    image: alpine
     commands:
-      - make dep
+      - TAG=${CI_COMMIT_TAG/v//}
+      - grep "<version>$TAG</version>" appinfo/info.xml
     when:
-      event: [tag, push, pull_request]
+      event: [tag]
-      branch: [master, develop, feature/*]
 
-  build:
+  "Install dependencies":
-    image: gitnet.fr/deblan/devenv
+    image: node:16
+    pull: true
     commands:
-      - make build
+      - npm i
     when:
-      branch: [master, develop, feature/*]
+      event: [tag, push, pull_request, manual]
-      event: [push, pull_request]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
 
-  package:
+  "Check dependencies":
-    image: gitnet.fr/deblan/devenv
+    image: gitnet.fr/deblan/osv-detector:v0.10
+    commands:
+      - osv-detector package-lock.json
+    failure: ignore
+
+  "Build JS":
+    image: node:16
+    commands:
+      - npm run build
+    when:
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+  "Build translations":
+    image: deblan/php:8.0
+    commands:
+      - php bin/generate_l10n.php
+    when:
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+  "Create signature":
+    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)
@@ -29,7 +89,7 @@ pipeline:
     when:
       event: [tag]
 
-  release:
+  "Push release":
     image: plugins/gitea-release
     volumes:
       - /var/www/html/artifacts:/var/www/html/artifacts

CHANGELOG.md

@@ -1,9 +1,139 @@
 ## [Unreleased]
 
+## 3.11.8
+### Fixed
+* move the logo inside #nextcloud element (fix #278 #239) [NC26]
+
+## 3.11.7
+### Added
+* update translations
+* update ci steps names
+### Fixed
+* add accessibility to open and close buttons (#311)
+* fully apply Nextcloud AppMenu.vue updated (#326)
+* add missing label on the 'save' button in personal settings (fix #318)
+### Changed
+* upgrade axios
+* upgrade css-loader
+
+## 3.11.6
+### Fixed
+* add --background-invert-if-bright in top menu (fix #326)
+
+## 3.11.5
+### Fixed
+* add missing label on buttons for accessiblity (fix #311)
+
+## 3.11.4
+### Fixed
+* add label on buttons for accessiblity (fix #311)
+
+## 3.11.3
+### Fixed
+* fix menu icon in decks, collectives and other apps (#302)
+
+## 3.11.2
+### Fixed
+* add default translations for Slovak - fix #298
+
+## 3.11.1
+### Added
+* add Portuguese (Brazil) translations - Thanks to igorfreire
+### Fixed
+* add width to .side-menu-categories for side menu with categories display - fix #294
+
+## 3.11.0
+### Added
+* add a search component in menus - fix #282
+### Fixed
+* remove the label of the link to personal settings - fix #283
+
+## 3.10.3
+### Fixed
+* change the way to load nextcloud components (NcActionLink/NcActions) - fix #274
+* update @nexcloud/* packages
+
+## 3.10.2
+### Fixed
+* add missing properties
+
+## 3.10.1
+### Fixed
+* fix #269: use php7 syntax
+
+## 3.10.0
+### Added
+* add compatibility with NC28
+### Fixed
+* fix NC28 error: remove deprecated method `OC_App::getNavigation()`
+
+## 3.9.1
+### Fixed
+* fix fixed menu on dashboard (#262)
+
+## 3.9.0
+### Added
+* add compatibility with NC27
+### Fixed
+* fix app redirect (#261)
+
+## 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)
+
+## 3.5.1
+### Added
+* add translations (thanks to p-bo adn gallegonovato)
+### Fixed
+* fix #189: sorting not applied on mobile
+
+## 3.5.0
+### Added
+* add dependency check (ci)
+* add code quality check (ci)
+* add translations (thanks to gallegonovato)
+* add option to disable the display labels in the top menu (#194)
+### Fixed
+* fix missing img alt (settings image)
+* fix code quality alerts
+
 ## 3.4.1
-## Added
+### Added
 * add translations (thanks to zonorti, jorisvandijk, jak2k)
-## Fixed
+### Fixed
 * fix #183: hide custom categories list when empty (admin page)
 
 ## 3.4.0

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
@@ -34,4 +34,4 @@ translations:
 .ONESHELL:
 run-code-quality-analysis:
 	export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
-	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr
+	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=$$SONAR_SERVER -Dsonar.branch.name=$$(git branch --show-current)

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.4.1</version>
+    <version>3.11.8</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="28"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

css/admin.css

@@ -186,7 +186,7 @@
 }
 
 .badge {
-  border-size: 1px;
+  border-width: 1px;
   padding: 2px 8px;
   margin-right: 2px;
   margin-bottom: 5px;

css/sideMenu.css

@@ -47,7 +47,7 @@
   margin-top: 2px;
   float: right;
   line-height: 34px;
-  height: 28px;
+  height: 42px;
   display: none;
 }
 
@@ -83,6 +83,12 @@
   padding-left: 12px !important;
   margin-left: 5px !important;
   margin-left: 3px !important;
+  overflow: hidden;
+}
+
+.side-menu-opener span {
+  position: relative;
+  left: 50px;
 }
 
 .side-menu-opener:active, .side-menu-opener:focus {
@@ -155,7 +161,7 @@
 }
 
 #side-menu.hide-opener .side-menu-logo {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 #side-menu-loader {
@@ -201,7 +207,6 @@
   max-height: calc(100vh - 55px);
   overflow: auto;
   position: relative;
-  top: 5px;
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
@@ -223,7 +228,7 @@
 }
 
 .side-menu-loader svg {
-  width: 38px;
+  width: 45px;
   margin: auto;
   stroke: var(--side-menu-text-color, #fff);
 }
@@ -235,21 +240,27 @@
 
 .side-menu-always-displayed body {
   width: calc(100% - 50px) !important;
-}
-
-.side-menu-always-displayed body {
   position: absolute;
   left: 50px;
 }
 
+.side-menu-always-displayed #header {
+  position: absolute !important;
+}
+
 .side-menu-always-displayed #side-menu {
   display: block;
 }
 
 .side-menu-always-displayed .side-menu-apps-list {
+  height: 100vh;
+  top: 0;
+  overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list--with-settings {
   height: calc(100vh - 49px);
   top: 49px;
-  overflow: hidden;
 }
 
 .side-menu-always-displayed .side-menu-apps-list:hover {
@@ -283,7 +294,7 @@
 }
 
 .side-menu-always-displayed .app-navigation--close {
-  transform: translateX(calc(-100% + 50px)) !important;
+  transform: translateX(calc(-100% + 50px));
 }
 
 #side-menu.side-menu-with-categories {
@@ -294,6 +305,7 @@
 .side-menu-with-categories .side-menu-categories {
   display: block;
   padding: 0;
+  width: 100%;
 }
 
 .side-menu-with-categories .side-menu-category {
@@ -312,12 +324,35 @@
   visibility: visible;
 }
 
+.side-menu-search {
+  float: right;
+}
+
+.side-menu-search input {
+  background: none;
+  border: 0;
+  border-radius: 0;
+  color: var(--side-menu-text-color);
+}
+
+.side-menu-search input::placeholder {
+  color: var(--side-menu-text-color);
+}
+
+.side-menu-always-displayed .side-menu-search {
+  display: none;
+}
+
 @media screen and (max-width: 1024px) {
   #side-menu.side-menu-big {
     max-width: 290px;
     height: 100vh;
   }
 
+  #side-menu.hide-opener.side-menu-big .side-menu-search {
+    float: none;
+  }
+
   .side-menu-categories {
     display: block;
     padding: 0;

lib/Controller/AppController.php

@@ -74,29 +74,37 @@ class AppController extends Controller
             $inTopMenuApps = in_array($app['id'], $topMenuApps);
             $inHiddenApps = in_array($app['id'], $hiddenApps);
 
-            if (!$inTopMenuApps || $inHiddenApps) {
+            if (!$inTopMenuApps && $inHiddenApps) {
                 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('htaccess.IgnoreFrontController', false);
+        if (!$isHref) {
-        $isFrontControllerActive = 'true' === getenv('front_controller_active');
+            $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
+                'htaccess.IgnoreFrontController',
+                false
+            );
 
-        if ($isIgnoreFrontController || $isFrontControllerActive) {
+            $isFrontControllerActive = 'true' === getenv('front_controller_active');
-            $path = '/apps/%s/';
+
+            if ($isIgnoreFrontController || $isFrontControllerActive) {
+                $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/CssController.php

@@ -21,14 +21,14 @@ namespace OCA\SideMenu\Controller;
 use OC;
 use OC\User\User;
 use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\Color;
 use OCA\SideMenu\Service\ConfigProxy;
+use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
-use OCA\Theming\ThemingDefaults;
-use OCA\SideMenu\Service\Color;
 
 class CssController extends Controller
 {
@@ -58,8 +58,7 @@ class CssController extends Controller
         ConfigProxy $config,
         ThemingDefaults $theming,
         Color $color
-    )
+    ) {
-    {
         parent::__construct($appName, $request);
 
         $this->user = OC::$server[IUserSession::class]->getUser();
@@ -105,16 +104,18 @@ class CssController extends Controller
                 $topSideMenuApps = $userTopSideMenuApps;
             }
 
-            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
+            $isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
             $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
 
-            $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === '');
+            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled ||
+                ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
         } else {
             $isDarkThemeUserEnabled = false;
             $isBreezeDarkUserEnabled = false;
         }
 
-        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) ||
+            ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
 
         $primaryColor = $this->theming->getColorPrimary();
         $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
@@ -125,25 +126,33 @@ class CssController extends Controller
         if ($isDarkMode) {
             $backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
             $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2);
+            $currentAppBackgroundColor = $this->config->getAppValue(
+                'dark-mode-current-app-background-color',
+                $darkenPrimaryColor2
+            );
             $loaderColor = $this->config->getAppValue('dark-mode-loader-color', $lightenPrimaryColor);
             $textColor = $this->config->getAppValue('dark-mode-text-color', $textColor);
             $iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
             $iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
             $opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');
 
-            $backgroundOpacity = dechex($this->config->getAppValueInt('dark-mode-background-color-opacity', '100') * 255 / 100);
+            $opacity = $this->config->getAppValueInt('dark-mode-background-color-opacity', '100');
+            $backgroundOpacity = dechex($opacity * 255 / 100);
         } else {
             $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
             $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2);
+            $currentAppBackgroundColor = $this->config->getAppValue(
+                'current-app-background-color',
+                $darkenPrimaryColor2
+            );
             $loaderColor = $this->config->getAppValue('loader-color', $lightenPrimaryColor);
             $textColor = $this->config->getAppValue('text-color', $textColor);
             $iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
             $iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
             $opener = $this->config->getAppValue('opener', 'side-menu-opener');
 
-            $backgroundOpacity = dechex($this->config->getAppValueInt('background-color-opacity', '100') * 255 / 100);
+            $opacity = $this->config->getAppValueInt('background-color-opacity', '100');
+            $backgroundOpacity = dechex($opacity * 255 / 100);
         }
 
         $backgroundColor .= $backgroundOpacity;

lib/Controller/JsController.php

@@ -95,7 +95,6 @@ class JsController extends Controller
     {
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
-        $topMenuAppsOrder = $this->config->getAppValueArray('top-menu-apps-order', '[]');
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');
@@ -172,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->getAppValueInt(
+                'top-menu-mouse-over-hidden-label',
+                '0'
+            ),
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),

lib/Controller/PersonalSettingController.php

@@ -43,8 +43,13 @@ class PersonalSettingController extends Controller
      */
     protected $userSession;
 
-    public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
+    public function __construct(
-    {
+        $appName,
+        IRequest $request,
+        IConfig $config,
+        ConfigProxy $configProxy,
+        IUserSession $userSession
+    ) {
         parent::__construct($appName, $request);
 
         $this->config = $config;

lib/Service/AppRepository.php

@@ -3,6 +3,7 @@
 namespace OCA\SideMenu\Service;
 
 use OC\User\User;
+use OCP\INavigationManager;
 use OCP\L10N\IFactory;
 
 /**
@@ -32,8 +33,14 @@ class AppRepository
      */
     protected $categoryRepository;
 
+    /**
+     * @var INavigationManager
+     */
+    protected $navigationManager;
+
     public function __construct(
         \OC_App $ocApp,
+        INavigationManager $navigationManager,
         IFactory $l10nFactory,
         ConfigProxy $config,
         CategoryRepository $categoryRepository
@@ -41,6 +48,7 @@ class AppRepository
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;
         $this->config = $config;
+        $this->navigationManager = $navigationManager;
         $this->categoryRepository = $categoryRepository;
     }
 
@@ -51,7 +59,7 @@ class AppRepository
      */
     public function getVisibleApps()
     {
-        $navigation = $this->ocApp->getNavigation();
+        $navigation = $this->navigationManager->getAll();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
         $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();

lib/Service/CategoryRepository.php

@@ -74,7 +74,8 @@ class CategoryRepository
         }
 
         foreach ($categoriesLabels as $k => $category) {
-            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
+            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ??
+                $category['translations']['en']['name'];
 
             unset($categoriesLabels[$k]);
         }

lib/Settings/Admin.php

@@ -125,15 +125,24 @@ class Admin implements ISettings
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
             'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
-            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
+            'current-app-background-color' => $this->config->getAppValue(
+                'current-app-background-color',
+                $darkenPrimaryColor2
+            ),
             'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
             'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
             'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
             'text-color' => $this->config->getAppValue('text-color', $textColor),
             'dark-mode-background-color' => $darkModeBackgroundColor,
             'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
-            'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
+            'dark-mode-background-color-opacity' => $this->config->getAppValueInt(
-            'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
+                'dark-mode-background-color-opacity',
+                '100'
+            ),
+            'dark-mode-current-app-background-color' => $this->config->getAppValue(
+                'dark-mode-current-app-background-color',
+                $darkenPrimaryColor2
+            ),
             'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
             'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
             'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
@@ -159,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', '[]'),

lib/Settings/Personal.php

@@ -54,8 +54,13 @@ class Personal implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
+    public function __construct(
-    {
+        IL10N $l,
+        ILogger $logger,
+        ConfigProxy $config,
+        IUserSession $userSession,
+        AppRepository $appRepository
+    ) {
         $this->l = $l;
         $this->logger = $logger;
         $this->config = $config;

package.json

@@ -11,7 +11,7 @@
 		"stylelint:fix": "./node_modules/.bin/stylelint src --fix"
 	},
 	"dependencies": {
-		"axios": "^0.24.0",
+		"axios": "^1.6.7",
 		"trim": "^1.0.1",
 		"vue": "^2.6.11"
 	},
@@ -25,15 +25,15 @@
 		"@babel/core": "^7.9.0",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 		"@babel/preset-env": "^7.9.0",
-		"@nextcloud/axios": "^1.8.0",
+		"@nextcloud/axios": "^2.3.0",
-		"@nextcloud/browserslist-config": "^1.0.0",
+		"@nextcloud/browserslist-config": "^2.3.0",
 		"@nextcloud/eslint-config": "^8.1.2",
 		"@nextcloud/initial-state": "^2.0.0",
-		"@nextcloud/l10n": "^1.6.0",
+		"@nextcloud/l10n": "^2.1.0",
-		"@nextcloud/vue": "^7.0.0",
+		"@nextcloud/vue": "^7.12.1",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
-		"css-loader": "^3.4.2",
+		"css-loader": "^6.10.0",
 		"eslint": "^8.0.0",
 		"eslint-config-standard": "^17.0.0",
 		"eslint-import-resolver-webpack": "^0.12.1",

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

src/AppMenu.vue

@@ -21,13 +21,20 @@
   -->
 
 <template>
-  <nav class="app-menu show">
+  <nav
-    <ul class="app-menu-main" v-if="apps !== null">
+    class="app-menu show"
+    :aria-label="t('core', 'Applications menu')"
+  >
+    <ul
+      class="app-menu-main"
+      :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 }"
+        :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"
@@ -49,6 +56,7 @@
         :aria-label="appLabel(app)"
         :aria-current="app.active ? 'page' : false"
         :href="app.href"
+        :style="makeStyle(app)"
         class="app-menu-popover-entry">
         <template #icon>
           <div class="app-icon" :class="{ 'has-unread': app.unread > 0 }">
@@ -64,7 +72,8 @@
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
-import { NcActions, NcActionLink } from '@nextcloud/vue'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
 
 export default {
   name: 'AppMenu',
@@ -77,6 +86,7 @@ export default {
       appLimit: 0,
       observer: null,
       targetBlankApps: [],
+      hiddenLabels: true
     }
   },
   mounted() {
@@ -96,6 +106,7 @@ export default {
     })
 
     this.targetBlankApps = window.targetBlankApps
+    this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
     this.observer = new ResizeObserver(this.resize)
     this.observer.observe(this.$el)
     this.resize()
@@ -104,13 +115,19 @@ export default {
     this.observer.disconnect()
   },
   methods: {
-    appLabel() {
+    appLabel(app) {
-      return (app) => app.name
+      return app.name
         + (app.active ? ' (' + t('core', 'Currently open') + ')' : '')
         + (app.unread > 0 ? ' (' + n('core', '{count} notification', '{count} notifications', app.unread, { count: app.unread }) + ')' : '')
     },
     appList() {
-      return Object.values(this.apps)
+      let items = Object.values(this.apps)
+
+      items.sort((a, b) => {
+        return a.order < b.order ? -1 : 1;
+      })
+
+      return items
     },
     mainAppList() {
       return this.appList().slice(0, this.appLimit)
@@ -151,6 +168,7 @@ $header-icon-size: 20px;
   flex-shrink: 1;
   flex-wrap: wrap;
 }
+
 .app-menu-main {
   display: flex;
   flex-wrap: nowrap;
@@ -160,7 +178,6 @@ $header-icon-size: 20px;
     height: 50px;
     position: relative;
     display: flex;
-    opacity: .7;
 
     &.app-menu-entry__active {
       opacity: 1;
@@ -200,7 +217,8 @@ $header-icon-size: 20px;
       width: $header-icon-size;
       height: $header-icon-size;
       padding: calc((100% - $header-icon-size) / 2);
-      filter: var(--primary-invert-if-bright);
+      box-sizing: content-box;
+      filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
     }
 
     .app-menu-entry--label {
@@ -209,8 +227,8 @@ $header-icon-size: 20px;
       font-size: 12px;
       color: var(--color-primary-text);
       text-align: center;
-      bottom: -5px;
       left: 50%;
+      top: 45%;
       display: block;
       min-width: 100%;
       transform: translateX(-50%);
@@ -218,21 +236,21 @@ $header-icon-size: 20px;
       width: 100%;
       text-overflow: ellipsis;
       overflow: hidden;
+      letter-spacing: -0.5px;
     }
 
-    &:hover,
+    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
-    &:focus-within {
+    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
       opacity: 1;
       .app-menu-entry--label {
         opacity: 1;
-        font-weight: bold;
+        font-weight: bolder;
-        font-size: 14px;
         bottom: 0;
-        width: auto;
+        width: 100%;
-        overflow: visible;
+        text-overflow: ellipsis;
+        overflow: hidden;
       }
     }
-
   }
 
   // Show labels
@@ -241,9 +259,32 @@ $header-icon-size: 20px;
   .app-menu-entry:hover,
   .app-menu-entry:focus {
     opacity: 1;
+  }
+
+  &: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 {
+    opacity: 1;
 
     img {
-      margin-top: -6px;
+      margin-top: -8px;
+    }
+
+    .app-menu-entry--label {
+      opacity: 1;
+      bottom: 0;
+    }
+
+    &::before, .app-menu-entry::before {
+      opacity: 0;
+    }
+  }
+
+  &.app-menu-main__show-hovered .app-menu-entry:hover,
+  &.app-menu-main__show-hovered .app-menu-entry:focus {
+    img {
+      margin-top: -8px;
     }
 
     .app-menu-entry--label {
@@ -258,38 +299,42 @@ $header-icon-size: 20px;
 }
 
 ::v-deep .app-menu-more .button-vue--vue-tertiary {
-  color: var(--color-primary-text);
   opacity: .7;
   margin: 3px;
+  filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
 
-  &:hover {
+  &:not([aria-expanded="true"]) {
-    opacity: 1;
+    color: var(--color-primary-element-text);
-    background-color: transparent !important;
+
+    &:hover {
+      opacity: 1;
+      background-color: transparent !important;
+    }
   }
 
-  &:focus-visible {
+    &:focus-visible {
-    opacity: 1;
+      opacity: 1;
-    background-color: transparent !important;
+      outline: none !important;
-    border-radius: var(--border-radius);
+    }
-    outline: none;
-    box-shadow: 0 0 0 2px var(--color-primary-text);
-  }
 }
 
 .app-menu-popover-entry {
   .app-icon {
     position: relative;
     height: 44px;
+    width: 48px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
 
     &.has-unread::after {
       background-color: var(--color-main-text);
     }
 
     img {
-      filter: var(--background-invert-if-bright);
       width: $header-icon-size;
       height: $header-icon-size;
-      padding: calc((50px - $header-icon-size) / 2);
     }
   }
 }
@@ -298,7 +343,7 @@ $header-icon-size: 20px;
   content: "";
   width: 8px;
   height: 8px;
-  background-color: var(--color-primary-text);
+  background-color: var(--color-primary-element-text);
   border-radius: 50%;
   position: absolute;
   display: block;

src/AppSearch.vue

@@ -0,0 +1,32 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<template>
+  <div class="side-menu-search">
+    <input type="text" :value="value" :placeholder="t('side_menu', 'Search')" @input="$emit('input', $event.target.value)">
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppSearch',
+  props: {
+    value: {
+      required: true
+    },
+  },
+}
+</script>

src/CloserButton.vue

@@ -15,11 +15,18 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
-  <button class="side-menu-opener side-menu-closer"></button>
+  <button class="side-menu-opener side-menu-closer" :arial-label="label">
+    <span v-text="label"></span>
+  </button>
 </template>
 
 <script>
 export default {
   name: 'CloserButton',
+  data() {
+    return {
+      label: t('side_menu', 'Close the menu'),
+    }
+  }
 }
 </script>

src/OpenerButton.vue

@@ -15,11 +15,18 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
-  <button class="side-menu-opener"></button>
+  <button class="side-menu-opener" :arial-label="label">
+    <span v-text="label"></span>
+  </button>
 </template>
 
 <script>
 export default {
   name: 'OpenerButton',
+  data() {
+    return {
+      label: t('side_menu', 'Toggle the menu'),
+    }
+  }
 }
 </script>

src/SettingsButton.vue

@@ -17,10 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
   <div class="side-menu-settings">
     <a v-bind:href="href">
+      <!--
       {{ label }}
+      -->
 
       <span class="avatardiv avatardiv-shown">
-        <img v-bind:src="avatar">
+        <img v-bind:src="avatar" :alt="label">
       </span>
     </a>
   </div>

src/SideMenu.vue

@@ -16,21 +16,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
   <div id="side-menu">
-    <div class="side-menu-header">
+    <div class="side-menu-header" v-if="settings || !openerHover || (!avatar && !alwaysDisplayed && logo) || avatar">
       <SettingsButton
         v-if="settings"
         v-bind:href="settings.href"
         v-bind:label="settings.name"
         v-bind:avatar="settings.avatar" />
-
+      <AppSearch v-model:search="search" />
       <OpenerButton />
-
       <Logo
-        v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+        v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
         v-bind:image="logo"
         v-bind:link="logoLink"
       />
-
       <Logo
         v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}"
         v-bind:image="avatar"
@@ -38,9 +36,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       />
     </div>
 
-    <ul class="side-menu-apps-list">
+    <ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
       <SideMenuApp
         v-for="(app, key) in apps"
+        v-if="!hiddenApps.includes(app.id) && searchMatch(app.name)"
         v-bind:classes="{'side-menu-app': true, 'active': app.active}"
         v-bind:key="key"
         v-bind:icon="app.icon"
@@ -53,11 +52,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import SettingsButton from './SettingsButton'
 import SideMenuApp from './SideMenuApp'
+import AppSearch from './AppSearch'
 import Logo from './Logo'
 import { loadState } from '@nextcloud/initial-state'
 
@@ -68,6 +67,7 @@ export default {
     OpenerButton,
     SideMenuApp,
     Logo,
+    AppSearch,
   },
   data() {
     return {
@@ -77,7 +77,11 @@ export default {
       avatar: null,
       forceLightIcon: false,
       targetBlankApps: [],
+      hiddenApps: [],
       settings: null,
+      openerHover: false,
+      alwaysDisplayed: false,
+      search: '',
     }
   },
   methods: {
@@ -92,7 +96,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]
@@ -103,10 +111,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
@@ -117,23 +125,47 @@ export default {
     },
 
     retrieveConfig() {
-      axios
+    },
-        .get(OC.generateUrl('/apps/side_menu/js/config'))
-        .then((response) => {
-          const config = response.data
 
-          this.targetBlankApps = config['target-blank-apps']
+    hasSearchMatch(apps) {
-          this.forceLightIcon = config['force-light-icon']
+      if (this.search.trim() === '') {
-          this.avatar = config['avatar']
+        return true
-          this.logo = config['logo']
+      }
-          this.logoLink = config['logo-link']
+
-          this.settings = config['settings']
+      for (let key in apps) {
-        })
+        if (this.searchMatch(apps[key].name)) {
+          return true
+        }
+      }
+
+      return false
+    },
+
+    searchMatch(name) {
+      if (this.search.trim() === '') {
+        return true
+      }
+
+      return name.toLowerCase().includes(this.search.toLowerCase())
     },
   },
   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.openerHover = config['opener-hover']
+        this.alwaysDisplayed = config['always-displayed']
+        this.hiddenApps = config['big-menu-hidden-apps']
+        this.retrieveApps()
+      })
   }
 }
 </script>

src/SideMenuBig.vue

@@ -18,14 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
   <div id="side-menu" class="side-menu-big">
     <div class="side-menu-header">
       <CloserButton />
-
       <SettingsButton
         v-if="settings"
         v-bind:href="settings.href"
         v-bind:label="settings.name"
         v-bind:avatar="settings.avatar"
       />
-
+      <AppSearch v-model:search="search" />
       <OpenerButton />
     </div>
 
@@ -33,12 +32,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       <div class="side-menu-categories">
         <Loader v-if="!items.length" />
 
-        <div class="side-menu-category" v-for="(category, key) in items" v-bind:key="key">
+        <div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" v-bind:key="key">
           <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
           <ul class="side-menu-apps-list">
             <SideMenuBigApp
               v-for="(app, appId) in category.apps"
+              v-if="searchMatch(app.name)"
               v-bind:key="appId"
               v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
               v-bind:icon="app.icon"
@@ -59,6 +59,7 @@ import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
+import AppSearch from './AppSearch'
 import SideMenuBigApp from './SideMenuBigApp'
 import { loadState } from '@nextcloud/initial-state'
 
@@ -70,6 +71,7 @@ export default {
     CloserButton,
     Loader,
     SideMenuBigApp,
+    AppSearch,
   },
   data() {
     return {
@@ -78,6 +80,7 @@ export default {
       targetBlank: false,
       targetBlankApps: [],
       settings: null,
+      search: '',
     }
   },
   methods: {
@@ -120,6 +123,28 @@ export default {
           this.settings = config['settings']
         })
     },
+
+    hasSearchMatch(apps) {
+      if (this.search.trim() === '') {
+        return true
+      }
+
+      for (let key in apps) {
+        if (this.searchMatch(apps[key].name)) {
+          return true
+        }
+      }
+
+      return false
+    },
+
+    searchMatch(name) {
+      if (this.search.trim() === '') {
+        return true
+      }
+
+      return name.toLowerCase().includes(this.search.toLowerCase())
+    },
   },
   mounted() {
     this.retrieveConfig()

src/SideMenuWithCategories.vue

@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         v-bind:label="settings.name"
         v-bind:avatar="settings.avatar"
       />
-
+      <AppSearch v-model:search="search" />
       <OpenerButton />
     </div>
 
@@ -31,12 +31,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       <div class="side-menu-categories">
         <Loader v-if="!items.length" />
 
-        <div class="side-menu-category" v-for="(category, key) in items" v-bind:key="key">
+        <div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" v-bind:key="key">
           <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
           <ul class="side-menu-apps-list">
             <SideMenuBigApp
               v-for="(app, appId) in category.apps"
+              v-if="searchMatch(app.name)"
               v-bind:key="appId"
               v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
               v-bind:icon="app.icon"
@@ -56,6 +57,7 @@ import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
+import AppSearch from './AppSearch'
 import SideMenuBigApp from './SideMenuBigApp'
 import { loadState } from '@nextcloud/initial-state'
 
@@ -66,6 +68,7 @@ export default {
     OpenerButton,
     Loader,
     SideMenuBigApp,
+    AppSearch,
   },
   data() {
     return {
@@ -74,6 +77,7 @@ export default {
       targetBlank: false,
       targetBlankApps: [],
       settings: null,
+      search: '',
     }
   },
   methods: {
@@ -116,6 +120,28 @@ export default {
           this.settings = config['settings']
         })
     },
+
+    hasSearchMatch(apps) {
+      if (this.search.trim() === '') {
+        return true
+      }
+
+      for (let key in apps) {
+        if (this.searchMatch(apps[key].name)) {
+          return true
+        }
+      }
+
+      return false
+    },
+
+    searchMatch(name) {
+      if (this.search.trim() === '') {
+        return true
+      }
+
+      return name.toLowerCase().includes(this.search.toLowerCase())
+    },
   },
   mounted() {
     this.retrieveConfig()

src/l10n/fixtures/cs.yaml

@@ -90,3 +90,7 @@
 "Applications kept in the top menu": "Aplikace ponechané v horní nabídce"
 "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"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/de.yaml

@@ -3,21 +3,14 @@
 "No": "Nein"
 "Yes": "Ja"
 "Menu": "Menü"
-? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
+? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
-  to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to
+: 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span> zum Navigieren.'
-  navigate.'
-: 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>,
-  um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span>
-  zum Navigieren.'
 "Top menu": "Obere Navigationsleiste"
-"Apps that not must be moved in the side menu": "Anwendungen, die nicht ins Seitenmenü\
+"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden sollen"
-  \ verschoben werden sollen"
+"If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
-"If there is no selection then the global configuration is applied.": "Wenn keine\
-  \ Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
 "Experimental": "Experimentell"
 "Save": "Speichern"
-"You like this app and you want to support me?": "Du magst diese Anwendung und möchtest\
+"You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
-  \ mich unterstützen?"
 "Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
 "Hidden": "Ausblenden"
 "Small": "Klein"
@@ -25,9 +18,9 @@
 "Big": "Groß"
 "Colors": "Farben"
 "Background color": "Hintergrundfarbe"
-"Background color of current app": "Hintergrundfarbe der aktuellen Anwendung"
+"Background color of current app": "Hintergrundfarbe der aktuellen App"
 "Text color": "Textfarbe"
-"Loader": "Ladestandanzeige"
+"Loader": "Fortschrittsbalken"
 "Icon": "Symbol"
 "Same color": "Selbe Farbe"
 "Opposite color": "Gegenfarbe"
@@ -44,43 +37,33 @@
 "After the logo": "Nach dem Logo"
 "Position": "Position"
 "Show only the opener (hidden logo)": "Nur das Menü-Symbol anzeigen (Logo wird ausgeblendet)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige\
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol nicht an, wenn keine App vorhanden ist (z.B. bei öffentlichen Seiten)."
-  \ das Seitenmenü und das Menü-Symbol nicht an, wenn keine Anwendung vorhanden ist\
-  \ (z.B. bei öffentlichen Seiten)."
 "Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne\
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)"
-  \ das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch\
-  \ deaktiviert)"
 "Display the big menu": "Großes Menü anzeigen"
 "Display the logo": "Logo anzeigen"
 "Icons and texts": "Symbole und Texte"
-"Loader enabled": "Ladestandanzeige aktiviert"
+"Loader enabled": "Fortschrittsbalken anzeigen"
 "Tips": "Tipps"
 "Always displayed": "Immer anzeigen"
-"This is the automatic behavior when the menu is always displayed.": "Dies ist das\
+"This is the automatic behavior when the menu is always displayed.": "Dies ist das automatische Verhalten, wenn das Menü immer angezeigt wird."
-  \ automatische Verhalten, wenn das Menü immer angezeigt wird."
 "Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens."
 "Big menu": "Großes Menü"
 "Live preview": "Live-Vorschau"
-"Open apps in new tab": "Öffne Anwendungen in einem neuen Tab"
+"Open apps in new tab": "Öffne Apps in einem neuen Tab"
 "Use the global setting": "Verwende die globale Einstellung"
 "Use my selection": "Verwende meine Auswahl"
-"Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
+"Show and hide the list of applications": "Ein- und Ausblenden der Appliste"
 "Use the avatar instead of the logo": "Avatar anstelle des Logos anzeigen"
-"You do not have permission to change the settings.": "Du hast keine Berechtigung,\
+"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser App zu ändern."
-  \ die Einstellungen dieser Anwendung zu ändern."
 "Force this configuration to users": "Konfiguration für alle Benutzer erzwingen"
 "Export the configuration": "Konfiguration exportieren"
 "Purge the cache": "Cache leeren"
 "Show the link to settings": "Link zu den Einstellungen anzeigen"
-"The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer\
+"The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer aktiviert"
-  \ aktiviert"
+"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
-"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen\
+"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
-  \ wird."
+"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
-"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt\
-  \ werden sollen"
-"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel\
-  \ mit dem <code>großen Menü</code>."
 "The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
 "Others": "Andere"
 "Categories": "Kategorien"
@@ -89,25 +72,25 @@
 "Name": "Name"
 "Customed": "Benutzerdefiniert"
 "Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese\
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code> angewendet."
-  \ Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code>\
-  \ angewendet."
 "Dark mode colors": "Farben für den dunklen Modus"
 "With categories": "Mit Kategorien"
 "Custom categories": "Benutzerdefinierte Kategorien"
-"Customize application categories": "Anwendungskategorien anpassen"
+"Customize application categories": "App-Kategorien anpassen"
 "Reset to default": "Auf Standard zurücksetzen"
 "Hidden icon": "Verstecktes Symbol"
 "Small icon": "Kleines Symbol"
 "Normal icon": "Normales Symbol"
-"Big icon": "Große Ikone"
+"Big icon": "Großes Icon"
 "Hidden text": "Versteckter Text"
 "Small text": "Kleiner Text"
 "Normal text": "Normaler Text"
 "Big text": "Großer Text"
-"Applications": "Applications"
+"Applications": "Apps"
-"Applications kept in the top menu": "Applications kept in the top menu"
+"Applications kept in the top menu": "Apps in der oberen Navigationsleiste"
-"Applications kept in the top menu but also shown in side menu": "Applications kept\
+"Applications kept in the top menu but also shown in side menu": "Apps in der oberen Navigationsleiste, die auch im Seitenmenü angezeigt werden sollen"
-  \ in the top menu but also shown in side menu"
+"These applications must be selected in the previous option.": "Diese Apps müssen auch in der vorherigen Einstellung ausgewählt werden."
-"These applications must be selected in the previous option.": "These applications\
+"Hide labels on mouse over": "Labels ausblenden, wenn sich die Maus darüber befindet (Hover)"
-  \ must be selected in the previous option."
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/es.yaml

@@ -0,0 +1,96 @@
+"Custom menu": "Menú personalizado"
+"Enable the custom menu": "Habilitar el menú personalizado"
+"No": "No"
+"Yes": "Sí"
+"Menu": "Menú"
+? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+: 'Usa la combinación de teclas <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para activar y desactivar el menú lateral. Use <span class="keyboard-key">tab</span> para navegar.'
+"Top menu": "Menu principal"
+"Apps that not must be moved in the side menu": "Aplicaciones que no se deben mover al menú lateral"
+"If there is no selection then the global configuration is applied.": "Si no hay selección, se aplica la configuración global."
+"Experimental": "En pruebas"
+"Save": "Guardar"
+"You like this app and you want to support me?": "¿Te gusta esta aplicación y quieres apoyarme?"
+"Buy me a coffee ☕": "Cómprame un café ☕"
+"Hidden": "Oculto"
+"Small": "Pequeño"
+"Normal": "Normal"
+"Big": "Grande"
+"Hidden icon": "Ocultar Icono"
+"Small icon": "Icono pequeño"
+"Normal icon": "Icono normal"
+"Big icon": "Icono grande"
+"Hidden text": "Texto oculto"
+"Small text": "Texto pequeño"
+"Normal text": "Texto normal"
+"Big text": "Texto grande"
+"Colors": "Colores"
+"Background color": "Color de fondo"
+"Background color of current app": "Color de fondo de la aplicación actual"
+"Text color": "Color del texto"
+"Loader": "Cargador"
+"Icon": "Icono"
+"Same color": "El mismo color"
+"Opposite color": "Color opuesto"
+"Transparent": "Transparente"
+"Opaque": "Opaco"
+"Opener": "Abrir"
+"Default": "Por defecto"
+"Default (dark)": "Por defecto (oscuro)"
+"Hamburger": "Hamburguesa"
+"Hamburger (dark)": "Hamburger (negro)"
+"Hamburger 2": "Hamburguesa 2"
+"Hamburger 2 (dark)": "Hamburger 2 (negro)"
+"Before the logo": "Antes del logotipo"
+"After the logo": "Después del logotipo"
+"Position": "Posición"
+"Show only the opener (hidden logo)": "Mostrar solo abrir (ocultar logotipo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "No mostrar el menú lateral y el abridor si no hay aplicación (por ejemplo: páginas públicas)."
+"Panel": "Panel"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Abra el menú cuando el ratón esté sobre el icono (se desactiva automáticamente en las pantallas táctiles)"
+"Display the big menu": "Mostrar el menú grande"
+"Display the logo": "Mostrar el logotipo"
+"Icons and texts": "Iconos y textos"
+"Loader enabled": "Cargador activado"
+"Tips": "Consejos"
+"Always displayed": "Siempre se muestra"
+"This is the automatic behavior when the menu is always displayed.": "Este es el comportamiento automático cuando aún se muestra el menú."
+"Not compatible with touch screens.": "No es compatible con las pantallas táctiles."
+"Big menu": "Menú grande"
+"Live preview": "Previsualización en directo"
+"Open apps in new tab": "Abrir las aplicaciones en una nueva pestaña"
+"Use the global setting": "Utilizar la configuración global"
+"Use my selection": "Utilizar mi selección"
+"Show and hide the list of applications": "Mostrar y ocultar la lista de aplicaciones"
+"Use the avatar instead of the logo": "Utilizar un avatar en lugar de un logotipo"
+"You do not have permission to change the settings.": "No tienes permiso para cambiar la configuración."
+"Force this configuration to users": "Forzar esta configuración a todos los usuarios"
+"Export the configuration": "Exportar la configuración"
+"Purge the cache": "Vaciar la caché"
+"Show the link to settings": "Mostrar un enlace a la configuración"
+"The menu is enabled by default for users": "El menú está activado por defecto para los usuarios"
+"Except when the configuration is forced.": "Excepto cuando la configuración es forzada."
+"Apps that should not be displayed in the menu": "Aplicaciones que no deben aparecer en el menú"
+"This feature is only compatible with the <code>big menu</code> display.": "Esta función sólo es compatible con la pantalla del <code>menú grande</code>."
+"The logo is a link to the default app": "El logotipo es un enlace a la aplicación por defecto"
+"Others": "Otros"
+"Categories": "Categorías"
+"Customize sorting": "Personalizar la clasificación"
+"Order by": "Ordenar por"
+"Name": "Nombre"
+"Customed": "Personalizado"
+"Show and hide the list of categories": "Mostrar y ocultar la lista de categorías"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estos parámetros se utilizan cuando el tema oscuro o el tema oscuro de Breeze están activados."
+"Dark mode colors": "Colores del modo oscuro"
+"With categories": "Con categorías"
+"Custom categories": "Categorías personalizadas"
+"Customize application categories": "Personalizar las categorías de las aplicaciones"
+"Reset to default": "Restablecer los valores por defecto"
+"Applications": "Aplicaciones"
+"Applications kept in the top menu": "Aplicaciones guardadas en el menú superior"
+"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"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/fr.yaml

@@ -90,3 +90,7 @@
 "Applications kept in the top menu": "Applications conservées dans le menu supérieur"
 "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"
+"Search": "Rechercher"
+"Toggle the menu": "Basculer le menu"

src/l10n/fixtures/gl.yaml

@@ -0,0 +1,96 @@
+"Custom menu": "Custom menu"
+"Enable the custom menu": "Enable the custom menu"
+"No": "No"
+"Yes": "Yes"
+"Menu": "Menu"
+? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+: 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+"Top menu": "Top menu"
+"Apps that not must be moved in the side 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."
+"Experimental": "Experimental"
+"Save": "Save"
+"You like this app and you want to support me?": "You like this app and you want to support me?"
+"Buy me a coffee ☕": "Buy me a coffee ☕"
+"Hidden": "Hidden"
+"Small": "Small"
+"Normal": "Normal"
+"Big": "Big"
+"Hidden icon": "Hidden icon"
+"Small icon": "Small icon"
+"Normal icon": "Normal icon"
+"Big icon": "Big icon"
+"Hidden text": "Hidden text"
+"Small text": "Small text"
+"Normal text": "Normal text"
+"Big text": "Big text"
+"Colors": "Colors"
+"Background color": "Background color"
+"Background color of current app": "Background color of current app"
+"Text color": "Text color"
+"Loader": "Loader"
+"Icon": "Icon"
+"Same color": "Same color"
+"Opposite color": "Opposite color"
+"Transparent": "Transparent"
+"Opaque": "Opaque"
+"Opener": "Opener"
+"Default": "Default"
+"Default (dark)": "Default (dark)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (dark)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (dark)"
+"Before the logo": "Before the logo"
+"After the logo": "After the logo"
+"Position": "Position"
+"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "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)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
+"Display the big menu": "Display the big menu"
+"Display the logo": "Display the logo"
+"Icons and texts": "Icons and texts"
+"Loader enabled": "Loader enabled"
+"Tips": "Tips"
+"Always displayed": "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": "Big menu"
+"Live preview": "Live preview"
+"Open apps in new tab": "Open apps in new tab"
+"Use the global setting": "Use the global setting"
+"Use my selection": "Use my selection"
+"Show and hide the list of applications": "Show and hide the list of applications"
+"Use the avatar instead of the logo": "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": "Export the configuration"
+"Purge the cache": "Purge the cache"
+"Show the link to settings": "Show the link to settings"
+"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"
+"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"
+"Others": "Others"
+"Categories": "Categories"
+"Customize sorting": "Customize sorting"
+"Order by": "Order by"
+"Name": "Name"
+"Customed": "Customed"
+"Show and hide the list of categories": "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."
+"Dark mode colors": "Dark mode colors"
+"With categories": "With categories"
+"Custom categories": "Custom categories"
+"Customize application categories": "Customize application categories"
+"Reset to default": "Reset to default"
+"Applications": "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"
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/nl.yaml

@@ -90,3 +90,7 @@
 "Applications kept in the top menu": "Applicaties bewaard in het bovenste menu"
 "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"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/pt_BR.yaml

@@ -0,0 +1,94 @@
+"Custom menu": "Menu personalizado"
+"Enable the custom menu": "Habilitar o menu personalizado"
+"No": "Não"
+"Yes": "Sim"
+"Menu": "Menu"
+? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+: 'Use o atalho <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para exibir e para esconder o menu lateral. Use <span class="keyboard-key">tab</span> para navegar.'
+"Top menu": "Menu superior"
+"Apps that not must be moved in the side menu": "Apps que não devem ser movidos para o menu lateral"
+"If there is no selection then the global configuration is applied.": "Se não houver seleção, a configuração global será aplicada."
+"Experimental": "Experimental"
+"Save": "Salvar"
+"You like this app and you want to support me?": "Você gosta deste aplicativo e quer me apoiar?"
+"Buy me a coffee ☕": "Me pague um café ☕"
+"Hidden": "Oculto"
+"Small": "Pequeno"
+"Normal": "Normal"
+"Big": "Grande"
+"Hidden icon": "Ícone oculto"
+"Small icon": "Ícone pequeno"
+"Normal icon": "Ícone normal"
+"Big icon": "Ícone grance"
+"Hidden text": "Texto oculto"
+"Small text": "Texto pequeno"
+"Normal text": "Texto normal"
+"Big text": "Texto grande"
+"Colors": "Cores"
+"Background color": "Cor de fundo"
+"Background color of current app": "Cor de fundo do app atual"
+"Text color": "Cor do texto"
+"Loader": "Progresso"
+"Icon": "Ícone"
+"Same color": "Mesma cor"
+"Opposite color": "Cor oposta"
+"Transparent": "Transparente"
+"Opaque": "Opaco"
+"Opener": "Abrir"
+"Default": "Padrão"
+"Default (dark)": "Padrão (escuro)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (escuro)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (escuro)"
+"Before the logo": "Antes da logo"
+"After the logo": "Depois da logo"
+"Position": "Posição"
+"Show only the opener (hidden logo)": "Mostrar apenas o Abrir (ocultar logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Não mostrar o menu lateral e o Abrir se não houver aplicação (p.ex. páginas públicas)."
+"Panel": "Painel"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Abrir o menu quando o mouse passar sobre o Abrir (desativado automaticamente em telas de toque)"
+"Display the big menu": "Mostrar o menu grande"
+"Display the logo": "Mostrar a logo"
+"Icons and texts": "Ícones e textos"
+"Loader enabled": "Progresso ativado"
+"Tips": "Dicas"
+"Always displayed": "Sempre visível"
+"This is the automatic behavior when the menu is always displayed.": "Este é o comportamento automático quando o menu está sempre visível."
+"Not compatible with touch screens.": "Não compatível com telas de toque."
+"Big menu": "Menu grande"
+"Live preview": "Visualização ao vivo"
+"Open apps in new tab": "Abrir apps em nova aba"
+"Use the global setting": "Usar configurações globais"
+"Use my selection": "Usar minha seleção"
+"Show and hide the list of applications": "Mostrar e ocultar a lista de aplicativos"
+"Use the avatar instead of the logo": "Use o avatar ao invés da logo"
+"You do not have permission to change the settings.": "Você não tem permissão para alterar as configurações."
+"Force this configuration to users": "Forçar esta configuração para os usuários"
+"Export the configuration": "Exportar a configuração"
+"Purge the cache": "Limpar o cache"
+"Show the link to settings": "Mostrar o link para configurações"
+"The menu is enabled by default for users": "O menu é habilitado por padrão para os usuários"
+"Except when the configuration is forced.": "Exceto quando a configuração é forçada."
+"Apps that should not be displayed in the menu": "Apps que não devem ser mostrados no menu"
+"This feature is only compatible with the <code>big menu</code> display.": "Este recurso só é compatível com a exibição do <code>menu grande</code>."
+"The logo is a link to the default app": "A logo é um link para o app padrão"
+"Others": "Outros"
+"Categories": "Categorias"
+"Customize sorting": "Personalizar classificação"
+"Order by": "Ordenar por"
+"Name": "Nome"
+"Customed": "Personalizado"
+"Show and hide the list of categories": "Mostrar e esconder a lista de categorias"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estes parâmetros são usados quando o tema escuro ou o tema Dark Breeze está ativo."
+"Dark mode colors": "Cores do modo escuro"
+"With categories": "Com categorias"
+"Custom categories": "Categorias personalizadas"
+"Customize application categories": "Personalizar categorias de apps"
+"Reset to default": "Restaurar padrão"
+"Applications": "Aplicativos"
+"Applications kept in the top menu": "Aplicativos mantidos no menu superior"
+"Applications kept in the top menu but also shown in side menu": "Aplicativos mantidos no menu superior, mas também mostrados no menu lateral"
+"These applications must be selected in the previous option.": "Estes aplicativos devem ser selecionados na opção anterior."
+"Hide labels on mouse over": "Ocultar descrição ao passar o mouse"
+"Toggle the menu": "Toggle the menu"

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": "Большой текст"
@@ -31,48 +31,48 @@
 "Loader": "Загрузчик"
 "Icon": "Иконка"
 "Same color": "Такой же цвет"
-"Opposite color": "Opposite color"
+"Opposite color": "Противоположный цвет"
 "Transparent": "Прозрачный"
-"Opaque": "Opaque"
+"Opaque": "Непрозрачный"
-"Opener": "Opener"
+"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)": "Show only the opener (hidden logo)"
+"Show only the opener (hidden logo)": "Показать только открывающую часть (скрытый логотип)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
+"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)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
+"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,13 +80,17 @@
 "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": "Скрыть название при наведении мыши"
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/sk.yaml

@@ -0,0 +1,94 @@
+"Custom menu": "Custom menu"
+"Enable the custom menu": "Enable the custom menu"
+"No": "No"
+"Yes": "Yes"
+"Menu": "Menu"
+? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+: 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+"Top menu": "Top menu"
+"Apps that not must be moved in the side 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."
+"Experimental": "Experimental"
+"Save": "Save"
+"You like this app and you want to support me?": "You like this app and you want to support me?"
+"Buy me a coffee ☕": "Buy me a coffee ☕"
+"Hidden": "Hidden"
+"Small": "Small"
+"Normal": "Normal"
+"Big": "Big"
+"Hidden icon": "Hidden icon"
+"Small icon": "Small icon"
+"Normal icon": "Normal icon"
+"Big icon": "Big icon"
+"Hidden text": "Hidden text"
+"Small text": "Small text"
+"Normal text": "Normal text"
+"Big text": "Big text"
+"Colors": "Colors"
+"Background color": "Background color"
+"Background color of current app": "Background color of current app"
+"Text color": "Text color"
+"Loader": "Loader"
+"Icon": "Icon"
+"Same color": "Same color"
+"Opposite color": "Opposite color"
+"Transparent": "Transparent"
+"Opaque": "Opaque"
+"Opener": "Opener"
+"Default": "Default"
+"Default (dark)": "Default (dark)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (dark)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (dark)"
+"Before the logo": "Before the logo"
+"After the logo": "After the logo"
+"Position": "Position"
+"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "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)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
+"Display the big menu": "Display the big menu"
+"Display the logo": "Display the logo"
+"Icons and texts": "Icons and texts"
+"Loader enabled": "Loader enabled"
+"Tips": "Tips"
+"Always displayed": "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": "Big menu"
+"Live preview": "Live preview"
+"Open apps in new tab": "Open apps in new tab"
+"Use the global setting": "Use the global setting"
+"Use my selection": "Use my selection"
+"Show and hide the list of applications": "Show and hide the list of applications"
+"Use the avatar instead of the logo": "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": "Export the configuration"
+"Purge the cache": "Purge the cache"
+"Show the link to settings": "Show the link to settings"
+"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"
+"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"
+"Others": "Others"
+"Categories": "Categories"
+"Customize sorting": "Customize sorting"
+"Order by": "Order by"
+"Name": "Name"
+"Customed": "Customed"
+"Show and hide the list of categories": "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."
+"Dark mode colors": "Dark mode colors"
+"With categories": "With categories"
+"Custom categories": "Custom categories"
+"Customize application categories": "Customize application categories"
+"Reset to default": "Reset to default"
+"Applications": "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"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/tpl/base.yaml

@@ -1,94 +1,100 @@
-"Custom menu": ""
+"Custom menu": "Custom menu"
-"Enable the custom menu": ""
+"Enable the custom menu": "Enable the custom menu"
-"No": ""
+"No": "No"
-"Yes": ""
+"Yes": "Yes"
-"Menu": ""
+"Menu": "Menu"
 ? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
   to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to
   navigate.'
-: ''
+: 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
-"Top menu": ""
+  to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to
-"Apps that not must be moved in the side menu": ""
+  navigate.'
-"If there is no selection then the global configuration is applied.": ""
+"Top menu": "Top menu"
-"Experimental": ""
+"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
-"Save": ""
+"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
-"You like this app and you want to support me?": ""
+"Experimental": "Experimental"
-"Buy me a coffee ☕": ""
+"Save": "Save"
-"Hidden": ""
+"You like this app and you want to support me?": "You like this app and you want to support me?"
-"Small": ""
+"Buy me a coffee ☕": "Buy me a coffee ☕"
-"Normal": ""
+"Hidden": "Hidden"
-"Big": ""
+"Small": "Small"
-"Hidden icon": ""
+"Normal": "Normal"
-"Small icon": ""
+"Big": "Big"
-"Normal icon": ""
+"Hidden icon": "Hidden icon"
-"Big icon": ""
+"Small icon": "Small icon"
-"Hidden text": ""
+"Normal icon": "Normal icon"
-"Small text": ""
+"Big icon": "Big icon"
-"Normal text": ""
+"Hidden text": "Hidden text"
-"Big text": ""
+"Small text": "Small text"
-"Colors": ""
+"Normal text": "Normal text"
-"Background color": ""
+"Big text": "Big text"
-"Background color of current app": ""
+"Colors": "Colors"
-"Text color": ""
+"Background color": "Background color"
-"Loader": ""
+"Background color of current app": "Background color of current app"
-"Icon": ""
+"Text color": "Text color"
-"Same color": ""
+"Loader": "Loader"
-"Opposite color": ""
+"Icon": "Icon"
-"Transparent": ""
+"Same color": "Same color"
-"Opaque": ""
+"Opposite color": "Opposite color"
-"Opener": ""
+"Transparent": "Transparent"
-"Default": ""
+"Opaque": "Opaque"
-"Default (dark)": ""
+"Opener": "Opener"
-"Hamburger": ""
+"Default": "Default"
-"Hamburger (dark)": ""
+"Default (dark)": "Default (dark)"
-"Hamburger 2": ""
+"Hamburger": "Hamburger"
-"Hamburger 2 (dark)": ""
+"Hamburger (dark)": "Hamburger (dark)"
-"Before the logo": ""
+"Hamburger 2": "Hamburger 2"
-"After the logo": ""
+"Hamburger 2 (dark)": "Hamburger 2 (dark)"
-"Position": ""
+"Before the logo": "Before the logo"
-"Show only the opener (hidden logo)": ""
+"After the logo": "After the logo"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": ""
+"Position": "Position"
-"Panel": ""
+"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": ""
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
-"Display the big menu": ""
+"Panel": "Panel"
-"Display the logo": ""
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
-"Icons and texts": ""
+"Display the big menu": "Display the big menu"
-"Loader enabled": ""
+"Display the logo": "Display the logo"
-"Tips": ""
+"Icons and texts": "Icons and texts"
-"Always displayed": ""
+"Loader enabled": "Loader enabled"
-"This is the automatic behavior when the menu is always displayed.": ""
+"Tips": "Tips"
-"Not compatible with touch screens.": ""
+"Always displayed": "Always displayed"
-"Big menu": ""
+"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Live preview": ""
+"Not compatible with touch screens.": "Not compatible with touch screens."
-"Open apps in new tab": ""
+"Big menu": "Big menu"
-"Use the global setting": ""
+"Live preview": "Live preview"
-"Use my selection": ""
+"Open apps in new tab": "Open apps in new tab"
-"Show and hide the list of applications": ""
+"Use the global setting": "Use the global setting"
-"Use the avatar instead of the logo": ""
+"Use my selection": "Use my selection"
-"You do not have permission to change the settings.": ""
+"Show and hide the list of applications": "Show and hide the list of applications"
-"Force this configuration to users": ""
+"Use the avatar instead of the logo": "Use the avatar instead of the logo"
-"Export the configuration": ""
+"You do not have permission to change the settings.": "You do not have permission to change the settings."
-"Purge the cache": ""
+"Force this configuration to users": "Force this configuration to users"
-"Show the link to settings": ""
+"Export the configuration": "Export the configuration"
-"The menu is enabled by default for users": ""
+"Purge the cache": "Purge the cache"
-"Except when the configuration is forced.": ""
+"Show the link to settings": "Show the link to settings"
-"Apps that should not be displayed in the menu": ""
+"The menu is enabled by default for users": "The menu is enabled by default for users"
-"This feature is only compatible with the <code>big menu</code> display.": ""
+"Except when the configuration is forced.": "Except when the configuration is forced."
-"The logo is a link to the default app": ""
+"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
-"Others": ""
+"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"Categories": ""
+"The logo is a link to the default app": "The logo is a link to the default app"
-"Customize sorting": ""
+"Others": "Others"
-"Order by": ""
+"Categories": "Categories"
-"Name": ""
+"Customize sorting": "Customize sorting"
-"Customed": ""
+"Order by": "Order by"
-"Show and hide the list of categories": ""
+"Name": "Name"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": ""
+"Customed": "Customed"
-"Dark mode colors": ""
+"Show and hide the list of categories": "Show and hide the list of categories"
-"With 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."
-"Custom categories": ""
+"Dark mode colors": "Dark mode colors"
-"Customize application categories": ""
+"With categories": "With categories"
-"Reset to default": ""
+"Custom categories": "Custom categories"
-"Applications": ""
+"Customize application categories": "Customize application categories"
-"Applications kept in the top menu": ""
+"Reset to default": "Reset to default"
-"Applications kept in the top menu but also shown in side menu": ""
+"Applications": "Applications"
-"These applications must be selected in the previous option.": ""
+"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"
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/zh_CN.yaml

@@ -3,11 +3,8 @@
 "No": "取消"
 "Yes": "确定"
 "Menu": "菜单"
-? "Use the shortcut <span class=\"keyboard-key\">Ctrl</span>+<span class=\"keyboard-key\"\
+? "Use the shortcut <span class=\"keyboard-key\">Ctrl</span>+<span class=\"keyboard-key\">o</span> to open and to hide the side menu. Use <span class=\"keyboard-key\">tab</span> to navigate."
-  >o</span> to open and to hide the side menu. Use <span class=\"keyboard-key\">tab</span>\
+: "使用快捷键 <span class=\"keyboard-key\">Ctrl</span>+<span class=\"keyboard-key\">o</span> 打开或隐藏侧边栏菜单。使用<span class=\"keyboard-key\">tab</span> 来导航。"
-  \ to navigate."
-: "使用快捷键 <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.": "如不选择，将应用全局设定。"
@@ -40,11 +37,9 @@
 "After the logo": "在logo后"
 "Position": "位置"
 "Show only the opener (hidden logo)": "只显示容器 (隐藏logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器\
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器 (例如 : 公共页面)。"
-  \ (例如 : 公共页面)。"
 "Panel": "面板"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单\
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
-  \ (触摸屏时将自动禁用)"
 "Display the big menu": "显示大型菜单"
 "Display the logo": "显示logo"
 "Icons and texts": "图标与文字"
@@ -93,7 +88,9 @@
 "Big text": "大文本"
 "Applications": "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\
+"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-  \ 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."
-"These applications must be selected in the previous option.": "These applications\
+"Hide labels on mouse over": "Hide labels on mouse over"
-  \ must be selected in the previous option."
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle menu": "Toggle menu"

src/lib/createElement.js

@@ -3,7 +3,13 @@ module.exports = (tagName, attributes) => {
 
   if (typeof attributes === 'object') {
     for (let i in attributes) {
-      element.setAttribute(i, attributes[i])
+      if (i === 'text') {
+        element.textContent = attributes[i]
+      } else if (i === 'html') {
+        element.innerHTML = attributes[i]
+      } else {
+        element.setAttribute(i, attributes[i])
+      }
     }
   }
 

templates/css/stylesheet.php

@@ -42,10 +42,14 @@
     top: 49px;
   }
 
-  #side-menu.hide-opener .side-menu-header {
+  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
     visibility: hidden;
   }
 
+  #side-menu.hide-opener.side-menu-with-categories .side-menu-search {
+    float: none;
+  }
+
   <?php if ($_['size-text'] === 'hidden'): ?>
     #side-menu, .side-menu-apps-list {
       <?php if ($_['size-icon'] === 'big'): ?>

templates/js/script.php

@@ -14,12 +14,17 @@ if ($_['always-displayed']) {
 
 (function() {
   const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
-  const sideMenuOpener = SMcreateElement('button', {'class': 'side-menu-opener'})
+  const sideMenuOpener = SMcreateElement('button', {
+    'class': 'side-menu-opener',
+    'arial-label': t('side_menu', 'Toggle the menu'),
+    'html': `<span>${t('side_menu', 'Toggle the menu')}</span>`
+  })
   const sideMenu = SMcreateElement('div', {id: 'side-menu'})
 
   const body = document.querySelector('body')
   const html = document.querySelector('html')
   const nextcloud = document.querySelector('#nextcloud')
+  const logo = document.querySelector('.header-left .logo')
 
   const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
 
@@ -27,6 +32,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')
@@ -34,6 +40,15 @@ if ($_['always-displayed']) {
     sideMenu.setAttribute('data-sidewithcategories', '1')
   <?php endif; ?>
 
+  const sideMenuFocus = () => {
+    let a = document.querySelector('#side-menu .side-menu-app.active a')
+      || document.querySelector('#side-menu .side-menu-app a')
+
+    if (a) {
+      a.focus()
+    }
+  }
+
   document.querySelector('body').addEventListener('side-menu.apps', (e) => {
     const apps = e.detail.apps;
 
@@ -72,20 +87,8 @@ if ($_['always-displayed']) {
     const headerMenuOpener = document.querySelector('#header .side-menu-opener')
     const sideMenuOpener = document.querySelectorAll('#side-menu .side-menu-opener')
 
-    sideMenuFocus = () => {
+    if (!headerMenuOpener) {
-      let a = document.querySelector('.side-menu-app.active a', sideMenu)
+      return
-
-      if (!a) {
-        return
-      }
-
-      if (a.length === 0) {
-        a = sideMenu.querySelector('.side-menu-app:first-child a')
-      }
-
-      if (a.length > 0) {
-        a.focus()
-      }
     }
 
     <?php if ($_['opener-hover']): ?>
@@ -119,14 +122,8 @@ if ($_['always-displayed']) {
 
     headerMenuOpener.addEventListener('click', () => {
       sideMenu.classList.add('open')
-
-      const a = sideMenu.querySelector('.side-menu-app.active a')
-
-      if (a !== null) {
-        a.focus()
-      }
-
       headerMenuOpener.blur()
+      sideMenuFocus()
     })
 
     for (let opener of sideMenuOpener) {
@@ -173,9 +170,15 @@ if ($_['always-displayed']) {
     PageLoader()
   <?php endif; ?>
 
-  <?php if ($_['opener-position'] === 'before'): ?>
+  if (nextcloud) {
-    nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
+    if (logo && logo.parentNode !== nextcloud) {
-  <?php else: ?>
+      nextcloud.appendChild(logo)
-    nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+    }
-  <?php endif; ?>
+
+    <?php if ($_['opener-position'] === 'before'): ?>
+      nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
+    <?php else: ?>
+      nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+    <?php endif; ?>
+  }
 })();

templates/settings/admin-form.php

@@ -41,6 +41,10 @@ $choicesSizes = [
 
 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
+$labelDefault = 'Default';
+$labelWithCategories = 'With categories';
+$labelBigMenu = 'Big menu';
+$labelAlwaysDisplayed = 'Always displayed';
 
 ?>
 <div id="side-menu-section">
@@ -61,7 +65,7 @@ $labelReset = 'Reset to default';
 
         <div>
             <label>
-                <?php p($l->t('Default')); ?>
+                <?php p($l->t($labelDefault)); ?>
             </label>
         </div>
         <p>
@@ -70,12 +74,12 @@ $labelReset = 'Reset to default';
                 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>
             <label>
-                <?php p($l->t('With categories')); ?>
+                <?php p($l->t($labelWithCategories)); ?>
             </label>
         </div>
         <p>
@@ -84,12 +88,12 @@ $labelReset = 'Reset to default';
                 data-alwaysdiplayed="0"
                 data-bigmenu="0"
                 data-sidewithcategories="1"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t('With categories')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t($labelWithCategories)); ?>">
         </p>
 
         <div>
             <label for="side-menu-opener">
-                <?php p($l->t('Big menu')); ?>
+                <?php p($l->t($labelBigMenu)); ?>
             </label>
         </div>
         <p>
@@ -98,12 +102,12 @@ $labelReset = 'Reset to default';
                 data-alwaysdiplayed="0"
                 data-bigmenu="1"
                 data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t($labelBigMenu)); ?>">
         </p>
 
         <div>
             <label for="side-menu-opener">
-                <?php p($l->t('Always displayed')); ?>
+                <?php p($l->t($labelAlwaysDisplayed)); ?>
             </label>
         </div>
         <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
@@ -113,7 +117,7 @@ $labelReset = 'Reset to default';
                 data-alwaysdiplayed="1"
                 data-bigmenu="0"
                 data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t('Always displayed')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t($labelAlwaysDisplayed)); ?>">
         </p>
 
         <input
@@ -147,10 +151,10 @@ $labelReset = 'Reset to default';
         </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('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -309,7 +313,7 @@ $labelReset = 'Reset to default';
         <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',
@@ -338,10 +342,10 @@ $labelReset = 'Reset to default';
         </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('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <p>
@@ -502,7 +506,7 @@ $labelReset = 'Reset to default';
         <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',
@@ -533,10 +537,10 @@ $labelReset = 'Reset to default';
         </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('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -618,7 +622,7 @@ $labelReset = 'Reset to default';
                     <?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">
@@ -637,7 +641,7 @@ $labelReset = 'Reset to default';
                     <?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">
@@ -656,7 +660,7 @@ $labelReset = 'Reset to default';
                     <?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">
@@ -675,8 +679,10 @@ $labelReset = 'Reset to default';
                     <?php p($l->t('Apps that should not be displayed in the menu')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-                        <span class="badge badge-3"><?php p($l->t('Big menu')); ?></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">
@@ -798,10 +804,10 @@ $labelReset = 'Reset to default';
         </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('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -868,6 +874,26 @@ $labelReset = 'Reset to default';
                     </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>
+                <?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 ($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>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
         </div>
     </div>
 
@@ -877,10 +903,10 @@ $labelReset = 'Reset to default';
         </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('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -924,8 +950,8 @@ $labelReset = 'Reset to default';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -1039,10 +1065,10 @@ $labelReset = 'Reset to default';
         </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('With categories')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <p>
@@ -1089,19 +1115,19 @@ $labelReset = 'Reset to default';
     </div>
 
     <div class="section" id="more">
-        <button id="side-menu-save" class="btn btn-info">
+        <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
             <?php p($l->t('Save')); ?>
             <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
-            <button class="btn btn-primary" >
+            <button class="btn btn-primary" arial-label="<?php p($l->t('Export the configuration')); ?>">
                 <?php p($l->t('Export the configuration')); ?>
             </button>
         </a>
 
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.removeCache') ?>">
-            <button class="btn btn-primary" >
+            <button class="btn btn-primary" arial-label="<?php p($l->t('Purge the cache')); ?>">
                 <?php p($l->t('Purge the cache')); ?> (<?php echo $cacheSize ?> Kb)
             </button>
         </a>
@@ -1113,7 +1139,7 @@ $labelReset = 'Reset to default';
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
-                    <button>
+                    <button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>

templates/settings/personal-form.php

@@ -240,7 +240,7 @@ $labelReset = 'Reset to default';
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-info">
+            <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
                 <?php p($l->t('Save')); ?>
                 <progress max="100" value="0" id="side-menu-save-progress"></progress>
             </button>
@@ -255,7 +255,7 @@ $labelReset = 'Reset to default';
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
-                    <button>
+                    <button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>