Merge pull request 'release v3.2.1' (#157) from develop into master

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

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## 3.2.1
+### Fixed
+* fix #150: Active app is not visible has active in menu (except in default menu)
+* fix #150: 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,8 +18,6 @@ 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
 ------------
 
@@ -51,7 +52,11 @@ 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 +71,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

@@ -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.2.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

css/admin.css

@@ -163,4 +163,15 @@
   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);
 }

css/sideMenu.css

@@ -39,6 +39,7 @@
 
 #header .side-menu-opener {
   margin-left: 0px;
+  margin-top: -1px;
 }
 
 .side-menu-settings {

lib/Controller/JsController.php

@@ -162,10 +162,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' => $this->config->getAppValueArray('apps-order', '[]'),
             '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,7 +93,7 @@ class NavController extends Controller
             ]);
         }
 
-        $apps = $this->appRepository->getVisibleApps();
+        $apps = $this->appRepository->getOrderedApps();
         $categoriesLabels = $this->categoryRepository->getOrderedCategories();
         $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
         $isForced = $this->config->getAppValueBool('force', '0');
@@ -178,10 +178,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/Service/AppRepository.php

@@ -36,8 +36,7 @@ class AppRepository
         IFactory $l10nFactory,
         ConfigProxy $config,
         CategoryRepository $categoryRepository
