release v1.20.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
+
+* Side 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

@@ -14,14 +14,27 @@ Comptatible with AppOrder.
 
 You like this app and you want to support me? [Buy me a coffee](https://www.buymeacoffee.com/deblan) ☕
 
+Requirements
+------------
+
+* PHP >= 7.3
+* App `theming` enabled
+
 Installation and upgrade
 ------------------------
 
-Custom menu is available from the app store. If you want to install it from source: go to https://gitnet.fr/deblan/side_menu/releases and download the last release (side_menu_vX.Y.Z.zip). Copy the content into `apps`.
+Custom menu is available from the app store.
+
+```
+$ cd /path/to/nextcloud
+$ php occ app:install side_menu
+```
+
+If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/releases and copy the link to the last release (side_menu_vX.Y.Z.tar.gz). Then:
 
 ```
 $ cd /path/to/nextcloud/apps
-$ unzip /path/to/side_menu_vX.Y.Z.zip # tar xvf /path/to/side_menu_vX.Y.Z.tar.gz
+$ curl -sS https://gitnet.fr/attachments/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | tar xvfz -
 ```
 
 Administrators can edit many settings using the administration page.

appinfo/info.xml

@@ -15,12 +15,17 @@ 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:
+
+* PHP >= 7.3
+* 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)
 * 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.18.0</version>
+    <version>1.20.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/AppInfo/Application.php

@@ -58,7 +58,16 @@ class Application extends App
         $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
 
         if (null !== $this->user && !$isForced) {
-            $enabled = (bool) $this->config->getUserValue($this->user->getUid(), self::APP_ID, 'enabled', '1');
+            $enabled = (bool) $this->config->getUserValue(
+                $this->user->getUid(),
+                self::APP_ID,
+                'enabled',
+                $this->config->getAppValue(
+                    self::APP_ID,
+                    'default-enabled',
+                    '1'
+                )
+            );
         }
 
         return $enabled;

lib/Controller/JsController.php

@@ -150,6 +150,7 @@ 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,

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,6 +77,7 @@ 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'),
             'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
@@ -89,6 +90,7 @@ class Admin implements ISettings
             'force' => $this->config->getAppValue('force', '0'),
             'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
             'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
+            'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
             'apps' => $this->appRepository->getVisibleApps(),
         ];
 

lib/Settings/Personal.php

@@ -72,7 +72,11 @@ class Personal implements ISettings
 
         $parameters = [
             'force' => $this->config->getAppValueBool('force', '0'),
-            'enabled' => $this->config->getUserValue($user, 'enabled', '1'),
+            'enabled' => $this->config->getUserValue(
+                $user,
+                'enabled',
+                $this->config->getAppValue('default-enabled', '1')
+            ),
             'top-menu-apps' => $this->config->getUserValueArray($user, 'top-menu-apps', '[]'),
             'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
             'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),

src/CloserButton.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <button class="side-menu-opener side-menu-closer"></button>
 </template>

src/Loader.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <div class="side-menu-loader">
         <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">

src/Logo.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <div v-bind:class="classes">
         <img v-bind:src="image">

src/OpenerButton.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <button class="side-menu-opener"></button>
 </template>

src/SettingsButton.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <div class="side-menu-settings">
         <a v-bind:href="href">

src/SideMenuApp.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">

src/SideMenuBigApp.vue

@@ -1,3 +1,19 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
 <template>
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">

src/l10n/fixtures/de.yaml

@@ -62,3 +62,5 @@
 "Export the configuration": "Exportieren Sie die Konfiguration"
 "Purge the cache": "Leeren Sie den Cache"
 "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."

src/l10n/fixtures/fr.yaml

@@ -62,3 +62,5 @@
 "Export the configuration": "Exporter la configuration"
 "Purge the cache": "Purger le cache"
 "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."

templates/js/_alwaysDisplayed.js

@@ -34,10 +34,14 @@ 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')
 
-        element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+        if (right !== '0px') {
+            var intValue = parseInt(left.replace('px', ''))
+            element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+        }
     }
 }
 
@@ -45,14 +49,17 @@ 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,40 @@ $choicesSizes = [
             </select>
         </div>
 
+        <div>
+            <label for="side-menu-top-menu-apps">
+                <?php p($l->t('Apps that not must show 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')); ?>
@@ -496,11 +528,29 @@ $choicesSizes = [
     </div>
 
     <div class="section">
+        <div>
+            <label for="side-menu-default-enabled">
+                <?php p($l->t('The menu is enabled by default for users')); ?>
+            </label>
+
+            <p><em><?php p($l->t('Except when the configuration is forced.')); ?></em></p>
+
+            <select id="side-menu-default-enabled" name="default-enabled" class="side-menu-setting">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['default-enabled']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
         <div>
             <label for="side-menu-opener-only">
                 <?php p($l->t('Force this configuration to users')); ?>
             </label>
+        </div>
 
+        <div>
             <select id="side-menu-force" name="force" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>selected<?php endif; ?>>