Merge pull request 'release v3.4.1' (#184) from develop into master

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

.woodpecker.yml

@@ -12,6 +12,7 @@ pipeline:
     commands:
       - make build
     when:
+      branch: [master, develop, feature/*]
       event: [push, pull_request]
 
   package:

CHANGELOG.md

@@ -1,5 +1,42 @@
 ## [Unreleased]
 
+## 3.4.1
+## Added
+* add translations (thanks to zonorti, jorisvandijk, jak2k)
+## Fixed
+* fix #183: hide custom categories list when empty (admin page)
+
+## 3.4.0
+### Added
+* add translations (thanks to Pavelb, nier, Timur, p-bo)
+* add possibility to define Custom Menu as default app and redirect to the first top menu app (#177)
+
+## 3.3.2
+### Fixed
+* fix #173: reduce the height of categories list
+
+## 3.3.1
+### Fixed
+* fix #162: top and side apps does work correctly
+
+## 3.3.0
+### Added
+* add documentation in admin page
+* add app sorter in user config side (#160)
+### Fixed
+* fix #164: open apps in new tab does not work
+* fix #162 #159: top and side apps does work correctly
+
+## 3.2.1
+### Fixed
+* fix #150: active app is not visible has active in menu (except in default menu)
+* fix #151: opener position
+
+## 3.2.0
+### Added
+* use custom app names using 'app.navigation.name' (#148)
+* app sorting with all displays (#147)
+
 ## 3.1.0
 ### Added
 * add global custom app sorting for the top menu

README.md

@@ -1,6 +1,9 @@
 🤙 Nextcloud app / Custom menu 🎨
 ===============================
 
+[![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/)
+
 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.
 
@@ -15,12 +18,10 @@ 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)
 
-[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
-
 Requirements
 ------------
 
-* PHP >= 7.4
+* PHP >= 8.0
 * App `theming` enabled
 
 Installation and upgrade
@@ -46,12 +47,26 @@ Users can disable the menu using the page of personal settings.
 
 Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
 
+### Use first top menu app as default app
+
+You can easily let Custom Menu redirect to the first app in the top menu by changing the following parameter in your `config/config.php`:
+
+```
+'defaultapp' => 'side_menu',
+```
+
+If the top menu is empty then it redirects to files.
+
 How to contribute?
 ------------------
 
 You can report a bug or request a feature by opening an issue: https://gitnet.fr/deblan/side_menu/issues
 
-If you are a developer:
+### You are a translator
+
+Translations are managed from [translate.codeberg.org](https://translate.codeberg.org/projects/custom-menu/application/).
+
+### You are a developer
 
 * fork the repository
 * install an instance of Nextcloud
@@ -66,3 +81,10 @@ Support
 -------
 
 You can join the official room on Matrix: [#custommenu:neutralnetwork.org](https://matrix.to/#/#custommenu:neutralnetwork.org).
+
+
+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/).

appinfo/info.xml

@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
 
 Requirements:
 
-* PHP >= 7.4
+* PHP >= 8.0
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -25,8 +25,14 @@ If you like this application and if you want to support the development:
 * [Buy me a coffee](https://www.buymeacoffee.com/deblan)
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
+
+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.1.0</version>
+    <version>3.4.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

appinfo/routes.php

@@ -19,6 +19,7 @@
 
 return [
     'routes' => [
+        ['name' => 'App#index', 'url' => '/', 'verb' => 'GET'],
         ['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
         ['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
         ['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],

css/admin.css

@@ -73,7 +73,7 @@
 
 .side-menu-setting-list {
   margin: 10px 4px 4px 0px;
-  border: 1px solid var(--color-border-dark);
+  border: 2px solid var(--color-border-dark);
   border-radius: 15px;
 }
 
@@ -137,6 +137,10 @@
   padding-right: 20px;
 }
 
+.side-menu-setting-label--top {
+  vertical-align: top;
+}
+
 .side-menu-setting-form {
   display: table-cell;
   min-width: 300px;
@@ -163,4 +167,54 @@
   position: relative;
   top: -8px;
   left: 5px;
+  transition-duration: 0.8s;
+  transition-property: transform;
+  transform: rotate(360deg);
+}
+
+.btn-reset--down {
+  top: 2px;
+}
+
+.btn-reset--progress {
+  transform: rotate(-359deg);
+}
+
+.badges {
+  margin-bottom: 14px;
+  margin-top: 4px;
+}
+
+.badge {
+  border-size: 1px;
+  padding: 2px 8px;
+  margin-right: 2px;
+  margin-bottom: 5px;
+  display: inline-block;
+  border-radius: 4px;
+  font-size: 13px;
+}
+
+.badge-1 {
+  background: #d4ce14;
+  border-color: #cad413;
+  color: #373a05;
+}
+
+.badge-2 {
+  background: #96d47f;
+  border-color: #7ed49b;
+  color: #333;
+}
+
+.badge-3 {
+  background: #d4540a;
+  border-color: #d4700c;
+  color: #fff;
+}
+
+.badge-4 {
+  background: #9d81d4;
+  border-color: #c681d4;
+  color: #fff;
 }

css/sideMenu.css

@@ -39,6 +39,7 @@
 
 #header .side-menu-opener {
   margin-left: 0px;
+  margin-top: -1px;
 }
 
 .side-menu-settings {
@@ -197,7 +198,7 @@
 }
 
 .side-menu-categories {
-  max-height: calc(100vh - 5px);
+  max-height: calc(100vh - 55px);
   overflow: auto;
   position: relative;
   top: 5px;

lib/Controller/AppController.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OC;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+
+class AppController extends Controller
+{
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var AppRepository
+     */
+    protected $appRepository;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        AppRepository $appRepository,
+        IURLGenerator $urlGenerator,
+        ConfigProxy $config
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->appRepository = $appRepository;
+        $this->urlGenerator = $urlGenerator;
+        $this->config = $config;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function index(): RedirectResponse
+    {
+        $user = OC::$server[IUserSession::class]->getUser();
+        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
+        $isForced = $this->config->getAppValueBool('force', '0');
+        $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
+        $apps = $this->appRepository->getOrderedApps($user);
+
+        if (!$isForced && !empty($userTopMenuApps)) {
+            $topMenuApps = $userTopMenuApps;
+        }
+
+        foreach ($apps as $app) {
+            $inTopMenuApps = in_array($app['id'], $topMenuApps);
+            $inHiddenApps = in_array($app['id'], $hiddenApps);
+
+            if (!$inTopMenuApps || $inHiddenApps) {
+                continue;
+            }
+
+            return $this->redirectToApp($app['id']);
+        }
+
+        return $this->redirectToApp('files');
+    }
+
+    protected function redirectToApp($appId): RedirectResponse
+    {
+        $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false);
+        $isFrontControllerActive = 'true' === getenv('front_controller_active');
+
+        if ($isIgnoreFrontController || $isFrontControllerActive) {
+            $path = '/apps/%s/';
+        } else {
+            $path = '/index.php/apps/%s/';
+        }
+
+        $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId));
+
+        return new RedirectResponse($url);
+    }
+}

