Merge pull request 'update changelogs' (#293) from develop into master

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

.woodpecker.yml

@@ -1,12 +1,12 @@
-pipeline:
+steps:
   dependencies:
     image: node:16
     pull: true
     commands:
       - npm i
     when:
-      event: [tag, push, pull_request]
-      branch: [master, develop, feature/*, fix/*, translations]
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
 
   osv-detector:
     image: gitnet.fr/deblan/osv-detector:v0.10
@@ -19,16 +19,16 @@ pipeline:
     commands:
       - npm run build
     when:
-      branch: [master, develop, feature/*, fix/*, translations]
-      event: [tag, push, pull_request]
+      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:
-      branch: [master, develop, feature/*, fix/*, translations]
-      event: [tag, push, pull_request]
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
 
   create-signature:
     image: nextcloud:25

CHANGELOG.md

@@ -1,5 +1,40 @@
 ## [Unreleased]
 
+## 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)

appinfo/info.xml

@@ -32,7 +32,7 @@ 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.8.0</version>
+    <version>3.11.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -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="26"/>
+        <nextcloud min-version="25" max-version="28"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

css/sideMenu.css

@@ -47,7 +47,7 @@
   margin-top: 2px;
   float: right;
   line-height: 34px;
-  height: 28px;
+  height: 42px;
   display: none;
 }
 
@@ -155,7 +155,7 @@
 }
 
 #side-menu.hide-opener .side-menu-logo {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 #side-menu-loader {
@@ -223,7 +223,7 @@
 }
 
 .side-menu-loader svg {
-  width: 38px;
+  width: 45px;
   margin: auto;
   stroke: var(--side-menu-text-color, #fff);
 }
@@ -239,14 +239,23 @@
   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 {
@@ -309,12 +318,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,7 +74,7 @@ class AppController extends Controller
             $inTopMenuApps = in_array($app['id'], $topMenuApps);
             $inHiddenApps = in_array($app['id'], $hiddenApps);
 
-            if (!$inTopMenuApps || $inHiddenApps) {
+            if (!$inTopMenuApps && $inHiddenApps) {
                 continue;
             }
 

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();

package.json

@@ -25,12 +25,12 @@
 		"@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/browserslist-config": "^1.0.0",
+		"@nextcloud/axios": "^2.3.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/vue": "^7.0.0",
+		"@nextcloud/l10n": "^2.1.0",
+		"@nextcloud/vue": "^7.12.1",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^3.4.2",

src/AppMenu.vue

@@ -69,7 +69,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',

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/SettingsButton.vue

@@ -17,7 +17,9 @@ 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" :alt="label">

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,10 +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)"
+        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"
@@ -58,6 +56,7 @@ 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 {
@@ -79,6 +79,9 @@ export default {
       targetBlankApps: [],
       hiddenApps: [],
       settings: null,
+      openerHover: false,
+      alwaysDisplayed: false,
+      search: '',
     }
   },
   methods: {
@@ -123,6 +126,28 @@ export default {
 
     retrieveConfig() {
     },
+
+    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() {
     axios
@@ -136,6 +161,8 @@ export default {
         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()
       })

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

@@ -92,3 +92,4 @@
 "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"

src/l10n/fixtures/de.yaml

@@ -6,11 +6,11 @@
 ? '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.'
 : '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ü verschoben werden sollen"
+"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden sollen"
 "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 mich unterstützen?"
+"You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
 "Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
 "Hidden": "Ausblenden"
 "Small": "Klein"
@@ -18,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"
@@ -37,32 +37,32 @@
 "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 das Seitenmenü und das Menü-Symbol nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
+"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)."
 "Panel": "Panel"
 "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)"
 "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 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, die Einstellungen dieser Anwendung zu ändern."
+"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser App 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 aktiviert"
 "Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
-"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt werden sollen"
+"Apps that should not be displayed in the menu": "Apps, 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"
@@ -76,19 +76,20 @@
 "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": "Anwendungen"
-"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"
+"Applications": "Apps"
+"Applications kept in the top menu": "Apps in der oberen Navigationsleiste"
+"Applications kept in the top menu but also shown in side menu": "Apps in der oberen Navigationsleiste, die auch im Seitenmenü angezeigt werden sollen"
+"These applications must be selected in the previous option.": "Diese Apps müssen auch in der vorherigen Einstellung ausgewählt werden."
+"Hide labels on mouse over": "Labels ausblenden, wenn sich die Maus darüber befindet (Hover)"
 "Except the hovered app": "Except the hovered app"
+"Search": "Search"

src/l10n/fixtures/es.yaml

@@ -92,3 +92,4 @@
 "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"

src/l10n/fixtures/fr.yaml

@@ -92,3 +92,4 @@
 "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"

src/l10n/fixtures/nl.yaml

@@ -92,3 +92,4 @@
 "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"

src/l10n/fixtures/pt_BR.yaml

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

src/l10n/fixtures/ru.yaml

@@ -92,3 +92,4 @@
 "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"

src/l10n/fixtures/sk.yaml

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

src/l10n/fixtures/tpl/base.yaml

@@ -94,3 +94,4 @@
 "These applications must be selected in the previous option.": ""
 "Hide labels on mouse over": ""
 "Except the hovered app": ""
+"Search": ""

src/l10n/fixtures/zh_CN.yaml

@@ -92,3 +92,4 @@
 "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"

templates/css/stylesheet.php

@@ -42,10 +42,16 @@
     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'): ?>