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

Merge pull request 'add hidden apps compatible with default menu' (#220) from feature/issue219 into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
Reviewed-on: #220
This commit is contained in:
Simon Vieille 2023-02-17 11:44:41 +01:00
parent b141d7ba7c ed4ed62fb6
commit 87ff20aa19
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/SideMenu.vue
View file

@ -41,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<ul class="side-menu-apps-list"> <ul class="side-menu-apps-list">
<SideMenuApp <SideMenuApp
v-for="(app, key) in apps" v-for="(app, key) in apps"
v-if="!hiddenApps.includes(app.id)"
v-bind:classes="{'side-menu-app': true, 'active': app.active}" v-bind:classes="{'side-menu-app': true, 'active': app.active}"
v-bind:key="key" v-bind:key="key"
v-bind:icon="app.icon" v-bind:icon="app.icon"
@ -76,6 +77,7 @@ export default {
avatar: null, avatar: null,
forceLightIcon: false, forceLightIcon: false,
targetBlankApps: [], targetBlankApps: [],
hiddenApps: [],
settings: null, settings: null,
} }
}, },
@ -127,6 +129,7 @@ export default {
this.logo = config['logo'] this.logo = config['logo']
this.logoLink = config['logo-link'] this.logoLink = config['logo-link']
this.settings = config['settings'] this.settings = config['settings']
this.hiddenApps = config['big-menu-hidden-apps']
}) })
}, },
}, },

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

@ -41,6 +41,7 @@ $choicesSizes = [
$labelShowHideApps = 'Show and hide the list of applications'; $labelShowHideApps = 'Show and hide the list of applications';
$labelReset = 'Reset to default'; $labelReset = 'Reset to default';
$labelDefault = 'Default';
$labelWithCategories = 'With categories'; $labelWithCategories = 'With categories';
$labelBigMenu = 'Big menu'; $labelBigMenu = 'Big menu';
$labelAlwaysDisplayed = 'Always displayed'; $labelAlwaysDisplayed = 'Always displayed';
@ -64,7 +65,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<div> <div>
<label> <label>
<?php p($l->t('Default')); ?> <?php p($l->t($labelDefault)); ?>
</label> </label>
</div> </div>
<p> <p>
@ -73,7 +74,7 @@ $labelAlwaysDisplayed = 'Always displayed';
data-alwaysdiplayed="0" data-alwaysdiplayed="0"
data-bigmenu="0" data-bigmenu="0"
data-sidewithcategories="0" data-sidewithcategories="0"
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>"> src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t($labelDefault)); ?>">
</p> </p>
<div> <div>
@ -150,7 +151,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2> </h2>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span> <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@ -312,7 +313,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<div class="side-menu-setting-table"> <div class="side-menu-setting-table">
<?php <?php
$choices = [ $choices = [
'Default' => 'side-menu-opener', $labelDefault => 'side-menu-opener',
'Default (dark)' => 'side-menu-opener-dark', 'Default (dark)' => 'side-menu-opener-dark',
'Hamburger' => 'side-menu-opener-hamburger', 'Hamburger' => 'side-menu-opener-hamburger',
'Hamburger (dark)' => 'side-menu-opener-hamburger-dark', 'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@ -341,7 +342,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2> </h2>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span> <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@ -505,7 +506,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<div class="side-menu-setting-table"> <div class="side-menu-setting-table">
<?php <?php
$choices = [ $choices = [
'Default' => 'side-menu-opener', $labelDefault => 'side-menu-opener',
'Default (dark)' => 'side-menu-opener-dark', 'Default (dark)' => 'side-menu-opener-dark',
'Hamburger' => 'side-menu-opener-hamburger', 'Hamburger' => 'side-menu-opener-hamburger',
'Hamburger (dark)' => 'side-menu-opener-hamburger-dark', 'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@ -536,7 +537,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2> </h2>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span> <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@ -621,7 +622,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('Display the logo')); ?> <?php p($l->t('Display the logo')); ?>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
</div> </div>
</div> </div>
<div class="side-menu-setting-form"> <div class="side-menu-setting-form">
@ -640,7 +641,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('Use the avatar instead of the logo')); ?> <?php p($l->t('Use the avatar instead of the logo')); ?>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
</div> </div>
</div> </div>
<div class="side-menu-setting-form"> <div class="side-menu-setting-form">
@ -659,7 +660,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('The logo is a link to the default app')); ?> <?php p($l->t('The logo is a link to the default app')); ?>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
</div> </div>
</div> </div>
<div class="side-menu-setting-form"> <div class="side-menu-setting-form">
@ -678,8 +679,10 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('Apps that should not be displayed in the menu')); ?> <?php p($l->t('Apps that should not be displayed in the menu')); ?>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div> </div>
</div> </div>
<div class="side-menu-setting-form"> <div class="side-menu-setting-form">
@ -801,7 +804,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2> </h2>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span> <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@ -894,7 +897,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2> </h2>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span> <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@ -1056,7 +1059,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2> </h2>
<div class="badges"> <div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span> <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span> <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span> <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span> <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>