release v1.6.4

README.md

@@ -6,43 +6,25 @@ This application is rather suitable for instances that activate a lot of applica
 
 Comptatible with AppOrder.
 
-Installation
+* [Installation and upgrade](#installation-and-upgrade)
-------------
+* [How to contribute?](#how-to-contribute)
+* [Preview](#preview)
 
-Side menu is availabe from the app store.
+Installation and upgrade
+------------------------
 
-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).
+Side menu is availabe 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`.
-
-Copy the archive to your Nextcloud server.
 
 ```
 $ cd /path/to/nextcloud/apps
 $ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
 ```
 
-Upgrade
+Administrators can edit many settings using the administration page.
--------
 
-Side menu can be upgraded from the app store.
+Users can disable the menu using the page of personal settings.
-
-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 archive to your Nextcloud server.
-
-```
-$ cd /path/to/nextcloud/apps
-$ rm -frv side_menu
-$ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
-```
-
-![](https://upload.deblan.org/u/2020-03/5e81b219.jpg)
-
-![](https://upload.deblan.org/u/2020-03/5e7fab2b.jpg)
-
-![](https://upload.deblan.org/u/2020-05/5eb6b76e.png)
-
-![](https://upload.deblan.org/u/2020-05/5eb6b78a.png)
 
+Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
 
 How to contribute?
 ------------------
@@ -59,3 +41,14 @@ If you are a developer:
 Build javascripts using `webpack --config ./webpack.js` (add `-w` to build them in real time).
 
 Then commit and create a pull request.
+
+Preview
+-------
+
+![](https://upload.deblan.org/u/2020-03/5e81b219.jpg)
+
+![](https://upload.deblan.org/u/2020-03/5e7fab2b.jpg)
+
+![](https://upload.deblan.org/u/2020-05/5eb6b76e.png)
+
+![](https://upload.deblan.org/u/2020-05/5eb6b78a.png)

appinfo/app.php

@@ -21,42 +21,51 @@ namespace OCA\SideMenu\Appinfo;
 
 use OC\Security\CSP\ContentSecurityPolicy;
 use OCP\Util;
+use OCP\IUserSession;
 
 $config = \OC::$server->getConfig();
 $cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
+$user = \OC::$server[IUserSession::class]->getUser();
 
+$enabled = true;
 
-Util::addScript('side_menu', 'sideMenu');
+if ($user !== null) {
-Util::addStyle('side_menu', 'sideMenu');
+    $enabled = (bool) $config->getUserValue($user->getUid(), 'side_menu', 'enabled', '1');
+}
 
-$stylesheet = \OC::$server->getURLGenerator()->linkToRoute(
+if ($enabled) {
-    'side_menu.Css.stylesheet',
+    Util::addScript('side_menu', 'sideMenu');
-    [
+    Util::addStyle('side_menu', 'sideMenu');
-        'v' => $config->getAppValue('side_menu', 'cache', '0'),
-    ]
-);
 
-$script = \OC::$server->getURLGenerator()->linkToRoute(
+    $stylesheet = \OC::$server->getURLGenerator()->linkToRoute(
-    'side_menu.Js.script',
+        'side_menu.Css.stylesheet',
-    [
+        [
-        'v' => $config->getAppValue('side_menu', 'cache', '0'),
+            'v' => $config->getAppValue('side_menu', 'cache', '0'),
-    ]
+        ]
-);
+    );
 
-Util::addHeader(
+    $script = \OC::$server->getURLGenerator()->linkToRoute(
-    'link',
+        'side_menu.Js.script',
-    [
+        [
-        'href' => $stylesheet,
+            'v' => $config->getAppValue('side_menu', 'cache', '0'),
-        'rel' => 'stylesheet'
+        ]
-    ],
+    );
-    ''
-);
 
-Util::addHeader(
+    Util::addHeader(
-    'script',
+        'link',
-    [
+        [
-        'src' => $script,
+            'href' => $stylesheet,
-		'nonce' => $cspnm->getNonce(),
+            'rel' => 'stylesheet'
-    ],
+        ],
-    ''
+        ''
-);
+    );
+
+    Util::addHeader(
+        'script',
+        [
+            'src' => $script,
+            'nonce' => $cspnm->getNonce(),
+        ],
+        ''
+    );
+}

appinfo/info.xml

@@ -6,6 +6,8 @@
     <description><![CDATA[Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface.
 This application is rather suitable for instances that activate a lot of applications.
 
+Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
+
 Comptatible with AppOrder.
 
 You can report a bug or request a feature by opening an issue.
@@ -13,7 +15,7 @@ You can report a bug or request a feature by opening an issue.
 ]]></description>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.5.0</version>
+    <version>1.6.4</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
@@ -24,10 +26,12 @@ You can report a bug or request a feature by opening an issue.
     <screenshot>https://upload.deblan.org/u/2020-05/5eb6b76e.png</screenshot>
     <screenshot>https://upload.deblan.org/u/2020-05/5eb6b78a.png</screenshot>
     <dependencies>
-        <nextcloud min-version="18" max-version="18"/>
+        <nextcloud min-version="18" max-version="19"/>
     </dependencies>
 	<settings>
 		<admin>OCA\SideMenu\Settings\Admin</admin>
-		<admin-section>OCA\SideMenu\Settings\Section</admin-section>
+		<admin-section>OCA\SideMenu\Settings\AdminSection</admin-section>
+		<personal>OCA\SideMenu\Settings\Personal</personal>
+		<personal-section>OCA\SideMenu\Settings\PersonalSection</personal-section>
 	</settings>
 </info>

appinfo/routes.php

@@ -21,5 +21,6 @@ return [
     'routes' => [
 		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
 		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
+		['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
     ],
 ];

css/admin.css

@@ -23,3 +23,12 @@
 #side-menu-section select {
     margin: 10px 0 10px 0;
 }
+
+.keyboard-key {
+    padding: 1px 9px;
+    margin: 0 2px;
+    background: #eee;
+    border: 1px solid #aaa;
+    color: #555;
+    border-radius: 3px;
+}

css/sideMenu.css

@@ -80,7 +80,7 @@
     white-space: nowrap;
 }
 
-.side-menu-app a:hover, .side-menu-app.active a {
+.side-menu-app a:hover, .side-menu-app.active, .side-menu-app a:focus {
     background: var(--side-menu-current-app-background-color, #444);
 }
 
@@ -107,3 +107,18 @@
 #side-menu.hide-opener .side-menu-logo {
     margin-top: 20px;
 }
+
+#side-menu-loader {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 3001;
+}
+
+#side-menu-loader-bar {
+    height: 4px;
+    background: var(--side-menu-loader-color, #0e75ac);
+    width: 0;
+    transition-property: width;
+}

lib/Controller/CssController.php

@@ -27,7 +27,9 @@ use OCP\IRequest;
 class CssController extends Controller
 {
 
-    /** @var \OCP\IConfig */
+    /**
+     * @var \OCP\IConfig
+     */
     protected $config;
 
     /**
@@ -59,6 +61,7 @@ class CssController extends Controller
                 'background-color' => $backgroundColor,
                 'background-color-to' => $backgroundColorTo,
                 'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
+                'loader-color' => $this->config->getAppValue('side_menu', 'loader-color', '#0e75ac'),
                 'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
                 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             ],

lib/Controller/JsController.php

@@ -27,7 +27,9 @@ use OCP\IRequest;
 class JsController extends Controller
 {
 
-    /** @var \OCP\IConfig */
+    /**
+     * @var \OCP\IConfig
+     */
     protected $config;
 
     /**
@@ -57,6 +59,7 @@ class JsController extends Controller
             'external-sites-in-top-menu' => (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0),
             'force-light-icon' => (bool) $this->config->getAppValue('side_menu', 'force-light-icon', '0'),
             'hide-when-no-apps' => (bool) $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
+            'loader-enabled' => (bool) $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
         ];
 
         $response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');

lib/Controller/PersonalSettingController.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IUserSession;
+
+class PersonalSettingController extends Controller
+{
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession)
+    {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return Response
+     */
+    public function valueSet($name, $value)
+    {
+        $doSave = false;
+        $user = $this->userSession->getUser();
+
+        if ($name === 'enabled') {
+            $doSave = true;
+
+            if (!in_array($value, ['0', '1'])) {
+                $value = '1';
+            }
+        }
+
+        if ($doSave) {
+            $this->config->setUserValue($user->getUid(), 'side_menu', 'enabled', $value);
+        }
+
+        return [];
+    }
+}

lib/Settings/Admin.php

@@ -26,13 +26,19 @@ use OCP\IConfig;
 
 class Admin implements ISettings
 {
-    /** @var IL10N */
+    /**
+     * @var IL10N
+     */
     private $l;
 
-    /** @var ILogger */
+    /**
+     * @var ILogger
+     */
     private $logger;
 
-    /** @var IConfig */
+    /**
+     * @var IConfig
+     */
     private $config;
 
     public function __construct(IL10N $l, ILogger $logger, IConfig $config)
@@ -54,6 +60,8 @@ class Admin implements ISettings
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
             'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
+            'loader-color' => $this->config->getAppValue('side_menu', 'loader-color', '#0e75ac'),
+            'loader-enabled' => $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
             'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
             'force-light-icon' => $this->config->getAppValue('side_menu', 'force-light-icon', '0'),
             'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),

lib/Settings/AdminSection.php

@@ -22,12 +22,16 @@ use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
-class Section implements IIconSection
+class AdminSection implements IIconSection
 {
-    /** @var IL10N */
+    /**
+     * @var IL10N
+     */
     private $l;
 
-    /** @var IURLGenerator */
+    /**
+     * @var IURLGenerator
+     */
     private $url;
 
     /**

lib/Settings/Personal.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Settings;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\Settings\ISettings;
+use OCP\IConfig;
+use OCP\IUserSession;
+
+class Personal implements ISettings
+{
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    public function __construct(IL10N $l, ILogger $logger, IConfig $config, IUserSession $userSession)
+    {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm()
+    {
+        $user = $this->userSession->getUser();
+
+        $parameters = [
+            'enabled' => $this->config->getUserValue($user->getUid(), 'side_menu', 'enabled', '1'),
+        ];
+
+        return new TemplateResponse('side_menu', 'settings/personal-form', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection()
+    {
+        return 'side_menu';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority()
+    {
+        return 70;
+    }
+}

lib/Settings/PersonalSection.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Settings;
+
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\IIconSection;
+
+class PersonalSection implements IIconSection
+{
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var IURLGenerator
+     */
+    private $url;
+
+    /**
+     * @param IURLGenerator $url
+     * @param IL10N $l
+     */
+    public function __construct(IURLGenerator $url, IL10N $l)
+    {
+        $this->url = $url;
+        $this->l = $l;
+    }
+
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID()
+    {
+        return 'side_menu';
+    }
+
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->l->t('Side menu');
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority()
+    {
+        return 70;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIcon()
+    {
+        return $this->url->imagePath('theming', 'app-dark.svg');
+    }
+}

package.json

@@ -13,6 +13,7 @@
 	"dependencies": {
 		"@nextcloud/axios": "^1.3.2",
 		"@nextcloud/vue": "^1.4.0",
+		"trim": "0.0.1",
 		"vue": "^2.6.11"
 	},
 	"browserslist": [

src/SideMenu.vue

@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
         <ul class="side-menu-apps-list">
             <li v-for="app in apps" v-bind:class="{'side-menu-app': true, 'active': app.active}">
-                <a v-bind:href="app.href">
+                <a v-bind:href="app.href" v-bind:title="app.name">
                      <span class="side-menu-app-icon" v-html="app.icon"></span>
                      <span class="side-menu-app-text" v-html="app.name"></span>
                 </a>
@@ -36,53 +36,63 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
+import trim from 'trim'
+
 export default {
     name: 'SideMenu',
     data() {
         return {
             apps: [],
             logo: null,
-			forceLightIcon: false,
+            forceLightIcon: false,
         }
     },
     methods: {
         retrieveApps() {
-			this.apps = []
+            this.apps = []
             const links = document.querySelectorAll('#appmenu a')
 
             for (let element of links) {
                 let href = element.getAttribute('href')
+                var parent = element.parentNode
 
-				if (this.ignoreExternalSites && element.parentNode.getAttribute('data-id').indexOf('external_index') !== -1) {
+                if (!parent) {
-					continue;
+                    continue
-				}
+                }
+
+                var dataId = parent.getAttribute('data-id')
+                dataId = dataId !== null ? dataId : ''
+
+                if (this.ignoreExternalSites && dataId.indexOf('external_index') !== -1) {
+                    continue
+                }
 
                 if (href !== '#') {
                     let svg = element.querySelector('svg').outerHTML
 
                     svg = svg
-						.replace(/(height|width)="20"/, '')
+                        .replace(/(height|width)="20"/, '')
-						.replace('id="invertMenuMain', 'id="invertSideMenu')
+                        .replace('id="invertMenuMain', 'id="invertSideMenu')
-						.replace('url(#invertMenuMain', 'url(#invertSideMenu')
+                        .replace('url(#invertMenuMain', 'url(#invertSideMenu')
 
-					if (this.forceLightIcon) {
+                    if (this.forceLightIcon) {
-						svg = svg.replace(/filter="url[^"]+"/, '')
+                        svg = svg.replace(/filter="url[^"]+"/, '')
-					}
+                    }
 
                     this.apps.push({
                         href: href,
-                        name: element.querySelector('span').innerHTML,
+                        name: trim(element.querySelector('span').innerHTML),
                         icon: svg,
                         active: element.classList.contains('active')
                     });
                 }
             }
 
-			(function(apps) {
+            (function(apps) {
-				window.setTimeout(function() {
+                window.setTimeout(function() {
-					jQuery('body').trigger('side-menu.apps', [apps])
+                    jQuery('body').trigger('side-menu.apps', [apps])
-				}, 1000)
+                }, 1000)
-			})(this.apps)
+            })(this.apps)
         },
         retrieveLogo() {
             const ncLogo = document.querySelector('#nextcloud .logo')
@@ -102,8 +112,8 @@ export default {
     mounted() {
         this.retrieveApps()
         this.retrieveLogo()
-		this.forceLightIcon = document.querySelector('#side-menu-container').getAttribute('data-forcelighticon') == 1;
+        this.forceLightIcon = document.querySelector('#side-menu-container').getAttribute('data-forcelighticon') == 1;
-		this.ignoreExternalSites = document.querySelector('#side-menu-container').getAttribute('data-externalsitesintopmenu') == 1;
+        this.ignoreExternalSites = document.querySelector('#side-menu-container').getAttribute('data-externalsitesintopmenu') == 1;
 
         const menu = document.querySelector('#appmenu')
 

src/admin.js

@@ -15,37 +15,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const elements = [
+let elements = []
-    'side-menu-background-color',
-    'side-menu-background-color-to',
-    'side-menu-current-app-background-color',
-    'side-menu-text-color',
-    'side-menu-force-light-icon',
-    'side-menu-opener',
-    'side-menu-opener-position',
-    'side-menu-opener-hover',
-    'side-menu-opener-only',
-    'side-menu-display-logo',
-    'side-menu-hide-when-no-apps',
-    'side-menu-size-icon',
-    'side-menu-size-text',
-    'side-menu-cache',
-    'side-menu-external-sites-in-top-menu',
-];
 
 const selector = '#side-menu-message';
 
+const userConfig = (name, value, callbacks) => {
+    const url = OC.generateUrl('/apps/side_menu/personalSetting/valueSet')
+
+    $.post(url, {name: name, value: value}, callbacks.success)
+        .fail(callbacks.error)
+}
+
+const appConfig = (name, value, callbacks) => {
+    OCP.AppConfig.setValue('side_menu', name, value, callbacks)
+}
+
 const saveSettings = (key) => {
-    const element = elements[key]
+    const element = elements.get(key)
-    const name = $('#' + element).attr('name')
+    const name = $(element).attr('name')
-    let value = $('#' + element).val()
+    let value = $(element).val()
     const size = elements.length
 
     if (element === 'side-menu-cache') {
         value++
     }
 
-    OCP.AppConfig.setValue('side_menu', name, value, {
+    const callbacks = {
         success: () => {
             OC.msg.finishedSuccess(
                 selector,
@@ -61,10 +56,18 @@ const saveSettings = (key) => {
         error: () => {
             OC.msg.finishedError(selector, t('side_menu', 'Error while saving "' + element + '"'))
         }
-    });
+    }
+
+    if ($(element).is('[data-personal]')) {
+        userConfig(name, value, callbacks)
+    } else {
+        appConfig(name, value, callbacks)
+    }
 }
 
 $(document).ready(() => {
+    elements = $('.side-menu-setting')
+
     $('#side-menu-save').on('click', (event) => {
         event.preventDefault()
         OC.msg.startSaving(selector)

templates/css/stylesheet.php

@@ -12,11 +12,15 @@
     #appmenu {
         display: none;
     }
-<?php endif; ?>
 
-#appmenu + nav {
+    #appmenu + nav {
-    display: none;
+        display: none;
-}
+    }
+<?php else: ?>
+    .app-hidden {
+        opacity: 0;
+    }
+<?php endif; ?>
 
 <?php if ($_['opener-only'] === true): ?>
     #nextcloud {
@@ -42,11 +46,6 @@
         visibility: hidden;
     }
 
-    #side-menu.hide-opener .side-menu-apps-list {
-        /* height: calc(100vh);
-        top: 0; */
-    }
-
     <?php if ($_['size-text'] === 'hidden'): ?>
         #side-menu, .side-menu-apps-list {
             <?php if ($_['size-icon'] === 'big'): ?>

templates/js/script.php

@@ -9,30 +9,6 @@
         sideMenuContainer.attr('data-forcelighticon', '1')
     <?php endif; ?>
 
-    <?php if ($_['external-sites-in-top-menu']): ?>
-        sideMenuContainer.attr('data-externalsitesintopmenu', '1')
-
-        var externalSitesInTopMenu = function() {
-            var items = $('#appmenu').find('li')
-
-            items.each(function(i, item) {
-                var dataId = item.getAttribute('data-id')
-
-                if (dataId === null || dataId.indexOf('external_index') === -1) {
-                    item.style.display = 'none'
-                    item.classList.remove('hidden')
-                } else {
-                    item.style.display = 'flex'
-                    item.classList.add('hidden')
-                }
-            })
-        }
-
-        $(window).resize(externalSitesInTopMenu);
-
-        setInterval(externalSitesInTopMenu, 500);
-    <?php endif; ?>
-
     body.on('side-menu.apps', function(e, apps) {
         <?php if ($_['hide-when-no-apps']): ?>
             sideMenu = $('#side-menu')
@@ -52,6 +28,18 @@
         var headerMenuOpener = $('#header .side-menu-opener')
         var sideMenuOpener = $('#side-menu .side-menu-opener')
 
+        sideMenuFocus = function() {
+            var a = sideMenu.find('.side-menu-app.active a')
+
+            if (a.length === 0) {
+                a = sideMenu.find('.side-menu-app:first-child a')
+            }
+
+            if (a.length > 0) {
+                a.focus()
+            }
+        }
+
         <?php if ($_['opener-hover']): ?>
             var sideMenuMouseLeave = function() {
                 sideMenu
@@ -67,6 +55,8 @@
                 sideMenu
                     .addClass('open')
                     .on('mouseenter', sideMenuMouseEnter)
+
+                sideMenuFocus()
             }
 
             if (!isTouchDevice) {
@@ -77,20 +67,170 @@
         <?php endif; ?>
 
         headerMenuOpener.on('click', function() {
-            sideMenu.addClass('open');
+            sideMenu.addClass('open')
+            sideMenu.find('.side-menu-app.active a').focus()
         })
 
         sideMenuOpener.on('click', function() {
-            sideMenu.removeClass('open');
+            sideMenu.removeClass('open')
+        })
+
+        $(document).keydown(function(e) {
+            var key = e.key || e.keyCode
+
+            if ((key === 'o' || key === 79) && e.ctrlKey === true) {
+                e.preventDefault()
+
+                sideMenu.toggleClass('open')
+                sideMenuFocus()
+            }
         })
     })
 
     body.append(sideMenuContainer)
     sideMenuContainer.append(sideMenu)
 
+    <?php if ($_['loader-enabled'] === true): ?>
+        var pageLoader = $('<div id="side-menu-loader">')
+        var pageLoaderBar = $('<div id="side-menu-loader-bar">')
+
+        body.append(pageLoader)
+        pageLoader.append(pageLoaderBar)
+
+        var pageLoaderValue = 0
+
+        $(window).on('beforeunload', function() {
+            setInterval(function() {
+                pageLoaderBar.width(pageLoaderValue.toString() + '%')
+
+                pageLoaderValue = Math.min(pageLoaderValue + .2, 100)
+            }, 25)
+        })
+    <?php endif; ?>
+
     <?php if ($_['opener-position'] === 'before'): ?>
         sideMenuOpener.insertBefore('#nextcloud')
     <?php else: ?>
         sideMenuOpener.insertAfter('#nextcloud')
     <?php endif; ?>
+
+    <?php if ($_['external-sites-in-top-menu']): ?>
+        sideMenuContainer.attr('data-externalsitesintopmenu', '1')
+
+        var menuCache = null
+
+        var updateTopMenu = function() {
+            var breakpointMobileWidth = 1024
+            var menu = $('#appmenu')
+            var apps = menu.find('li')
+            var minAppsDesktop = 8
+            var usePercentualAppMenuLimit = 0.9
+            var isMobile = $(window).width() < breakpointMobileWidth
+            var lastShownApp = null
+            var appShown = []
+            var moreApps = $('#more-apps')
+            var navigation = $('#navigation')
+            var navigationApps = $('#apps ul')
+            var appCount = null
+
+            var currentMenuCache = menu.html() + menu.next().html()
+
+            if (currentMenuCache === menuCache) {
+                return
+            }
+
+            navigationApps.html('')
+
+            apps.each(function(i, app) {
+                var dataId = app.getAttribute('data-id')
+
+                if (dataId === null) {
+                    return
+                }
+
+                if (dataId.indexOf('external_index') === -1) {
+                    app.classList.add('hidden')
+                    app.classList.add('app-hidden')
+                } else {
+                    app.classList.remove('hidden')
+                    app.classList.add('app-external-site')
+                    appShown.push(app)
+                    navigationApps.append(app.outerHTML)
+                }
+            })
+
+            var rightHeaderWidth = $('.header-right').outerWidth()
+            var headerWidth = $('header').outerWidth()
+            var availableWidth = headerWidth - $('#nextcloud').outerWidth() - $('#header .side-menu-opener').outerWidth() - (rightHeaderWidth > 210 ? rightHeaderWidth : 210)
+
+            if (!isMobile) {
+                availableWidth = availableWidth * usePercentualAppMenuLimit
+            }
+
+            if (isMobile && appCount > minAppsDesktop) {
+                appCount = minAppsDesktop
+            } else if (!isMobile && appCount < minAppsDesktop) {
+                appCount = minAppsDesktop
+            } else {
+                appCount = Math.floor(availableWidth / $('#appmenu li').width())
+            }
+
+            if (appCount === 0) {
+                menu.addClass('hidden')
+            }
+
+            menu.removeClass('hidden')
+            menu.css('opacity', 1)
+
+            if (appShown.length - 1 - appCount >= 1) {
+                appCount--
+            }
+
+            moreApps.find('a').removeClass('active')
+
+            var k = 0
+            var notInHeader = 0
+            var name
+
+            $(appShown).each(function(i, app) {
+                app = $(app)
+                name = app.data('id')
+
+                if (k < appCount && appCount > 0) {
+                    app.removeClass('hidden')
+                    lastShownApp = app
+
+                    $('#apps li[data-id=' + name + '].app-external-site').addClass('in-header')
+                } else {
+                    app.addClass('hidden')
+                    notInHeader++
+
+                    $('#apps li[data-id=' + name + '].app-external-site').removeClass('in-header')
+
+                    if (appCount > 0 && app.children('a').hasClass('active')) {
+                        lastShownApp.addClass('hidden')
+                        app.removeClass('hidden')
+                        notInHeader++
+
+                        $('#apps li[data-id=' + name + '].app-external-site')
+                            .removeClass('in-header')
+                            .addClass('in-header')
+                    }
+                }
+
+                k++
+            })
+
+            if (notInHeader === 0) {
+                moreApps.hide()
+                navigation.hide()
+            } else {
+                moreApps.show()
+            }
+
+            menuCache = menu.html() + menu.next().html()
+        }
+
+        setInterval(updateTopMenu, 50)
+    <?php endif; ?>
 })();

templates/settings/admin-form.php

@@ -49,11 +49,13 @@ $choicesSizes = [
                 id="side-menu-background-color"
                 name="background-color"
                 type="color"
+                class="side-menu-setting"
                 value="<?php print_unescaped($_['background-color']); ?>">
             <input
                 id="side-menu-background-color-to"
                 name="background-color-to"
                 type="color"
+                class="side-menu-setting"
                 value="<?php print_unescaped($_['background-color-to']); ?>">
         </div>
 
@@ -67,6 +69,7 @@ $choicesSizes = [
                 id="side-menu-current-app-background-color"
                 name="current-app-background-color"
                 type="color"
+                class="side-menu-setting"
                 value="<?php print_unescaped($_['current-app-background-color']); ?>">
         </div>
 
@@ -80,6 +83,7 @@ $choicesSizes = [
                 id="side-menu-text-color"
                 name="text-color"
                 type="color"
+                class="side-menu-setting"
                 value="<?php print_unescaped($_['text-color']); ?>">
         </div>
 
@@ -90,7 +94,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-force-light-icon" name="force-light-icon">
+            <select id="side-menu-force-light-icon" name="force-light-icon" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['force-light-icon']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -98,6 +102,20 @@ $choicesSizes = [
                 <?php endforeach; ?>
             </select>
         </div>
+
+        <div>
+            <label for="side-menu-text-color" class="settings-hint">
+                <?php p($l->t('Loader')); ?>
+            </label>
+        </div>
+        <div>
+            <input
+                id="side-menu-loader-color"
+                name="loader-color"
+                type="color"
+                class="side-menu-setting"
+                value="<?php print_unescaped($_['loader-color']); ?>">
+        </div>
     </div>
 
     <div class="section">
@@ -123,7 +141,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-opener" name="opener">
+            <select id="side-menu-opener" name="opener" class="side-menu-setting">
                 <?php foreach ($choices as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -146,7 +164,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-opener-position" name="opener-position">
+            <select id="side-menu-opener-position" name="opener-position" class="side-menu-setting">
                 <?php foreach ($choices as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['opener-position']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -162,7 +180,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-opener-only" name="opener-only">
+            <select id="side-menu-opener-only" name="opener-only" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['opener-only']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -178,7 +196,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps">
+            <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['hide-when-no-apps']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -200,7 +218,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-opener-hover" name="opener-hover">
+            <select id="side-menu-opener-hover" name="opener-hover" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['opener-hover']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -209,6 +227,9 @@ $choicesSizes = [
             </select>
         </div>
 
+        <p>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> 
+         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</p>
+
         <div>
             <label for="side-menu-opener" class="settings-hint">
                 <?php p($l->t('Display the logo')); ?>
@@ -216,7 +237,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-display-logo" name="display-logo">
+            <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -232,7 +253,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-size-icon" name="size-icon">
+            <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
                 <?php foreach ($choicesSizes as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?> icon
@@ -240,7 +261,7 @@ $choicesSizes = [
                 <?php endforeach; ?>
             </select>
 
-            <select id="side-menu-size-text" name="size-text">
+            <select id="side-menu-size-text" name="size-text" class="side-menu-setting">
                 <?php foreach ($choicesSizes as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?> text
@@ -249,6 +270,22 @@ $choicesSizes = [
             </select>
         </div>
 
+        <div>
+            <label for="side-menu-loader-enabled" class="settings-hint">
+                <?php p($l->t('Loader enabled')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['loader-enabled']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
         <div>
             <label for="side-menu-external-sites-in-top-menu" class="settings-hint">
                 <?php p($l->t('Do not move external sites in the side menu')); ?>
@@ -257,7 +294,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <select id="side-menu-external-sites-in-top-menu" name="external-sites-in-top-menu">
+            <select id="side-menu-external-sites-in-top-menu" name="external-sites-in-top-menu" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
                     <option value="<?php echo $value ?>" <?php if ($value === $_['external-sites-in-top-menu']): ?>selected<?php endif; ?>>
                         <?php echo $l->t($label);  ?>
@@ -268,7 +305,16 @@ $choicesSizes = [
     </div>
 
     <div class="section">
-        <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
+        <h2>
+            <?php p($l->t('Tips')); ?>
+        </h2>
+
+        <p class="settings-hint">Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> 
+         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</p>
+    </div>
+
+    <div class="section">
+        <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting">
 
         <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
 

templates/settings/personal-form.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * @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/>.
+ */
+
+script('side_menu', 'admin');
+style('side_menu', 'admin');
+style('side_menu', 'support');
+
+$choicesYesNo = [
+    'No' => '0',
+    'Yes' => '1',
+];
+
+?>
+
+<div id="side-menu-section">
+    <div class="section">
+        <h2>
+            <?php p($l->t('Menu')); ?>
+        </h2>
+
+        <div>
+            <label for="side-menu-enabled" class="settings-hint">
+                <?php p($l->t('Enable the side menu')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
+        <p>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> 
+         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</p>
+    </div>
+
+    <div class="section">
+        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+
+        <span id="side-menu-message" class="msg"></span>
+
+        <div style="height: 30px"></div>
+
+        <div>
+            <span for="side-menu-opener" class="settings-hint">
+                <?php p($l->t('You like this app and you want to support me?')); ?>
+
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                    <button>
+                        <?php p($l->t('Buy me a coffe ☕')); ?>
+                    </button>
+                </a>
+            </span>
+        </div>
+    </div>
+</div>