From 7f6f606d75402892a71d6e3f147ce4481127329e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 29 Oct 2022 11:41:48 +0200 Subject: [PATCH 1/8] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dffaf7..e834f32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 3.2.1 ### Fixed * fix #150: Active app is not visible has active in menu (except in default menu) -* fix #150: opener position +* fix #151: opener position ## 3.2.0 ### Added From 81f5dfcf2d353b83d9d7dfdaa207f206b9d903ad Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 4 Nov 2022 18:50:45 +0100 Subject: [PATCH 2/8] add compatibility badges for each options --- css/admin.css | 41 ++++- templates/settings/admin-form.php | 276 ++++++++++++++++++------------ 2 files changed, 208 insertions(+), 109 deletions(-) diff --git a/css/admin.css b/css/admin.css index 086d0d7..5332c4e 100644 --- a/css/admin.css +++ b/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; } @@ -175,3 +175,42 @@ .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; +} diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index 5a55946..5d1d088 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -41,8 +41,104 @@ $choicesSizes = [ $labelShowHideApps = 'Show and hide the list of applications'; $labelReset = 'Reset to default'; + ?>
+ +
+

+ t('Panel')); ?> +

+ + !$_['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'], + ]; + ?> + +
+ +
+

+ <?php p($l->t('Default')); ?> +

+ +
+ +
+

+ <?php p($l->t('With categories')); ?> +

+ +
+ +
+

+ <?php p($l->t('Big menu')); ?> +

+ +
+ +
+

t('Not compatible with touch screens.')); ?>

+

+ <?php p($l->t('Always displayed')); ?> +

+ + + + +
+

t('Colors')); ?> @@ -50,6 +146,13 @@ $labelReset = 'Reset to default'; t('Live preview')); ?>

+
+ t('Default')); ?> + t('With categories')); ?> + t('Big menu')); ?> + t('Always displayed')); ?> +
+
@@ -234,6 +337,13 @@ $labelReset = 'Reset to default'; t('Dark mode colors')); ?> +
+ t('Default')); ?> + t('With categories')); ?> + t('Big menu')); ?> + t('Always displayed')); ?> +
+

t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.'); ?>

@@ -422,6 +532,13 @@ $labelReset = 'Reset to default'; t('Opener')); ?> +
+ t('Default')); ?> + t('With categories')); ?> + t('Big menu')); ?> + t('Always displayed')); ?> +
+
-
-
-
-

- t('Panel')); ?> -

- - !$_['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'], - ]; - ?> - -
- -
-

- <?php p($l->t('Default')); ?> -

- -
- -
-

- <?php p($l->t('With categories')); ?> -

- -
- -
-

- <?php p($l->t('Big menu')); ?> -

- -
- -
-

t('Not compatible with touch screens.')); ?>

-

- <?php p($l->t('Always displayed')); ?> -

- - - - -
- - -
t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?> @@ -589,16 +608,18 @@ $labelReset = 'Reset to default';
+
+
+
+
t('Display the logo')); ?> -
- - t('This feature is not compatible with the big menu display.'); ?> -
- t('The logo will be hidden when the menu is always displayed.')); ?> -
+ +
+ t('Default')); ?> +
@@ -629,6 +654,10 @@ $labelReset = 'Reset to default';
t('The logo is a link to the default app')); ?> + +
+ t('Default')); ?> +
' name="apps-order" class="side-menu-setting" id="side-menu-apps-order" data-personal> +
+
+
+
From 1d06c1b2123d03755feadd4833b518a51e893bd0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 4 Nov 2022 21:43:18 +0100 Subject: [PATCH 5/8] fix issue with top and side apps (#162 #159) --- lib/Controller/NavController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php index 6ea8e46..a461ce3 100644 --- a/lib/Controller/NavController.php +++ b/lib/Controller/NavController.php @@ -98,6 +98,8 @@ class NavController extends Controller $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,8 +108,12 @@ class NavController extends Controller $topMenuApps = $userTopMenuApps; } + if (!$isForced && !empty($userTopSideMenuApps)) { + $topSideMenuApps = $userTopSideMenuApps; + } + foreach ($apps as $app) { - if (in_array($app['id'], $topMenuApps)) { + if (in_array($app['id'], $topMenuApps) && !in_array($app['id'], $userTopSideMenuApps)) { continue; } From 6d7543f381086b63a89cffd005a05da82c2ec6cb Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 4 Nov 2022 22:14:28 +0100 Subject: [PATCH 6/8] fix #164: open apps in new tab does not work --- src/AppMenu.vue | 3 +++ templates/js/script.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/AppMenu.vue b/src/AppMenu.vue index 20fc9db..8f043e8 100644 --- a/src/AppMenu.vue +++ b/src/AppMenu.vue @@ -33,6 +33,7 @@