lib/Controller/JsController.php

@@ -100,10 +100,12 @@ class JsController extends Controller
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');
         $addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
+        $appsOrder = $this->config->getAppValueArray('apps-order', '[]');
         $avatar = null;
         $settings = null;
 
         if ($this->user) {
+            $userAppsOrder = $this->config->getUserValueArray($this->user, 'apps-order', '[]');
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
             $userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');
 
@@ -115,6 +117,10 @@ class JsController extends Controller
                 $topSideMenuApps = $userTopSideMenuApps;
             }
 
+            if (!empty($userAppsOrder) && !$isForced) {
+                $appsOrder = $userAppsOrder;
+            }
+
             $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
             $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
 
@@ -162,10 +168,10 @@ class JsController extends Controller
             'side-with-categories' => $this->config->getAppValueBool('side-with-categories', '0'),
             'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
             'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
+            'apps-order' => $appsOrder,
             'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
             'top-side-menu-apps' => $topSideMenuApps,
-            'top-menu-apps-order' => $topMenuAppsOrder,
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),

lib/Controller/NavController.php

@@ -93,11 +93,13 @@ class NavController extends Controller
             ]);
         }
 
-        $apps = $this->appRepository->getVisibleApps();
+        $apps = $this->appRepository->getOrderedApps($user);
         $categoriesLabels = $this->categoryRepository->getOrderedCategories();
         $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
         $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
+        $userTopSideMenuApps = $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
         $appsCategories = [];
         $categoriesAppsCount = [];
@@ -106,12 +108,16 @@ class NavController extends Controller
             $topMenuApps = $userTopMenuApps;
         }
 
