release v1.21.0

.gitea/issue_template/FEATURE_TEMPLATE.md

@@ -0,0 +1,16 @@
+---
+name: "New feature"
+about: "Use this template if you want to request a feature"
+title: "[FEATURE] "
+labels:
+  - enhancement
+---
+## Feature
+
+### Description
+
+...
+
+### Benefits
+
+...

.gitea/issue_template/ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+---
+name: "New issue"
+about: "Use this template if you have a bug"
+title: "[BUG] "
+labels:
+  - bug
+---
+## Issue
+
+### Environment
+
+* Custom menu version: 
+* Nextcloud version: 
+* PHP version: 
+* Web server (Nginx, Apache2): 
+* Web browser and version (Firefox 80, Google Chrome 74, etc): 
+
+```
+Insert your configuration here. You can export the configuration using the admin page.
+```
+
+### Steps to reproduce
+
+...
+
+### Observed Results
+
+...
+
+### Expected Results
+
+...

ISSUE_TEMPLATE.md

@@ -1,35 +0,0 @@
-## Feature
-
-### Description
-
-...
-
-### Benefits
-
-...
-
----
-
-## Issue
-
-### Environment
-
-* Side menu version: ...
-* Nextcloud version: ...
-* PHP version: ...
-* Web server (Nginx, Apache2): ...
-* Web browser and version (Firefox 80, Google Chrome 74, etc): ...
-
-### Steps to reproduce
-
-* ...
-* ...
-* ...
-
-### Observed Results
-
-...
-
-### Expected Results
-
-...

README.md

@@ -12,7 +12,13 @@ Comptatible with AppOrder.
 * [How to contribute?](#how-to-contribute)
 * [Screenshots](https://gitnet.fr/deblan/side_menu/src/branch/master/screenshots/)
 
-You like this app and you want to support me? [Buy me a coffee](https://www.buymeacoffee.com/deblan) ☕
+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)
+
+Requirements
+------------
+
+* PHP >= 7.3
+* App `theming` enabled
 
 Installation and upgrade
 ------------------------

appinfo/info.xml

@@ -15,12 +15,18 @@ Comptatible with AppOrder.
 
 You can report a bug or request a feature by opening an issue.
 
-If you like this application and want to support the development:
+Requirements:
 
-* ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan)
+* PHP >= 7.3
-* 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
+* App `theming` enabled
+
+If you like this application and if you want to support the development:
+
+* [Buy me a coffee](https://www.buymeacoffee.com/deblan)
+* [Donate with liberapay](https://liberapay.com/deblan)
+* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.19.0</version>
+    <version>1.21.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

bin/generate_l10n.php

@@ -1,4 +1,10 @@
 <?php
+/**
+ * Generates l10n files using Yaml.
+ *
+ * Usage:
+ *   php bin/generate_l10n.php
+ */
 
 function generateJsContent($translations)
 {

bin/import_config.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Imports a json configuration into a sqlite database.
+ *
+ * Usage:
+ *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
+ */
+
+$configFile = $argv[1];
+$databaseFile = $argv[2];
+
+$content = file_get_contents($configFile);
+$config = json_decode($content, true);
+
+$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
+$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
+
+foreach ($config as $key => $value) {
+    $stmt->execute([
+        'appId' => 'side_menu',
+        'key' => $key,
+        'value' => $value,
+    ]);
+}

lib/Controller/JsController.php

@@ -97,6 +97,7 @@ class JsController extends Controller
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');
+        $addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
         $avatar = null;
         $settings = null;
 
@@ -141,6 +142,8 @@ class JsController extends Controller
             }
         }
 
+        $indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
+
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
             'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
@@ -150,11 +153,13 @@ class JsController extends Controller
             'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),
             'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
             'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
+            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
             'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),
+            'logo-link' => $addLogoLink ? $indexUrl : null,
         ];
     }
 }

lib/Controller/NavController.php

@@ -97,6 +97,7 @@ class NavController extends Controller
         $apps = $this->appRepository->getVisibleApps();
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
+        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
         $user = OC::$server[IUserSession::class]->getUser();
         $isForced = $this->config->getAppValueBool('force', '0');
         $appsCategories = [];
@@ -142,6 +143,10 @@ class NavController extends Controller
                 continue;
             }
 
+            if (in_array($app['id'], $hiddenApps)) {
+                continue;
+            }
+
             $categories = (array) $app['category'];
             $appsCategories[$app['id']] = [];
 

lib/Settings/Admin.php

@@ -77,7 +77,9 @@ class Admin implements ISettings
             'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
             'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
             'big-menu' => $this->config->getAppValue('big-menu', '0'),
+            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
             'display-logo' => $this->config->getAppValue('display-logo', '1'),
+            'add-logo-link' => $this->config->getAppValue('add-logo-link', '1'),
             'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
             'opener-hover' => $this->config->getAppValue('opener-hover', '0'),

src/Logo.vue

@@ -16,7 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
     <div v-bind:class="classes">
+        <a v-if="link !== null" v-bind:href="link">
             <img v-bind:src="image">
+        </a>
+        <img v-else v-bind:src="image">
     </div>
 </template>
 
@@ -28,6 +31,10 @@ export default {
             type: String,
             required: true
         },
