Merge pull request 'release v3.6.0' (#221) from develop into master
Reviewed-on: #221
This commit is contained in:
commit
22e5445330
|
@ -1,5 +1,9 @@
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## 3.6.0
|
||||||
|
### Added
|
||||||
|
* add hidden apps compatible with default menu (#219)
|
||||||
|
|
||||||
## 3.5.2
|
## 3.5.2
|
||||||
### Fixed
|
### Fixed
|
||||||
* add check if menu exists before adding event listeners (#210)
|
* add check if menu exists before adding event listeners (#210)
|
||||||
|
|
|
@ -32,7 +32,7 @@ Notice
|
||||||
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
|
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
|
||||||
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
|
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
|
||||||
]]></description>
|
]]></description>
|
||||||
<version>3.5.2</version>
|
<version>3.6.0</version>
|
||||||
<licence>agpl</licence>
|
<licence>agpl</licence>
|
||||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||||
<namespace>SideMenu</namespace>
|
<namespace>SideMenu</namespace>
|
||||||
|
|
|
@ -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']
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in a new issue