-        foreach ($apps as $app) {
+        if (!$isForced && !empty($userTopSideMenuApps)) {
-            if (in_array($app['id'], $topMenuApps)) {
+            $topSideMenuApps = $userTopSideMenuApps;
-                continue;
+        }
-            }
 
-            if (in_array($app['id'], $hiddenApps)) {
+        foreach ($apps as $app) {
+            $inTopMenuApps = in_array($app['id'], $topMenuApps);
+            $inTopSideMenuApps = in_array($app['id'], $topSideMenuApps);
+            $inHiddenApps = in_array($app['id'], $hiddenApps);
+
+            if (($inTopMenuApps && !$inTopSideMenuApps) || $inHiddenApps) {
                 continue;
             }
 
@@ -178,10 +184,6 @@ class NavController extends Controller
         foreach ($items as $category => $value) {
             if (empty($items[$category]['apps'])) {
                 unset($items[$category]);
-            } else {
-                uasort($items[$category]['apps'], function ($a, $b) {
-                    return ($a['name'] < $b['name']) ? -1 : 1;
-                });
             }
         }
 

lib/Controller/PersonalSettingController.php

@@ -97,7 +97,7 @@ class PersonalSettingController extends Controller
             }
         }
 
-        if (in_array($name, ['top-menu-apps', 'top-side-menu-apps'])) {
+        if (in_array($name, ['top-menu-apps', 'top-side-menu-apps', 'apps-order'])) {
             $doSave = true;
             $data = json_decode($value, true);
 

lib/Service/AppRepository.php

@@ -2,6 +2,7 @@
 
 namespace OCA\SideMenu\Service;
 
+use OC\User\User;
 use OCP\L10N\IFactory;
 
 /**
@@ -36,8 +37,7 @@ class AppRepository
         IFactory $l10nFactory,
         ConfigProxy $config,
         CategoryRepository $categoryRepository
-    )
+    ) {
-    {
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;
         $this->config = $config;
@@ -62,7 +62,7 @@ class AppRepository
 
             foreach ([$app['id'], $app['id'].'_index'] as $id) {
                 if (isset($navigation[$id])) {
-                    $app['name'] = $this->l10nFactory->get($id)->t($app['name']);
+                    $app['name'] = $this->getAppName($app);
                     $app['href'] = $navigation[$id]['href'];
                     $app['icon'] = $navigation[$id]['icon'];
 
@@ -75,7 +75,7 @@ class AppRepository
             if ('external_index' === substr($app['id'], 0, 14)) {
                 $visibleApps[$app['id']] = [
                     'id' => $app['id'],
-                    'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
+                    'name' => $this->getAppName($app),
                     'href' => $app['href'],
                     'icon' => $app['icon'],
                     'category' => [
@@ -85,7 +85,7 @@ class AppRepository
             } elseif ('files' === $app['id']) {
                 $visibleApps[$app['id']] = [
                     'id' => $app['id'],
-                    'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
+                    'name' => $this->getAppName($app),
                     'href' => $app['href'],
                     'icon' => $app['icon'],
                     'category' => [],
@@ -99,23 +99,36 @@ class AppRepository
             }
         }
 
-        usort($visibleApps, function ($a, $b) {
-            return ($a['name'] < $b['name']) ? -1 : 1;
-        });
-
         return $visibleApps;
     }
 
-    public function getTopMenuOrderedApps()
+    public function getAppName($app)
+    {
+        return $this->config->getAppValue(
+            'app.navigation.name',
+            $this->l10nFactory->get($app['id'])->t($app['name']),
+            $app['id']
+        );
+    }
+
+    public function getOrderedApps(?User $user = null)
     {
         $apps = $this->getVisibleApps();
-        $orders = $this->config->getAppValueArray('top-menu-apps-order', '[]');
+        $orders = $this->config->getAppValueArray('apps-order', '[]');
+
+        if (null !== $user && !$this->config->getAppValueBool('force', '0')) {
+            $userOrders = $this->config->getUserValueArray($user, 'apps-order', '[]');
+
+            if (!empty($userOrders)) {
+                $orders = $userOrders;
+            }
+        }
 
         usort($apps, function ($a, $b) use ($orders) {
             $ak = array_keys($orders, $a['id'])[0] ?? null;
             $bk = array_keys($orders, $b['id'])[0] ?? null;
 
-            if ($ak === null || $bk === null) {
+            if (null === $ak || null === $bk) {
                 return ($a['name'] < $b['name']) ? -1 : 1;
             }
 

lib/Settings/Admin.php

@@ -159,11 +159,11 @@ 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-apps-order' => $this->config->getAppValueArray('top-menu-apps-order', '[]'),
+            'apps-order' => $this->config->getAppValueArray('apps-order', '[]'),
+            'ordered-apps' => $this->appRepository->getOrderedApps(),
             'top-side-menu-apps' => $this->config->getAppValueArray('top-side-menu-apps', '[]'),
             'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
             'apps' => $this->appRepository->getVisibleApps(),
-            'top-menu-ordered-apps' => $this->appRepository->getTopMenuOrderedApps(),
             'apps-categories-custom' => $this->config->getAppValueArray('apps-categories-custom', '[]'),
             'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
             'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),

lib/Settings/Personal.php

@@ -81,7 +81,9 @@ class Personal implements ISettings
             'top-side-menu-apps' => $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]'),
             'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
             'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),
+            'apps-order' => $this->config->getUserValueArray($user, 'apps-order', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
+            'ordered-apps' => $this->appRepository->getOrderedApps($user),
         ];
 
         return new TemplateResponse(Application::APP_ID, 'settings/personal-form', $parameters, '');

src/AdminCategoriesCustom.vue

@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
   <div>
-    <ul class="side-menu-setting-list">
+    <ul class="side-menu-setting-list" :class="{hide: values.length === 0}">
       <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
         <span v-text="item.en"></span>
       </li>
@@ -77,6 +77,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 }
 </style>
 
+<style scoped>
+.hide {
+  display: none;
+}
+</style>
+
 <script>
 import NcModal from '@nextcloud/vue/dist/Components/NcModal'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions'

src/AppMenu.vue

@@ -33,6 +33,7 @@
         <a :href="app.href"
           :class="{ 'has-unread': app.unread > 0 }"
           :aria-label="appLabel(app)"
+          :target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
           :aria-current="app.active ? 'page' : false">
           <img :src="app.icon" alt="">
           <div class="app-menu-entry--label">
@@ -75,6 +76,7 @@ export default {
       apps: null,
       appLimit: 0,
       observer: null,
+      targetBlankApps: [],
     }
   },
   mounted() {
@@ -82,7 +84,7 @@ export default {
     this.apps = {}
     let orders = {}
 
-    Array.from(window.topMenuAppsOrder).forEach((app, order) => {
+    window.menuAppsOrder.forEach((app, order) => {
       orders[app] = order + 1
     })
 
@@ -93,6 +95,7 @@ export default {
       }
     })
 
+    this.targetBlankApps = window.targetBlankApps
     this.observer = new ResizeObserver(this.resize)
     this.observer.observe(this.$el)
     this.resize()

src/SideMenu.vue

@@ -86,7 +86,7 @@ export default {
       let orders = {}
       let finalApps = []
 
-      Array.from(window.topMenuAppsOrder).forEach((app, order) => {
+      window.menuAppsOrder.forEach((app, order) => {
         orders[app] = order + 1
       })
 

src/SideMenuBig.vue

@@ -60,6 +60,7 @@ import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
 import SideMenuBigApp from './SideMenuBigApp'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
   name: 'SideMenuBig',
@@ -100,8 +101,13 @@ export default {
     },
 
     retrieveActiveApp() {
-      let activeAppLink = document.querySelector('#appmenu a.active')
+      const ncApps = loadState('core', 'apps', {})
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+
+      for (let id in ncApps) {
+        if (ncApps[id].active) {
+          this.activeApp = id
+        }
+      }
     },
 
     retrieveConfig() {

src/SideMenuWithCategories.vue

@@ -54,17 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
-import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
 import SideMenuBigApp from './SideMenuBigApp'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
   name: 'SideMenuWithCategories',
   components: {
     SettingsButton,
     OpenerButton,
-    CloserButton,
     Loader,
     SideMenuBigApp,
   },
@@ -98,8 +97,13 @@ export default {
     },
 
     retrieveActiveApp() {
-      let activeAppLink = document.querySelector('#appmenu a.active')
+      const ncApps = loadState('core', 'apps', {})
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+
+      for (let id in ncApps) {
+        if (ncApps[id].active) {
+          this.activeApp = id
+        }
+      }
     },
 
     retrieveConfig() {

src/admin.js

@@ -159,9 +159,15 @@ document.addEventListener('DOMContentLoaded', () => {
       const target = event.target
       const values = JSON.parse(target.getAttribute('data-reset'))
 
+      target.classList.toggle('btn-reset--progress', true)
+
       for (let i in values) {
         document.querySelector(`#${i}`).value = values[i]
       }
+
+      window.setTimeout(() => {
+        target.classList.toggle('btn-reset--progress', false)
+      }, 800)
     })
   }
 
@@ -249,7 +255,6 @@ document.addEventListener('DOMContentLoaded', () => {
       let value = []
 
       for (let item of document.querySelectorAll('#categories-list .side-menu-setting-list-item')) {
-        console.log(item.getAttribute('data-id'))
         value.push(item.getAttribute('data-id'))
       }
 
@@ -258,20 +263,19 @@ document.addEventListener('DOMContentLoaded', () => {
   } catch (e) {
   }
 
-  sortable('#top-menu-apps-order-list .side-menu-setting-list', {
+  sortable('#apps-order-list .side-menu-setting-list', {
     placeholderClass: 'side-menu-setting-list-drop'
   })
 
   try {
-    sortable('#top-menu-apps-order-list .side-menu-setting-list')[0].addEventListener('sortstop', (e) => {
+    sortable('#apps-order-list .side-menu-setting-list')[0].addEventListener('sortstop', (e) => {
       let value = []
 
-      for (let item of document.querySelectorAll('#top-menu-apps-order-list .side-menu-setting-list-item')) {
+      for (let item of document.querySelectorAll('#apps-order-list .side-menu-setting-list-item')) {
-        console.log(item.getAttribute('data-id'))
         value.push(item.getAttribute('data-id'))
       }
 
-      document.querySelector('input[name="top-menu-apps-order"]').value = JSON.stringify(value)
+      document.querySelector('input[name="apps-order"]').value = JSON.stringify(value)
     })
   } catch (e) {
   }

src/l10n/fixtures/cs.yaml

@@ -3,7 +3,8 @@
 "No": "Ne"
 "Yes": "Ano"
 "Menu": "Nabídka"
-'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.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</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.'
+: 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
 "Top menu": "Horní nabídka"
 "Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
 "If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
@@ -38,15 +39,13 @@
 "Show only the opener (hidden logo)": "Zobrazovat pouze otevírací tlačítko (logo skryto)"
 "Do not display the side menu and the opener if there is no application (eg: public pages).": "Nezobrazovat postranní nabídku a její otevírací tlačítko pokud nejsou dostupné žádné aplikace (např. na veřejných stránkách)."
 "Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)."
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)"
 "Display the big menu": "Zobrazit velkou nabídku"
 "Display the logo": "Zobrazit logo"
-"This feature is not compatible with the <code>big menu</code> display.": "Tato funkce není kompatibilní se zobrazením <code>velké nabídky</code>."
 "Icons and texts": "Ikony a texty"
 "Loader enabled": "Načítání zapnuto"
 "Tips": "Tipy"
 "Always displayed": "Vždy zobrazeno"
-"The logo will be hidden when the menu is always displayed.": "Pokud je nabídka zobrazena trvale, logo bude skryto."
 "This is the automatic behavior when the menu is always displayed.": "Toto je automatické chování, kdy je nabídka vždy zobrazena."
 "Not compatible with touch screens.": "Nekompatibilní s dotykovými obrazovkami."
 "Big menu": "Velká nabídka"
@@ -64,7 +63,7 @@
 "The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
 "Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno."
 "Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny"
-"This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</ code>."
+"This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</code>."
 "The logo is a link to the default app": "Logo je odkaz na výchozí aplikaci"
 "Others": "Ostatní"
 "Categories": "Kategorie"
@@ -78,8 +77,6 @@
 "With categories": "S kategoriemi"
 "Custom categories": "Vlastní kategorie"
 "Customize application categories": "Přizpůsobte kategorie aplikací"
-"Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
-"Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"
 "Reset to default": "Vrátit zpět na výchozí hodnoty"
 "Hidden icon": "Skrytá ikona"
 "Small icon": "Malá ikona"
@@ -89,5 +86,7 @@
 "Small text": "Malý text"
 "Normal text": "Normální text"
 "Big text": "Velký text"
-"Applications": "Applications"
+"Applications": "Aplikace"
-"This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays.": "This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays."
+"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ě."

src/l10n/fixtures/de.yaml

@@ -3,13 +3,21 @@
 "No": "Nein"
 "Yes": "Ja"
 "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.': '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.'
+? '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": "Anwendungen, die nicht ins Seitenmenü\
-"If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
+  \ 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 Anwendung und möchtest\
+  \ mich unterstützen?"
 "Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
 "Hidden": "Ausblenden"
 "Small": "Klein"
@@ -36,18 +44,21 @@
 "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 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 das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)."
+"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"
-"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit dem <code>großen Menü</code> kompatibel."
 "Icons and texts": "Symbole und Texte"
 "Loader enabled": "Ladestandanzeige aktiviert"
 "Tips": "Tipps"
 "Always displayed": "Immer anzeigen"
-"The logo will be hidden when the menu is always displayed.": "Das Logo wird ausgeblendet, wenn das Menü immer angezeigt wird."
+"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"
@@ -56,15 +67,20 @@
 "Use my selection": "Verwende meine Auswahl"
 "Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
 "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 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 aktiviert"
+"The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer\
-"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
+  \ aktiviert"
-"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt werden sollen"
+"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen\
-"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
+  \ wird."
+"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"
@@ -73,13 +89,13 @@
 "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 Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code> angewendet."
+"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."
 "Dark mode colors": "Farben für den dunklen Modus"
 "With categories": "Mit Kategorien"
 "Custom categories": "Benutzerdefinierte Kategorien"
 "Customize application categories": "Anwendungskategorien anpassen"
-"Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar "
-"Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar"
 "Reset to default": "Auf Standard zurücksetzen"
 "Hidden icon": "Verstecktes Symbol"
 "Small icon": "Kleines Symbol"
@@ -90,4 +106,8 @@
 "Normal text": "Normaler Text"
 "Big text": "Großer Text"
 "Applications": "Applications"
-"This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays.": "This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays."
+"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."

src/l10n/fixtures/fr.yaml

@@ -3,10 +3,11 @@
 "No": "Non"
 "Yes": "Oui"
 "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.': 'Utiliser le raccourcis clavier <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> pour ouvrir et fermer le menu latéral. Utiliser <span class="keyboard-key">tab</span> pour naviguer.'
+? '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.'
+: 'Utiliser le raccourcis clavier <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> pour ouvrir et fermer le menu latéral. Utiliser <span class="keyboard-key">tab</span> pour naviguer.'
 "Top menu": "Menu supérieur"
 "Apps that not must be moved in the side menu": "Les applications qui ne doivent pas être affichées dans le menu latéral"
-"If there is no selection then the global configuration is applied.": "Si il n'y a aucune sélection alors la configuration globale sera appliquée"
+"If there is no selection then the global configuration is applied.": "Si il n'y a aucune sélection alors la configuration globale sera appliquée."
 "Experimental": "Expérimental"
 "Save": "Sauvegarder"
 "You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?"
@@ -49,12 +50,10 @@
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Ouvrir le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)"
 "Display the big menu": "Afficher le menu large"
 "Display the logo": "Afficher le logo"
-"This feature is not compatible with the <code>big menu</code> display.": "Cette fonctionnalité n'est pas compatible avec l'affichage <code>Menu large</code>."
 "Icons and texts": "Icônes et textes"
 "Loader enabled": "Activation de l'indicateur de chargement"
 "Tips": "Astuces"
 "Always displayed": "Toujours affiché"
-"The logo will be hidden when the menu is always displayed.": "Le logo sera masque si le menu est toujours affiché."
 "This is the automatic behavior when the menu is always displayed.": "C'est le comportement automatique lorsque le menu est toujours affiché."
 "Not compatible with touch screens.": "Incompatible avec les écrans tactiles."
 "Big menu": "Menu large"
@@ -86,8 +85,8 @@
 "With categories": "Avec les catégories"
 "Custom categories": "Catégories personnalisées"
 "Customize application categories": "Personnaliser les catégories des applications"
-"Apps only visible in the top menu": "Applications visibles uniquement dans le menu supérieur"
-"Apps visible in the top and side menus": "Applications visibles dans le menus supérieur et latéral"
 "Reset to default": "Restaurer les valeurs par défaut"
 "Applications": "Applications"
-"This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays.": "Cette fonctionnalité n'est pas compatible avec les affichages <code>Menu large</code> et <code>Avec les catégories</code>"
+"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."

src/l10n/fixtures/nl.yaml

@@ -0,0 +1,92 @@
+"Custom menu": "Aangepast menu"
+"Enable the custom menu": "Het aangepaste menu inschakelen"
+"No": "Nee"
+"Yes": "Ja"
+"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.'
+: 'Gebruik de snelkoppeling <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> om het zijmenu te openen en te verbergen. Gebruik <span class="keyboard-key">tab</span> om te navigeren.'
+"Top menu": "Bovenste menu"
+"Apps that not must be moved in the side menu": "Apps die niet moeten worden verplaatst in het zijmenu"
+"If there is no selection then the global configuration is applied.": "Als er geen keuze is, wordt de globale configuratie toegepast."
+"Experimental": "Experimenteel"
+"Save": "Opslaan"
+"You like this app and you want to support me?": "Vind je deze app leuk en wil je me steunen?"
+"Buy me a coffee ☕": "Koop een koffie voor me ☕"
+"Hidden": "Verborgen"
+"Small": "Klein"
+"Normal": "Normaal"
+"Big": "Groot"
+"Hidden icon": "Verborgen icoon"
+"Small icon": "Klein icoon"
+"Normal icon": "Normaal icoon"
+"Big icon": "Groot icoon"
+"Hidden text": "Verborgen tekst"
+"Small text": "Kleine tekst"
+"Normal text": "Normale tekst"
+"Big text": "Grote tekst"
+"Colors": "Kleuren"
+"Background color": "Achtergrond kleur"
+"Background color of current app": "Achtergrondkleur van huidige app"
+"Text color": "Tekst kleur"
+"Loader": "Lader"
+"Icon": "Icoon"
+"Same color": "Zelfde kleur"
+"Opposite color": "Tegenovergestelde kleur"
+"Transparent": "Transparant"
+"Opaque": "Ondoorzichtig"
+"Opener": "Opener"
+"Default": "Standaard"
+"Default (dark)": "Standaard (donker)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (donker)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (donker)"
+"Before the logo": "Voor het logo"
+"After the logo": "Na het logo"
+"Position": "Positie"
+"Show only the opener (hidden logo)": "Toon alleen de opener (verborgen logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Geef het zijmenu en de opener niet weer als er geen toepassing is (bijv. openbare pagina's)."
+"Panel": "Paneel"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open het menu wanneer de muis over de opener gaat (automatisch uitgeschakeld op aanraakschermen)"
+"Display the big menu": "Toon het grote menu"
+"Display the logo": "Toon het logo"
+"Icons and texts": "Iconen en teksten"
+"Loader enabled": "Lader ingeschakeld"
+"Tips": "Tips"
+"Always displayed": "Altijd weergegeven"
+"This is the automatic behavior when the menu is always displayed.": "Dit is het automatische gedrag wanneer het menu altijd wordt weergegeven."
+"Not compatible with touch screens.": "Niet compatibel met aanraakschermen."
+"Big menu": "Groot menu"
+"Live preview": "Live voorbeeld"
+"Open apps in new tab": "Open apps in nieuwe tab"
+"Use the global setting": "Gebruik de globale instellingen"
+"Use my selection": "Gebruik mijn selectie"
+"Show and hide the list of applications": "De lijst met toepassingen tonen en verbergen"
+"Use the avatar instead of the logo": "Gebruik avatar in plaats van het logo"
+"You do not have permission to change the settings.": "Je hebt geen toestemming om de instellingen te veranderen."
+"Force this configuration to users": "Forceer deze configuratie aan gebruikers"
+"Export the configuration": "Exporteer de configuratie"
+"Purge the cache": "De cache wissen"
+"Show the link to settings": "Toon de link naar de instellingen"
+"The menu is enabled by default for users": "Het menu is standaard ingeschakeld voor gebruikers"
+"Except when the configuration is forced.": "Behalve als de configuratie geforceerd is."
+"Apps that should not be displayed in the menu": "Apps die niet in het menu weergegeven mogen worden"
+"This feature is only compatible with the <code>big menu</code> display.": "Deze functie is alleen compatibel met het <code>grote menu</code> scherm."
+"The logo is a link to the default app": "Het logo is een link naar de standaard app"
+"Others": "Overige"
+"Categories": "Categorieën"
+"Customize sorting": "Sortering aanpassen"
+"Order by": "Sorteer op"
+"Name": "Naam"
+"Customed": "Aangepast"
+"Show and hide the list of categories": "De lijst met categorieën tonen en verbergen"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Deze parameters worden gebruikt wanneer Dark theme of Breeze Dark Theme zijn ingeschakeld."
+"Dark mode colors": "Donkere modus kleuren"
+"With categories": "Met categorieën"
+"Custom categories": "Aangepaste categorieën"
+"Customize application categories": "Toepassingscategorieën aanpassen"
+"Reset to default": "Terugzetten naar standaard"
+"Applications": "Applicaties"
+"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."

src/l10n/fixtures/ru.yaml

@@ -0,0 +1,92 @@
+"Custom menu": "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.'
+: 'Используйте сочетание клавиш <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."
+"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": "Opposite color"
+"Transparent": "Прозрачный"
+"Opaque": "Opaque"
+"Opener": "Opener"
+"Default": "По-умолчанию"
+"Default (dark)": "По-умолчанию (тёмный)"
+"Hamburger": "Гамбургер"
+"Hamburger (dark)": "Гамбургер (тёмный)"
+"Hamburger 2": "Гамбургер 2"
+"Hamburger 2 (dark)": "Гамбургер 2 (тёмный)"
+"Before the logo": "Перед логотипом"
+"After the logo": "После логотипа"
+"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": "Панеот"
+"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": "Показать лого"
+"Icons and texts": "Иконки и текст"
+"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.": "Не совместимо с сенсорными экранами"
+"Big menu": "Большое меню"
+"Live preview": "Live preview"
+"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": "Показать или скрыть список приложений"
+"Use the avatar instead of the logo": "Использовать аватар вместо логотипа"
+"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"
+"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": "Прочие"
+"Categories": "Категории"
+"Customize sorting": "Настроить сортировку"
+"Order by": "В порядке"
+"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."
+"Dark mode colors": "Цвета тёмной темы"
+"With categories": "С категориями"
+"Custom categories": "Custom categories"
+"Customize application categories": "Customize application categories"
+"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."

src/l10n/fixtures/tpl/base.yaml

@@ -0,0 +1,94 @@
+"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.": ""

src/l10n/fixtures/zh_CN.yaml

@@ -3,7 +3,11 @@
 "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.": "使用快捷键 <span class=\"keyboard-key\">Ctrl<\/span>+<span class=\"keyboard-key\">o<\/span> 打开或隐藏侧边栏菜单。使用<span class=\"keyboard-key\">tab<\/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."
+: "使用快捷键 <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.": "如不选择，将应用全局设定。"
@@ -36,17 +40,17 @@
 "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"
-"This feature is not compatible with the <code>big menu<\/code> display.": "此功能与显示<code>大型菜单<\/code>不兼容。"
 "Icons and texts": "图标与文字"
 "Loader enabled": "菜单指示器已激活"
 "Tips": "技巧"
 "Always displayed": "一直显示"
-"The logo will be hidden when the menu is always displayed.": "一直显示菜单时logo将被隐藏。"
 "This is the automatic behavior when the menu is always displayed.": "一直显示菜单时的自动动作。"
 "Not compatible with touch screens.": "与触屏不兼容。"
 "Big menu": "大型菜单"
@@ -64,7 +68,7 @@
 "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.": "此功能只和<code>大型菜单<\/code>兼容。"
+"This feature is only compatible with the <code>big menu</code> display.": "此功能只和<code>大型菜单</code>兼容。"
 "The logo is a link to the default app": "logo链接到默认应用"
 "Others": "其他"
 "Categories": "类别"
@@ -78,8 +82,6 @@
 "With categories": "有类别"
 "Custom categories": "自定义类别"
 "Customize application categories": "自定义应用程序类别"
-"Apps only visible in the top menu": "应用程序仅在顶部菜单中可见"
-"Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序"
 "Reset to default": "重置为默认设置"
 "Hidden icon": "隐藏图标"
 "Small icon": "小图标"
@@ -90,4 +92,8 @@
 "Normal text": "普通文本"
 "Big text": "大文本"
 "Applications": "Applications"
-"This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays.": "This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays."
+"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."

templates/js/script.php

@@ -22,11 +22,11 @@ if ($_['always-displayed']) {
   const nextcloud = document.querySelector('#nextcloud')
 
   const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
-  const targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>
 
+  window.targetBlankApps = <?php echo json_encode($_['target-blank-apps']), "\n" ?>
   window.topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
-  window.topMenuAppsOrder = <?php echo json_encode($_['top-menu-apps-order']), "\n"; ?>
+  window.topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']), "\n"; ?>
-  window.topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']); ?>
+  window.menuAppsOrder = <?php echo json_encode($_['apps-order']), "\n"; ?>
 
   <?php if ($display === 'big-menu'): ?>
     sideMenu.setAttribute('data-bigmenu', '1')

templates/settings/admin-form.php

@@ -41,8 +41,104 @@ $choicesSizes = [
 
 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
+
 ?>
 <div id="side-menu-section">
+
+    <div class="section">
+        <h2>
+            <?php p($l->t('Panel')); ?>
+        </h2>
+
+        <?php
+            $displays = [
+                'default' => !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'],
+                'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'],
+            ];
+        ?>
+
+        <div>
+            <label>
+                <?php p($l->t('Default')); ?>
+            </label>
+        </div>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['default'] ? 'is-active' : '' ?>"
+                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')); ?>">
+        </p>
+
+        <div>
+            <label>
+                <?php p($l->t('With categories')); ?>
+            </label>
+        </div>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
+                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')); ?>">
+        </p>
+
+        <div>
+            <label for="side-menu-opener">
+                <?php p($l->t('Big menu')); ?>
+            </label>
+        </div>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
+                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')); ?>">
+        </p>
+
+        <div>
+            <label for="side-menu-opener">
+                <?php p($l->t('Always displayed')); ?>
+            </label>
+        </div>
+        <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['always-displayed'] ? 'is-active' : '' ?>"
+                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')); ?>">
+        </p>
+
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="always-displayed"
+            id="side-menu-always-displayed"
+            value="<?php echo (int) $_['always-displayed'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="big-menu"
+            id="side-menu-big-menu"
+            value="<?php echo (int) $_['big-menu'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="side-with-categories"
+            id="side-menu-side-with-categories"
+            value="<?php echo (int) $_['side-with-categories'] ?>"
+        >
+    </div>
+
     <div class="section">
         <h2>
             <?php p($l->t('Colors')); ?>
@@ -50,6 +146,13 @@ $labelReset = 'Reset to default';
             <small><span class="info"><?php p($l->t('Live preview')); ?></span></small>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+        </div>
+
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label side-menu-setting-label-short">
@@ -234,6 +337,13 @@ $labelReset = 'Reset to default';
             <?php p($l->t('Dark mode colors')); ?>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+        </div>
+
         <p>
             <?php echo $l->t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.'); ?>
         </p>
@@ -422,6 +532,13 @@ $labelReset = 'Reset to default';
             <?php p($l->t('Opener')); ?>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+        </div>
+
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <?php
@@ -473,105 +590,7 @@ $labelReset = 'Reset to default';
                     </select>
                 </div>
             </div>
-        </div>
-    </div>
 
-    <div class="section">
-        <h2>
-            <?php p($l->t('Panel')); ?>
-        </h2>
-
-        <?php
-            $displays = [
-                'default' => !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
-                'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
-                'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'],
-                'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'],
-            ];
-        ?>
-
-        <div>
-            <label>
-                <?php p($l->t('Default')); ?>
-            </label>
-        </div>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['default'] ? 'is-active' : '' ?>"
-                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')); ?>">
-        </p>
-
-        <div>
-            <label>
-                <?php p($l->t('With categories')); ?>
-            </label>
-        </div>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
-                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')); ?>">
-        </p>
-
-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t('Big menu')); ?>
-            </label>
-        </div>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
-                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')); ?>">
-        </p>
-
-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t('Always displayed')); ?>
-            </label>
-        </div>
-        <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['always-displayed'] ? 'is-active' : '' ?>"
-                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')); ?>">
-        </p>
-
-        <input
-            type="hidden"
-            class="side-menu-setting"
-            name="always-displayed"
-            id="side-menu-always-displayed"
-            value="<?php echo (int) $_['always-displayed'] ?>"
-        >
-        <input
-            type="hidden"
-            class="side-menu-setting"
-            name="big-menu"
-            id="side-menu-big-menu"
-            value="<?php echo (int) $_['big-menu'] ?>"
-        >
-        <input
-            type="hidden"
-            class="side-menu-setting"
-            name="side-with-categories"
-            id="side-menu-side-with-categories"
-            value="<?php echo (int) $_['side-with-categories'] ?>"
-        >
-        <br>
-
-
-        <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
@@ -589,16 +608,18 @@ $labelReset = 'Reset to default';
                     </select>
                 </div>
             </div>
+        </div>
+    </div>
 
+    <div class="section">
+        <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Display the logo')); ?>
-                    <br>
+
-                    <em>
+                    <div class="badges">
-                        <?php echo $l->t('This feature is not compatible with the <code>big menu</code> display.'); ?>
+                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-                        <br>
+                    </div>
-                        <?php p($l->t('The logo will be hidden when the menu is always displayed.')); ?>
-                    </em>
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
@@ -614,6 +635,10 @@ $labelReset = 'Reset to default';
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?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>
+                    </div>
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting">
@@ -629,6 +654,10 @@ $labelReset = 'Reset to default';
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?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>
+                    </div>
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-add-logo-link" name="add-logo-link" class="side-menu-setting">
@@ -644,8 +673,11 @@ $labelReset = 'Reset to default';
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Apps that should not be displayed in the menu')); ?>
-                    <br>
+
-                    <em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em>
+                    <div class="badges">
+                        <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+                        <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+                    </div>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
@@ -765,10 +797,17 @@ $labelReset = 'Reset to default';
             <?php p($l->t('Top menu')); ?>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+        </div>
+
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
-                    <?php p($l->t('Apps only visible in the top menu')); ?>
+                    <?php p($l->t('Applications kept in the top menu')); ?>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
@@ -799,7 +838,9 @@ $labelReset = 'Reset to default';
 
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
-                    <?php p($l->t('Apps visible in the top and side menus')); ?>
+                    <?php p($l->t('Applications kept in the top menu but also shown in side menu')); ?>
+                    <br>
+                    <em><?php p($l->t('These applications must be selected in the previous option.')); ?></em>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
@@ -835,23 +876,30 @@ $labelReset = 'Reset to default';
             <?php p($l->t('Applications')); ?>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+        </div>
+
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Customize sorting')); ?>
-                    <br>
-                    <em>
-                        <?php echo $l->t('This feature is not compatible with <code>big menu</code> and <code>with categories</code> displays.'); ?>
-                    </em>
                 </div>
                 <div class="side-menu-setting-form">
-                    <a class="side-menu-toggler" data-target="#top-menu-apps-order-list" href="#_">
+                    <a class="side-menu-toggler" data-target="#apps-order-list" href="#_">
                         🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
-                    <div id="top-menu-apps-order-list" style="display: none">
+                    <div class="theme-undo icon icon-history btn-reset btn-reset--down" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-apps-order' => [],
+                    ])) ?>"></div>
+
+                    <div id="apps-order-list" style="display: none">
                         <ul class="side-menu-setting-list">
-                            <?php foreach ($_['top-menu-ordered-apps'] as $key => $app): ?>
+                            <?php foreach ($_['ordered-apps'] as $key => $app): ?>
                                 <li data-id="<?php echo $app['id']; ?>" class="side-menu-setting-list-item">
                                     <span class="arrow">
                                         ⇅
@@ -863,7 +911,7 @@ $labelReset = 'Reset to default';
                         </ul>
                     </div>
 
-                    <input type="hidden" value='<?php echo json_encode(array_keys($_['top-menu-apps-order'])) ?>' name="top-menu-apps-order" class="side-menu-setting">
+                    <input type="hidden" value='<?php echo json_encode($_['apps-order']) ?>' name="apps-order" class="side-menu-setting" id="side-menu-apps-order">
                 </div>
             </div>
         </div>
@@ -875,6 +923,11 @@ $labelReset = 'Reset to default';
             <?php p($l->t('Categories')); ?>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+        </div>
+
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <?php
@@ -898,7 +951,7 @@ $labelReset = 'Reset to default';
             </div>
 
             <div class="side-menu-setting-row">
-                <div class="side-menu-setting-label">
+                <div class="side-menu-setting-label side-menu-setting-label--top">
                     <?php p($l->t('Custom categories')); ?>
                 </div>
                 <div class="side-menu-setting-form">
@@ -985,6 +1038,13 @@ $labelReset = 'Reset to default';
             <?php p($l->t('Tips')); ?>
         </h2>
 
+        <div class="badges">
+            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
+            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+        </div>
+
         <p>
             <em><?php echo $l->t('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.'); ?></em>
         </p>

templates/settings/personal-form.php

@@ -27,6 +27,7 @@ $choicesYesNo = [
 
 
 $labelShowHideApps = 'Show and hide the list of applications';
+$labelReset = 'Reset to default';
 ?>
 <div id="side-menu-section">
     <?php if ($_['force']): ?>
@@ -41,10 +42,6 @@ $labelShowHideApps = 'Show and hide the list of applications';
         </div>
     <?php else: ?>
         <div class="section">
-            <h2>
-                <?php p($l->t('Menu')); ?>
-            </h2>
-
             <p>
                 <em><?php echo $l->t('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.'); ?></em>
             </p>
@@ -123,7 +120,7 @@ $labelShowHideApps = 'Show and hide the list of applications';
             <div class="side-menu-setting-table">
                 <div class="side-menu-setting-row">
                     <div class="side-menu-setting-label">
-                        <?php p($l->t('Apps only visible in the top menu')); ?>
+                        <?php p($l->t('Applications kept in the top menu')); ?>
                         <p>
                             <em>
                                 <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
@@ -163,9 +160,10 @@ $labelShowHideApps = 'Show and hide the list of applications';
             <div class="side-menu-setting-table">
                 <div class="side-menu-setting-row">
                     <div class="side-menu-setting-label">
-                        <?php p($l->t('Apps visible in the top and side menus')); ?>
+                        <?php p($l->t('Applications kept in the top menu but also shown in side menu')); ?>
                         <p>
                             <em>
+                                <?php p($l->t('These applications must be selected in the previous option.')); ?><br>
                                 <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
                             </em>
                         </p>
@@ -200,6 +198,44 @@ $labelShowHideApps = 'Show and hide the list of applications';
                 </div>
             </div>
         </div>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Applications')); ?>
+            </h2>
+
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Customize sorting')); ?>
+                    </div>
+                    <div class="side-menu-setting-form">
+                        <a class="side-menu-toggler" data-target="#apps-order-list" href="#_">
+                            🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                        </a>
+
+                        <div class="theme-undo icon icon-history btn-reset btn-reset--down" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                            'side-menu-apps-order' => '[]',
+                        ])) ?>"></div>
+
+                        <div id="apps-order-list" style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['ordered-apps'] as $key => $app): ?>
+                                    <li data-id="<?php echo $app['id']; ?>" class="side-menu-setting-list-item">
+                                        <span class="arrow">
+                                            ⇅
+                                        </span>
+
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+
+                        <input type="hidden" value='<?php echo json_encode($_['apps-order']) ?>' name="apps-order" class="side-menu-setting" id="side-menu-apps-order" data-personal>
+                    </div>
+                </div>
+            </div>
+        </div>
     <?php endif ?>
 
     <div class="section">