diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae81a08..7afbc5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
## [Unreleased]
+## 3.3.1
+### Fixed
+* fix #162: top and side apps does work correctly
+
## 3.3.0
### Added
* add documentation in admin page
diff --git a/appinfo/info.xml b/appinfo/info.xml
index b78caea..d8a06b8 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -32,7 +32,7 @@ Notice
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
]]>
- 3.3.0
+ 3.3.1
agpl
Simon Vieille
SideMenu
diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php
index a461ce3..50efc4c 100644
--- a/lib/Controller/NavController.php
+++ b/lib/Controller/NavController.php
@@ -113,11 +113,11 @@ class NavController extends Controller
}
foreach ($apps as $app) {
- if (in_array($app['id'], $topMenuApps) && !in_array($app['id'], $userTopSideMenuApps)) {
- continue;
- }
+ $inTopMenuApps = in_array($app['id'], $topMenuApps);
+ $inTopSideMenuApps = in_array($app['id'], $topSideMenuApps);
+ $inHiddenApps = in_array($app['id'], $hiddenApps);
- if (in_array($app['id'], $hiddenApps)) {
+ if (($inTopMenuApps && !$inTopSideMenuApps) || $inHiddenApps) {
continue;
}
diff --git a/src/l10n/fixtures/cs.yaml b/src/l10n/fixtures/cs.yaml
index 0e3f028..08033d0 100644
--- a/src/l10n/fixtures/cs.yaml
+++ b/src/l10n/fixtures/cs.yaml
@@ -104,5 +104,7 @@
"Big text": "Velký text"
"Applications": "Applications"
"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept 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."
+"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."
diff --git a/src/l10n/fixtures/de.yaml b/src/l10n/fixtures/de.yaml
index d8d9bc1..1b3cb2c 100644
--- a/src/l10n/fixtures/de.yaml
+++ b/src/l10n/fixtures/de.yaml
@@ -107,5 +107,7 @@
"Big text": "Großer Text"
"Applications": "Applications"
"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept 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."
+"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."
diff --git a/src/l10n/fixtures/fr.yaml b/src/l10n/fixtures/fr.yaml
index e1a535b..7af0b34 100644
--- a/src/l10n/fixtures/fr.yaml
+++ b/src/l10n/fixtures/fr.yaml
@@ -3,21 +3,14 @@
"No": "Non"
"Yes": "Oui"
"Menu": "Menu"
-? 'Use the shortcut Ctrl+o
- to open and to hide the side menu. Use tab to
- navigate.'
-: 'Utiliser le raccourcis clavier Ctrl+o
- pour ouvrir et fermer le menu latéral. Utiliser tab
- pour naviguer.'
+? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.'
+: 'Utiliser le raccourcis clavier Ctrl+o pour ouvrir et fermer le menu latéral. Utiliser tab 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"
@@ -51,22 +44,17 @@
"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"
"Icons and texts": "Icônes et textes"
"Loader enabled": "Activation de l'indicateur de chargement"
"Tips": "Astuces"
"Always displayed": "Toujours affiché"
-"This is the automatic behavior when the menu is always displayed.": "C'est le comportement\
- \ automatique lorsque 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"
@@ -75,21 +63,16 @@
"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 big menu display.": "Compatible\
- \ avec l'affichage Menu large."
-"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 big menu display.": "Compatible avec l'affichage Menu large."
+"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"
@@ -97,9 +80,7 @@
"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"
@@ -108,4 +89,4 @@
"Applications": "Applications"
"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"
+"These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente."
diff --git a/src/l10n/fixtures/zh_CN.yaml b/src/l10n/fixtures/zh_CN.yaml
index df3b412..6c74d3f 100644
--- a/src/l10n/fixtures/zh_CN.yaml
+++ b/src/l10n/fixtures/zh_CN.yaml
@@ -3,7 +3,11 @@
"No": "取消"
"Yes": "确定"
"Menu": "菜单"
-"Use the shortcut Ctrl<\/span>+o<\/span> to open and to hide the side menu. Use tab<\/span> to navigate.": "使用快捷键 Ctrl<\/span>+o<\/span> 打开或隐藏侧边栏菜单。使用tab<\/span> 来导航。"
+? "Use the shortcut Ctrl+o to open and to hide the side menu. Use tab\
+ \ to navigate."
+: "使用快捷键 Ctrl+o\
+ \ 打开或隐藏侧边栏菜单。使用tab 来导航。"
"Top menu": "顶部菜单"
"Apps that not must be moved in the side menu": "禁止在侧边栏菜单移动的应用"
"If there is no selection then the global configuration is applied.": "如不选择，将应用全局设定。"
@@ -36,9 +40,11 @@
"After the logo": "在logo后"
"Position": "位置"
"Show only the opener (hidden logo)": "只显示容器 (隐藏logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器 (例如 : 公共页面)。"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器\
+ \ (例如 : 公共页面)。"
"Panel": "面板"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单\
+ \ (触摸屏时将自动禁用)"
"Display the big menu": "显示大型菜单"
"Display the logo": "显示logo"
"Icons and texts": "图标与文字"
@@ -62,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 big menu<\/code> display.": "此功能只和大型菜单<\/code>兼容。"
+"This feature is only compatible with the big menu display.": "此功能只和大型菜单兼容。"
"The logo is a link to the default app": "logo链接到默认应用"
"Others": "其他"
"Categories": "类别"
@@ -87,5 +93,7 @@
"Big text": "大文本"
"Applications": "Applications"
"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept 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."
+"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."