deblan/side_menu
deblan/side_menu
3
6
Fork 5
Code Issues 7 Pull requests 11 Projects Releases 119 Wiki Activity

update ui of admin and fix #53

Browse source
This commit is contained in:
Simon Vieille 2021-02-03 15:21:08 +01:00
parent b06df8ad9f
commit c893391065
Signed by: deblan
GPG key ID: 03383D15A1D31745
3 changed files with 376 additions and 353 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
css/admin.css
View file

@ -90,3 +90,24 @@
min-height: auto; min-height: auto;
margin-top: -1px; margin-top: -1px;
} }
.side-menu-setting-table {
display: table;
width: 100%;
}
.side-menu-setting-row {
display: table;
}
.side-menu-setting-label {
display: table-cell;
width: 400px;
padding-right: 20px;
}
.side-menu-setting-form {
display: table-cell;
width: 300px;
}

4
lib/Service/CategoryRepository.php
View file

@ -54,7 +54,7 @@ class CategoryRepository
public function getOrderedCategories() public function getOrderedCategories()
{ {
$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2); $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
$type = $this->config->getAppValueArray('categories-order-type', 'default'); $type = $this->config->getAppValue('categories-order-type', 'default');
$order = $this->config->getAppValueArray('categories-order', '[]'); $order = $this->config->getAppValueArray('categories-order', '[]');
$categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]'); $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
@ -76,7 +76,7 @@ class CategoryRepository
asort($categoriesLabels); asort($categoriesLabels);
if ('custom' === $type || true) { if ('custom' === $type) {
$ordered = []; $ordered = [];
foreach ($order as $id) { foreach ($order as $id) {

240
templates/settings/admin-form.php
View file

@ -160,6 +160,7 @@ $choicesSizes = [
<?php p($l->t('Opener')); ?> <?php p($l->t('Opener')); ?>
</h2> </h2>
<div class="side-menu-setting-table">
<?php <?php
$choices = [ $choices = [
'Default' => 'side-menu-opener', 'Default' => 'side-menu-opener',
@ -170,16 +171,12 @@ $choicesSizes = [
'Hamburger 2 (dark)' => 'side-menu-opener-hamburger-2-dark', 'Hamburger 2 (dark)' => 'side-menu-opener-hamburger-2-dark',
]; ];
?> ?>
<div class="side-menu-setting-row">
<div> <div class="side-menu-setting-label">
<label for="side-menu-opener">
<?php p($l->t('Icon')); ?> <?php p($l->t('Icon')); ?>
<small><span class="info"><?php p($l->t('Live preview')); ?></span></small> <small><span class="info"><?php p($l->t('Live preview')); ?></span></small>
</label>
</div> </div>
<div class="side-menu-setting-form">
<div>
<select id="side-menu-opener" name="opener" class="side-menu-setting side-menu-setting-live"> <select id="side-menu-opener" name="opener" class="side-menu-setting side-menu-setting-live">
<?php foreach ($choices as $label => $value): ?> <?php foreach ($choices as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>>
@ -188,21 +185,19 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
</div>
<div class="side-menu-setting-row">
<?php <?php
$choices = [ $choices = [
'Before the logo' => 'before', 'Before the logo' => 'before',
'After the logo' => 'after', 'After the logo' => 'after',
]; ];
?> ?>
<div class="side-menu-setting-label">
<div>
<label for="side-menu-opener-position">
<?php p($l->t('Position')); ?> <?php p($l->t('Position')); ?>
</label>
</div> </div>
<div class="side-menu-setting-form">
<div>
<select id="side-menu-opener-position" name="opener-position" class="side-menu-setting"> <select id="side-menu-opener-position" name="opener-position" class="side-menu-setting">
<?php foreach ($choices as $label => $value): ?> <?php foreach ($choices as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['opener-position']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['opener-position']): ?>selected<?php endif; ?>>
@ -211,14 +206,13 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-opener-only">
<?php p($l->t('Show only the opener (hidden logo)')); ?>
</label>
</div> </div>
<div> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Show only the opener (hidden logo)')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-opener-only" name="opener-only" class="side-menu-setting"> <select id="side-menu-opener-only" name="opener-only" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['opener-only']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['opener-only']): ?>selected<?php endif; ?>>
@ -227,14 +221,13 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-hide-when-no-apps">
<?php p($l->t('Do not display the side menu and the opener if there is no application (eg: public pages).')); ?>
</label>
</div> </div>
<div> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Do not display the side menu and the opener if there is no application (eg: public pages).')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting"> <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['hide-when-no-apps']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['hide-when-no-apps']): ?>selected<?php endif; ?>>
@ -244,6 +237,8 @@ $choicesSizes = [
</select> </select>
</div> </div>
</div> </div>
</div>
</div>
<div class="section"> <div class="section">
<h2> <h2>
@ -310,15 +305,16 @@ $choicesSizes = [
<br> <br>
<div>
<label for="side-menu-opener"> <div class="side-menu-setting-table">
<div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?> <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
</label>
<br>
<em><?php p($l->t('This is the automatic behavior when the menu is always displayed.')); ?></em>
</div> </div>
<div class="side-menu-setting-form">
<p><em><?php p($l->t('This is the automatic behavior when the menu is always displayed.')); ?></em></p>
<div>
<select id="side-menu-opener-hover" name="opener-hover" class="side-menu-setting"> <select id="side-menu-opener-hover" name="opener-hover" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['opener-hover']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['opener-hover']): ?>selected<?php endif; ?>>
@ -327,17 +323,19 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-opener">
<?php p($l->t('Display the logo')); ?>
</label>
</div> </div>
<p><em><?php echo $l->t('This feature is not compatible with the <code>big menu</code> display.'); ?></em></p> <div class="side-menu-setting-row">
<p><em><?php p($l->t('The logo will be hidden when the menu is always displayed.')); ?></em></p> <div class="side-menu-setting-label">
<?php p($l->t('Display the logo')); ?>
<div> <br>
<em>
<?php echo $l->t('This feature is not compatible with the <code>big menu</code> display.'); ?>
<br>
<?php p($l->t('The logo will be hidden when the menu is always displayed.')); ?>
</em>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-display-logo" name="display-logo" class="side-menu-setting"> <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
@ -346,10 +344,13 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
</div>
<p><em><?php p($l->t('Use the avatar instead of the logo')); ?></em></p> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<div> <?php p($l->t('Use the avatar instead of the logo')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting"> <select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['use-avatar']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['use-avatar']): ?>selected<?php endif; ?>>
@ -358,10 +359,13 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
</div>
<p><em><?php p($l->t('The logo is a link to the default app')); ?></em></p> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<div> <?php p($l->t('The logo is a link to the default app')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-add-logo-link" name="add-logo-link" class="side-menu-setting"> <select id="side-menu-add-logo-link" name="add-logo-link" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['add-logo-link']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['add-logo-link']): ?>selected<?php endif; ?>>
@ -370,20 +374,18 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-top-menu-apps">
<?php p($l->t('Apps that should not be displayed in the menu')); ?>
</label>
</div> </div>
<p><em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em></p> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<p> <?php p($l->t('Apps that should not be displayed in the menu')); ?>
<br>
<em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em>
</div>
<div class="side-menu-setting-form">
<a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_"> <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
🖱️ <?php p($l->t('Show and hide the list of applications')); ?> 🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
</a> </a>
</p>
<div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none"> <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
<ul class="side-menu-setting-list"> <ul class="side-menu-setting-list">
@ -404,16 +406,14 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
</div> </div>
</div>
<br>
<div>
<label for="side-menu-show-settings">
<?php p($l->t('Show the link to settings')); ?>
</label>
</div> </div>
<div> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Show the link to settings')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-show-settings" name="show-settings" class="side-menu-setting"> <select id="side-menu-show-settings" name="show-settings" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['show-settings']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['show-settings']): ?>selected<?php endif; ?>>
@ -422,14 +422,13 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label>
<?php p($l->t('Icons and texts')); ?>
</label>
</div> </div>
<div> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Icons and texts')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-size-icon" name="size-icon" class="side-menu-setting"> <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
<?php foreach ($choicesSizes as $label => $value): ?> <?php foreach ($choicesSizes as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
@ -446,18 +445,16 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-target-blank">
<?php p($l->t('Open apps in new tab')); ?>
</label>
</div> </div>
<p> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Open apps in new tab')); ?>
</div>
<div class="side-menu-setting-form">
<a class="side-menu-toggler" data-target="#target-blank-apps" href="#_"> <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
🖱️ <?php p($l->t('Show and hide the list of applications')); ?> 🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
</a> </a>
</p>
<div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none"> <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
<ul class="side-menu-setting-list"> <ul class="side-menu-setting-list">
@ -478,16 +475,14 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
</div> </div>
</div>
<br>
<div>
<label for="side-menu-loader-enabled">
<?php p($l->t('Loader enabled')); ?>
</label>
</div> </div>
<div> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Loader enabled')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting"> <select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['loader-enabled']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['loader-enabled']): ?>selected<?php endif; ?>>
@ -497,22 +492,23 @@ $choicesSizes = [
</select> </select>
</div> </div>
</div> </div>
</div>
</div>
<div class="section"> <div class="section">
<h2> <h2>
<?php p($l->t('Top menu')); ?> <?php p($l->t('Top menu')); ?>
</h2> </h2>
<div>
<label for="side-menu-top-menu-apps">
<?php p($l->t('Apps that not must be moved in the side menu')); ?>
</label>
</div>
<p> <div class="side-menu-setting-table">
<div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Apps that not must be moved in the side menu')); ?>
</div>
<div class="side-menu-setting-form">
<a class="side-menu-toggler" data-target="#top-menu-apps" href="#_"> <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
🖱️ <?php p($l->t('Show and hide the list of applications')); ?> 🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
</a> </a>
</p>
<div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none"> <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
<ul class="side-menu-setting-list"> <ul class="side-menu-setting-list">
@ -534,44 +530,46 @@ $choicesSizes = [
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div>
</div>
<div class="section"> <div class="section">
<h2> <h2>
<?php p($l->t('Categories')); ?> <?php p($l->t('Categories')); ?>
</h2> </h2>
<div>
<label for="side-menu-top-menu-apps">
<?php p($l->t('Order by')); ?>
</label>
<div class="side-menu-setting-table">
<div class="side-menu-setting-row">
<?php <?php
$choices = [ $choices = [
'Name' => 'default', 'Name' => 'default',
'Customed' => 'custom', 'Customed' => 'custom',
]; ];
?> ?>
<div class="side-menu-setting-label">
<select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting"> <?php p($l->t('Order by')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-categories-order-type" name="categories-order-type" class="side-menu-setting">
<?php foreach ($choices as $label => $value): ?> <?php foreach ($choices as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['category-order-type']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['categories-order-type']): ?>selected<?php endif; ?>>
<?php echo $l->t($label); ?> <?php echo $l->t($label); ?>
</option> </option>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-top-menu-apps">
<?php p($l->t('Customize sorting')); ?>
</label>
</div> </div>
<p> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Customize sorting')); ?>
</div>
<div class="side-menu-setting-form">
<a class="side-menu-toggler" data-target="#categories-list" href="#_"> <a class="side-menu-toggler" data-target="#categories-list" href="#_">
🖱️ <?php p($l->t('Show and hide the list of categories')); ?> 🖱️ <?php p($l->t('Show and hide the list of categories')); ?>
</a> </a>
</p>
<div class="side-menu-setting" data-name="categories" id="categories-list" style="display: none"> <div class="side-menu-setting" data-name="categories" id="categories-list" style="display: none">
<ul class="side-menu-setting-list"> <ul class="side-menu-setting-list">
@ -589,6 +587,9 @@ $choicesSizes = [
<input type="hidden" value='<?php echo json_encode(array_keys($_['categories'])) ?>' name="categories-order" class="side-menu-setting"> <input type="hidden" value='<?php echo json_encode(array_keys($_['categories'])) ?>' name="categories-order" class="side-menu-setting">
</div> </div>
</div>
</div>
</div>
<div class="section"> <div class="section">
<h2> <h2>
@ -601,13 +602,14 @@ $choicesSizes = [
</div> </div>
<div class="section"> <div class="section">
<div> <div class="side-menu-setting-table">
<label for="side-menu-default-enabled"> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('The menu is enabled by default for users')); ?> <?php p($l->t('The menu is enabled by default for users')); ?>
</label> <br>
<em><?php p($l->t('Except when the configuration is forced.')); ?></em>
<p><em><?php p($l->t('Except when the configuration is forced.')); ?></em></p> </div>
<div class="side-menu-setting-form">
<select id="side-menu-default-enabled" name="default-enabled" class="side-menu-setting"> <select id="side-menu-default-enabled" name="default-enabled" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['default-enabled']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['default-enabled']): ?>selected<?php endif; ?>>
@ -616,14 +618,13 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<div>
<label for="side-menu-opener-only">
<?php p($l->t('Force this configuration to users')); ?>
</label>
</div> </div>
<div> <div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Force this configuration to users')); ?>
</div>
<div class="side-menu-setting-form">
<select id="side-menu-force" name="force" class="side-menu-setting"> <select id="side-menu-force" name="force" class="side-menu-setting">
<?php foreach ($choicesYesNo as $label => $value): ?> <?php foreach ($choicesYesNo as $label => $value): ?>
<option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>selected<?php endif; ?>> <option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>selected<?php endif; ?>>
@ -632,9 +633,10 @@ $choicesSizes = [
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
</div>
</div>
<input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting"> <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting">
</div> </div>
<div class="section" id="more"> <div class="section" id="more">