forked from deblan/side_menu
Merge pull request 'Quick fix' (#90) from develop into master
Reviewed-on: deblan/side_menu#90
This commit is contained in:
commit
1e68d6877d
|
@ -1,5 +1,9 @@
|
|||
## [Unreleased]
|
||||
|
||||
## 2.3.2
|
||||
### Fixed
|
||||
- fix hidden menu
|
||||
|
||||
## 2.3.1
|
||||
### Fixed
|
||||
- fix #88: does not work with default menu
|
||||
|
|
|
@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
|
|||
* [Donate with liberapay](https://liberapay.com/deblan)
|
||||
* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
|
||||
]]></description>
|
||||
<version>2.3.1</version>
|
||||
<version>2.3.2</version>
|
||||
<licence>agpl</licence>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||
<namespace>SideMenu</namespace>
|
||||
|
|
|
@ -87,6 +87,7 @@ class CssController extends Controller
|
|||
{
|
||||
$isForced = $this->config->getAppValueBool('force', '0');
|
||||
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
|
||||
$topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
|
||||
|
||||
$isAccessibilityAppEnabled = $this->config->getAppValueBool('enabled', '0', 'accessibility');
|
||||
$isBreezeDarkAppEnabled = $this->config->getAppValueBool('enabled', '0', 'breezedark');
|
||||
|
@ -94,11 +95,16 @@ class CssController extends Controller
|
|||
|
||||
if ($this->user) {
|
||||
$userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
|
||||
$userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');
|
||||
|
||||
if (!empty($userTopMenuApps) && !$isForced) {
|
||||
$topMenuApps = $userTopMenuApps;
|
||||
}
|
||||
|
||||
if (!empty($userTopSideMenuApps) && !$isForced) {
|
||||
$topSideMenuApps = $userTopSideMenuApps;
|
||||
}
|
||||
|
||||
$isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
|
||||
$isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
|
||||
|
||||
|
@ -162,6 +168,7 @@ class CssController extends Controller
|
|||
'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
|
||||
'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
|
||||
'top-menu-apps' => $topMenuApps,
|
||||
'top-side-menu-apps' => $topSideMenuApps,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<?php endforeach; ?>
|
||||
}
|
||||
|
||||
<?php if (empty($_['top-menu-apps'])): ?>
|
||||
<?php if (empty($_['top-menu-apps']) && empty($_['top-side-menu-apps'])): ?>
|
||||
#appmenu {
|
||||
display: none;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue