Merge pull request 'release v3.6.0' (#221 ) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/221
release v3.6.0
2023-02-17 11:53:27 +01:00 · 2023-02-17 11:46:31 +01:00 · 2023-02-17 11:45:57 +01:00 · 2023-02-17 11:44:41 +01:00 · 2023-02-17 10:51:39 +01:00 · 2023-02-17 10:51:11 +01:00
6 changed files with 42 additions and 20 deletions
@@ -1,5 +1,13 @@
 ## [Unreleased]

+## 3.6.0
+### Added
+* add hidden apps compatible with default menu (#219)
+
+## 3.5.2
+### Fixed
+* add check if menu exists before adding event listeners (#210)
+
 ## 3.5.1
 ### Added
 * add translations (thanks to p-bo adn gallegonovato)
@@ -18,6 +18,8 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark).

 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)

+## [📘 Read the documentation](https://deblan.gitnet.page/side_menu_doc/)
+
 Requirements
 ------------

@@ -32,12 +32,12 @@ Notice
 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/).
 ]]></description>
-    <version>3.5.1</version>
+    <version>3.6.0</version>
    <licence>agpl</licence>
    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
    <namespace>SideMenu</namespace>
    <documentation>
-        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
+        <admin>https://deblan.gitnet.page/side_menu_doc/</admin>
        <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
    </documentation>
    <category>customization</category>
@@ -41,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    <ul class="side-menu-apps-list">
      <SideMenuApp
        v-for="(app, key) in apps"
+        v-if="!hiddenApps.includes(app.id)"
        v-bind:classes="{'side-menu-app': true, 'active': app.active}"
        v-bind:key="key"
        v-bind:icon="app.icon"
@@ -76,6 +77,7 @@ export default {
      avatar: null,
      forceLightIcon: false,
      targetBlankApps: [],
+      hiddenApps: [],
      settings: null,
    }
  },
@@ -127,6 +129,7 @@ export default {
          this.logo = config['logo']
          this.logoLink = config['logo-link']
          this.settings = config['settings']
+          this.hiddenApps = config['big-menu-hidden-apps']
        })
    },
  },
@@ -73,6 +73,10 @@ if ($_['always-displayed']) {
    const headerMenuOpener = document.querySelector('#header .side-menu-opener')
    const sideMenuOpener = document.querySelectorAll('#side-menu .side-menu-opener')

+    if (!headerMenuOpener) {
+      return
+    }
+
    sideMenuFocus = () => {
      let a = document.querySelector('.side-menu-app.active a', sideMenu)

@@ -174,9 +178,11 @@ if ($_['always-displayed']) {
    PageLoader()
  <?php endif; ?>

-  <?php if ($_['opener-position'] === 'before'): ?>
-    nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
-  <?php else: ?>
-    nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
-  <?php endif; ?>
+  if (nextcloud) {
+    <?php if ($_['opener-position'] === 'before'): ?>
+      nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
+    <?php else: ?>
+      nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+    <?php endif; ?>
+  }
 })();
@@ -41,6 +41,7 @@ $choicesSizes = [

 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
+$labelDefault = 'Default';
 $labelWithCategories = 'With categories';
 $labelBigMenu = 'Big menu';
 $labelAlwaysDisplayed = 'Always displayed';
@@ -64,7 +65,7 @@ $labelAlwaysDisplayed = 'Always displayed';

        <div>
            <label>
-                <?php p($l->t('Default')); ?>
+                <?php p($l->t($labelDefault)); ?>
            </label>
        </div>
        <p>
@@ -73,7 +74,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                data-alwaysdiplayed="0"
                data-bigmenu="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>

        <div>
@@ -150,7 +151,7 @@ $labelAlwaysDisplayed = 'Always displayed';
        </h2>

        <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-3"><?php p($l->t($labelBigMenu)); ?></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">
            <?php
                $choices = [
-                    'Default' => 'side-menu-opener',
+                    $labelDefault => 'side-menu-opener',
                    'Default (dark)' => 'side-menu-opener-dark',
                    'Hamburger' => 'side-menu-opener-hamburger',
                    'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -341,7 +342,7 @@ $labelAlwaysDisplayed = 'Always displayed';
        </h2>

        <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-3"><?php p($l->t($labelBigMenu)); ?></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">
            <?php
                $choices = [
-                    'Default' => 'side-menu-opener',
+                    $labelDefault => 'side-menu-opener',
                    'Default (dark)' => 'side-menu-opener-dark',
                    'Hamburger' => 'side-menu-opener-hamburger',
                    'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -536,7 +537,7 @@ $labelAlwaysDisplayed = 'Always displayed';
        </h2>

        <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-3"><?php p($l->t($labelBigMenu)); ?></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')); ?>

                    <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 class="side-menu-setting-form">
@@ -640,7 +641,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                    <?php p($l->t('Use the avatar instead of the logo')); ?>

                    <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 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')); ?>

                    <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 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')); ?>

                    <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-3"><?php p($l->t($labelBigMenu)); ?></span>
+                        <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
                    </div>
                </div>
                <div class="side-menu-setting-form">
@@ -801,7 +804,7 @@ $labelAlwaysDisplayed = 'Always displayed';
        </h2>

        <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-3"><?php p($l->t($labelBigMenu)); ?></span>
            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -894,7 +897,7 @@ $labelAlwaysDisplayed = 'Always displayed';
        </h2>

        <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-3"><?php p($l->t($labelBigMenu)); ?></span>
            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -1056,7 +1059,7 @@ $labelAlwaysDisplayed = 'Always displayed';
        </h2>

        <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-3"><?php p($l->t($labelBigMenu)); ?></span>
            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
Author	SHA1	Message	Date
Simon Vieille	22e5445330	Merge pull request 'release v3.6.0' (#221 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/221	2023-02-17 11:53:27 +01:00
Simon Vieille	01669f83c2	release v3.6.0	2023-02-17 11:46:31 +01:00
Simon Vieille	f1c33cc626	release v3.6.0	2023-02-17 11:45:57 +01:00
Simon Vieille	87ff20aa19	Merge pull request 'add hidden apps compatible with default menu' (#220 ) from feature/issue219 into develop Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/220	2023-02-17 11:44:41 +01:00
Simon Vieille	ed4ed62fb6	update admin (hidden apps compatible with defaul)	2023-02-17 10:51:39 +01:00
Simon Vieille	5a586c40a1	add hidden apps compatible with default menu (fix #219 )	2023-02-17 10:51:11 +01:00
Simon Vieille	0544fd3765	Merge pull request 'doc' (#218 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/218	2023-02-12 16:56:39 +01:00
Simon Vieille	b141d7ba7c	update readme	2023-02-12 16:56:22 +01:00
Simon Vieille	2635dd89ca	Merge pull request 'Doc' (#217 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/217	2023-02-12 00:34:56 +01:00
Simon Vieille	0ee10e08e9	update readme	2023-02-12 00:31:47 +01:00
Simon Vieille	1093042a17	update readme	2023-02-12 00:29:18 +01:00
Simon Vieille	9566d32a89	update readme	2023-02-12 00:28:51 +01:00
Simon Vieille	aa203bb406	Merge pull request 'release v3.5.2' (#213 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/213	2023-01-21 22:31:21 +01:00
Simon Vieille	3861d78975	Merge pull request 'login error (#210 )' (#212 ) from feature/login_error into develop Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/212	2023-01-21 22:26:04 +01:00
Simon Vieille	571706986e	release v3.5.2	2023-01-21 22:18:45 +01:00
Simon Vieille	ed31ed3623	add check if menu exists before adding event listeners	2023-01-21 22:12:17 +01:00