-    )
-    {
+    ) {
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;
         $this->config = $config;
@@ -62,7 +61,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 +74,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 +84,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 +98,28 @@ 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()
     {
         $apps = $this->getVisibleApps();
-        $orders = $this->config->getAppValueArray('top-menu-apps-order', '[]');
+        $orders = $this->config->getAppValueArray('apps-order', '[]');
 
         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', '[]'),

src/AppMenu.vue

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

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')
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+      const ncApps = loadState('core', 'apps', {})
+
+      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')
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+      const ncApps = loadState('core', 'apps', {})
+
+      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')) {
-        console.log(item.getAttribute('data-id'))
+      for (let item of document.querySelectorAll('#apps-order-list .side-menu-setting-list-item')) {
         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,13 +3,21 @@
 "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í."
+"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í."
 "Experimental": "Experimentální"
 "Save": "Uložit"
-"You like this app and you want to support me?": "Líbí se vám tato aplikace a chcete podpořit její vývoj?"
+"You like this app and you want to support me?": "Líbí se vám tato aplikace a chcete\
+  \ podpořit její vývoj?"
 "Buy me a coffee ☕": "Kupte mi kafe ☕"
 "Hidden": "Skryté"
 "Small": "Malé"
@@ -36,18 +44,25 @@
 "After the logo": "Za logem"
 "Position": "Pozice"
 "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)."
+"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>."
+"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."
+"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"
 "Live preview": "Živý náhled"
@@ -61,10 +76,13 @@
 "Export the configuration": "Exportovat nastavení"
 "Purge the cache": "Vyprázdnit mezipaměť"
 "Show the link to settings": "Zobrazit odkaz na nastavení"
-"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
+"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>."
+"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>."
 "The logo is a link to the default app": "Logo je odkaz na výchozí aplikaci"
 "Others": "Ostatní"
 "Categories": "Kategorie"
@@ -73,12 +91,13 @@
 "Name": "Název"
 "Customed": "Přizpůsobeno"
 "Show and hide the list of categories": "Zobrazit/skrýt seznam kategorií"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu."
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto\
+  \ parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu."
 "Dark mode colors": "Barvy tmavého režimu"
 "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 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"
@@ -90,4 +109,3 @@
 "Normal text": "Normální text"
 "Big text": "Velký 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."

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"
-"If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
+"Apps that not must be moved in the side menu": "Anwendungen, 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 Anwendung und möchtest\
+  \ mich unterstützen?"
 "Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
 "Hidden": "Ausblenden"
 "Small": "Klein"
@@ -36,18 +44,25 @@
 "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."
+"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 automatische Verhalten, wenn das Menü immer angezeigt wird."
+"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\
+  \ 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 +71,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"
-"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"
-"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
+"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"
+"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,12 +93,14 @@
 "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 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"
@@ -90,4 +112,3 @@
 "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."

src/l10n/fixtures/fr.yaml

@@ -3,13 +3,21 @@
 "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"
+"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."
 "Experimental": "Expérimental"
 "Save": "Sauvegarder"
-"You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?"
+"You like this app and you want to support me?": "Vous aimer cette application et\
+  \ vous souhaitez m'aider ?"
 "Buy me a coffee ☕": "Offrez moi un café ☕"
 "Hidden": "Caché"
 "Small": "Petit"
@@ -43,19 +51,26 @@
 "Before the logo": "Avant le logo"
 "After the logo": "Après le logo"
 "Position": "Position"
-"Show only the opener (hidden logo)": "Afficher uniquement le bouton d'ouverture (masquer le logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Ne pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application (exemple : page publiques)."
+"Show only the opener (hidden logo)": "Afficher uniquement le bouton d'ouverture (masquer\
+  \ le logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Ne\
+  \ pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application\
+  \ (exemple : page publiques)."
 "Panel": "Panneau"
-"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)"
+"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>."
+"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é."
+"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"
 "Live preview": "Aperçu en direct"
@@ -64,16 +79,21 @@
 "Use my selection": "Utiliser ma sélection"
 "Show and hide the list of applications": "Afficher et masquer la liste des applications"
 "Use the avatar instead of the logo": "Utiliser l'avatar à la place du logo"
-"You do not have permission to change the settings.": "Vous n'avez pas la permission de changer les paramètres."
+"You do not have permission to change the settings.": "Vous n'avez pas la permission\
+  \ de changer les paramètres."
 "Force this configuration to users": "Forcer cette configuration aux utilisateurs"
 "Export the configuration": "Exporter la configuration"
 "Purge the cache": "Purger le cache"
 "Show the link to settings": "Afficher le lien vers les paramètres"
-"The menu is enabled by default for users": "Le menu est activé par défaut pour les utilisateurs"
+"The menu is enabled by default for users": "Le menu est activé par défaut pour les\
+  \ utilisateurs"
 "Except when the configuration is forced.": "Sauf lorsque la configuration est forcée."
-"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu"
-"This feature is only compatible with the <code>big menu</code> display.": "Compatible avec l'affichage <code>Menu large</code>."
-"The logo is a link to the default app": "Le logo est un lien vers l'application par défaut"
+"Apps that should not be displayed in the menu": "Applications qui ne doivent pas\
+  \ être affichées dans le menu"
+"This feature is only compatible with the <code>big menu</code> display.": "Compatible\
+  \ avec l'affichage <code>Menu large</code>."
+"The logo is a link to the default app": "Le logo est un lien vers l'application par\
+  \ défaut"
 "Others": "Autres"
 "Categories": "Catégories"
 "Customize sorting": "Personnaliser le tri"
@@ -81,13 +101,16 @@
 "Name": "Nom"
 "Customed": "Personnalisé"
 "Show and hide the list of categories": "Afficher et masquer la liste des catégories"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Ces paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont activés."
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Ces\
+  \ paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont\
+  \ activés."
 "Dark mode colors": "Couleurs du mode sombre"
 "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"
+"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>"

src/l10n/fixtures/tpl/base.yaml

@@ -0,0 +1,95 @@
+"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": ""
+"This feature is not compatible with the <code>big menu</code> display.": ""
+"Icons and texts": ""
+"Loader enabled": ""
+"Tips": ""
+"Always displayed": ""
+"The logo will be hidden 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": ""
+"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": ""
+"Apps only visible in the top menu": ""
+"Apps visible in the top and side menus": ""
+"Reset to default": ""
+"Applications": ""

src/l10n/fixtures/zh_CN.yaml

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

templates/js/script.php

@@ -25,8 +25,8 @@ if ($_['always-displayed']) {
   const targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>
 
   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']); ?>
+  window.topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps'])."\n"; ?>
+  window.menuAppsOrder = <?php echo json_encode($_['apps-order']), "\n"; ?>
 
   <?php if ($display === 'big-menu'): ?>
     sideMenu.setAttribute('data-bigmenu', '1')

templates/settings/admin-form.php

@@ -839,19 +839,19 @@ $labelReset = 'Reset to default';
             <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 +863,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>