+        link: {
+            type: String,
+            required: false
+        },
         classes: {
             type: Object,
             required: true

src/SideMenu.vue

@@ -25,8 +25,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
             <OpenerButton />
 
-            <Logo v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}" v-bind:image="logo" />
+            <Logo
-            <Logo v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}" v-bind:image="avatar" />
+                v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+                v-bind:image="logo"
+                v-bind:link="logoLink"
+            />
+
+            <Logo
+                v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}"
+                v-bind:image="avatar"
+                v-bind:link="logoLink"
+            />
         </div>
 
         <ul class="side-menu-apps-list">
@@ -62,6 +71,7 @@ export default {
         return {
             apps: [],
             logo: null,
+            logoLink: null,
             avatar: null,
             forceLightIcon: false,
             targetBlankApps: [],
@@ -135,6 +145,7 @@ export default {
                     that.forceLightIcon = config['force-light-icon']
                     that.avatar = config['avatar']
                     that.logo = config['logo']
+                    that.logoLink = config['logo-link']
                     that.settings = config['settings']
                 });
         },

src/l10n/fixtures/de.yaml

@@ -64,3 +64,6 @@
 "Show the link to settings": "Zeigen Sie den Link zu den Einstellungen an"
 "The menu is enabled by default for users": "Das Menü ist standardmäßig für Benutzer aktiviert"
 "Except when the configuration is forced.": "Außer wenn die Konfiguration erzwungen wird."
+"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
+"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit der Anzeige <code> Großes Menü </ code>."
+"The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"

src/l10n/fixtures/fr.yaml

@@ -64,3 +64,6 @@
 "Show the link to settings": "Afficher le lien vers les paramètres"
 "The menu is enabled by default for users": "Le menu est activé par défaut pour les utilisateurs"
 "Except when the configuration is forced.": "Sauf lorsque la configuration est forcée."
+"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu"
+"This feature is only compatible with the <code>big menu</code> display.": "Compatible avec l'affichage <code>Menu large</code>."
+"The logo is a link to the default app": "Le logo est un lien vers l'application par défaut"

templates/js/_alwaysDisplayed.js

@@ -34,25 +34,32 @@ var alwaysDisplayed = function() {
 
     for (var i in fixedElements) {
         var element = fixedElements[i]
-        var value = window.getComputedStyle(element, null).getPropertyValue('left')
+        var computedStyle = window.getComputedStyle(element, null)
-        var intValue = parseInt(value.replace('px', ''))
+        var left = computedStyle.getPropertyValue('left')
+        var right = computedStyle.getPropertyValue('right')
 
+        if (right !== '0px') {
+            var intValue = parseInt(left.replace('px', ''))
             element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
         }
     }
+}
 
 let content = document.getElementById('content')
 
 if (content && content.classList.contains('app-settings')) {
     let loaded = false
-    const config = {attributes: false, childList: true, subtree: true}
+    const config = {
+        attributes: false,
+        childList: true,
+        subtree: true
+    }
     const observer = new MutationObserver(() => {
         if (loaded) {
             return;
         }
 
-        const element = content.querySelector('#app-category-your-apps')
+        const element = content.querySelector('#app-category-your-apps') || content.querySelector('#app-navigation ul')
-            || content.querySelector('#app-navigation ul')
 
         if (element) {
             loaded = true
@@ -65,4 +72,3 @@ if (content && content.classList.contains('app-settings')) {
 } else {
     window.setTimeout(alwaysDisplayed, 200)
 }
-

templates/settings/admin-form.php

@@ -288,8 +288,6 @@ $choicesSizes = [
                 src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
         </p>
 
-        <br>
-
         <div>
             <label for="side-menu-opener">
                 <?php p($l->t('Always displayed')); ?>
@@ -361,6 +359,52 @@ $choicesSizes = [
             </select>
         </div>
 
+        <p><em><?php p($l->t('The logo is a link to the default app')); ?></em></p>
+
+        <div>
+            <select id="side-menu-add-logo-link" name="add-logo-link" class="side-menu-setting">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['add-logo-link']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
+        <div>
+            <label for="side-menu-top-menu-apps">
+                <?php p($l->t('Apps that should not be displayed in the menu')); ?>
+            </label>
+        </div>
+
+        <p><em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em></p>
+
+        <p>
+            <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
+                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+            </a>
+        </p>
+
+        <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
+            <?php foreach ($_['apps'] as $app): ?>
+                <div>
+                    <input
+                        type="checkbox"
+                        name="big-menu-hidden-apps[]"
+                        value="<?php echo $app['id'] ?>"
+                        id="big-menu-hidden-app-<?php echo $app['id'] ?>"
+                        <?php if (in_array($app['id'], $_['big-menu-hidden-apps'])): ?>checked<?php endif; ?>
+                    />
+
+                    <label for="big-menu-hidden-app-<?php echo $app['id'] ?>">
+                        <?php echo p($l->t($app['name'])); ?>
+                    </label>
+                </div>
+            <?php endforeach; ?>
+        </div>
+
+        <br>
+
         <div>
             <label for="side-menu-show-settings">
                 <?php p($l->t('Show the link to settings')); ?>