Merge branch 'feature/issue-12' into develop

This commit is contained in:
Simon Vieille 2020-04-29 09:03:11 +02:00
commit ec50328f78
8 changed files with 51 additions and 14 deletions

View File

@ -49,7 +49,7 @@
border: 0;
}
#side-menu.hide-opener .side-menu-opener {
#side-menu.hide-opener .side-menu-opener, .side-menu-opener.hide {
display: none;
}

View File

@ -54,6 +54,7 @@ class JsController extends Controller
$parameters = [
'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
'hide-when-no-apps' => (bool) $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
];
$response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');

View File

@ -61,6 +61,7 @@ class Admin implements ISettings
'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'),
'opener-only' => $this->config->getAppValue('side_menu', 'opener-only', '0'),
'hide-when-no-apps' => $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
];

View File

@ -30,6 +30,7 @@ const mountSideMenuComponent = () => {
if (sideMenuContainer) {
sideMenu.$mount('#side-menu')
$('body').trigger('side-menu.ready')
} else {
window.setTimeout(mountSideMenuComponent, 50)

View File

@ -46,8 +46,8 @@ export default {
},
methods: {
retrieveApps() {
this.apps = [];
const links = document.querySelectorAll('#appmenu a');
this.apps = []
const links = document.querySelectorAll('#appmenu a')
for (let element of links) {
let href = element.getAttribute('href')
@ -65,6 +65,12 @@ export default {
});
}
}
(function(apps) {
window.setTimeout(function() {
jQuery('body').trigger('side-menu.apps', [apps])
}, 1000)
})(this.apps)
},
retrieveLogo() {
const ncLogo = document.querySelector('#nextcloud .logo')

View File

@ -25,6 +25,7 @@ const elements = [
'side-menu-opener-hover',
'side-menu-opener-only',
'side-menu-display-logo',
'side-menu-hide-when-no-apps',
'side-menu-size-icon',
'side-menu-size-text',
'side-menu-cache',

View File

@ -3,19 +3,21 @@
var sideMenuOpener = $('<button class="side-menu-opener"></button>')
var sideMenu = $('<div id="side-menu">')
var body = $('body')
body.append(sideMenuContainer)
sideMenuContainer.append(sideMenu)
<?php if ($_['opener-position'] === 'before'): ?>
sideMenuOpener.insertBefore('#nextcloud')
<?php else: ?>
sideMenuOpener.insertAfter('#nextcloud')
<?php endif; ?>
var isTouchDevice = window.matchMedia("(pointer: coarse)").matches
body.on('side-menu.apps', function(e, apps) {
<?php if ($_['hide-when-no-apps']): ?>
sideMenu = $('#side-menu')
if (apps.length === 0) {
sideMenu.removeClass('open')
sideMenuOpener.addClass('hide')
} else {
sideMenuOpener.removeClass('hide')
}
<?php endif; ?>
})
body.on('side-menu.ready', function() {
sideMenu = $('#side-menu')
@ -54,4 +56,13 @@
sideMenu.removeClass('open');
})
})
body.append(sideMenuContainer)
sideMenuContainer.append(sideMenu)
<?php if ($_['opener-position'] === 'before'): ?>
sideMenuOpener.insertBefore('#nextcloud')
<?php else: ?>
sideMenuOpener.insertAfter('#nextcloud')
<?php endif; ?>
})();

View File

@ -151,6 +151,22 @@ $choicesSizes = [
<?php endforeach; ?>
</select>
</div>
<div>
<label for="side-menu-hide-when-no-apps" class="settings-hint">
<?php p($l->t('Do not display the side menu and the opener if there is no application (eg: public pages).')); ?>
</label>
</div>
<div>
<select id="side-menu-hide-when-no-apps" name="hide-when-no-apps">
<?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['hide-when-no-apps']): ?>selected<?php endif; ?>>
<?php echo $l->t($label); ?>
</option>
<?php endforeach; ?>
</select>
</div>
</div>
<div class="section">