Merge pull request 'release v2.5.0' (#132) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/132

.drone.yml

@@ -1,54 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: dependencies
-    image: deblan/devenv
-    commands:
-      - npm install
-
-  - name: build
-    image: deblan/devenv
-    commands:
-      - make npm-build
-    when:
-      branch:
-        exclude:
-          - master
-        include:
-          - develop
-          - feature/*
-      event:
-        - push
-        - pull_request
-
-  - name: release
-    image: deblan/devenv
-    volumes:
-      - name: artifacts
-        path: /artifacts
-    environment:
-      APP_CERTIFICATE:
-        from_secret: app_certificate
-    commands:
-      - mkdir -p "$HOME/.nextcloud/certificates"
-      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
-      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
-      - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu"
-      - make release
-    when:
-      branch:
-        exclude:
-          - develop
-          - feature/*
-        include:
-          - master
-      event:
-        - push
-
-volumes:
-  - name: artifacts
-    host:
-      path: /var/www/html/artifacts

.stylelintrc.json

@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "indentation": 4
+    }
+}

.woodpecker.yml

@@ -0,0 +1,42 @@
+pipeline:
+  dependencies:
+    image: deblan/devenv
+    commands:
+      - npm install
+    when:
+      event: [tag, push, pull_request]
+      branch: [master, develop, feature/*]
+
+  build:
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      event: [push, pull_request]
+
+  package:
+    image: deblan/devenv
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    secrets: [app_certificate]
+    commands:
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
+      - make release
+    when:
+      event: [tag]
+
+  release:
+    image: plugins/gitea-release
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    settings:
+      api_key:
+        from_secret: gitnet_api_key
+      base_url: https://gitnet.fr
+      note: ${CI_COMMIT_MESSAGE}
+      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
+    when:
+      event: [tag]

CHANGELOG.md

@@ -1,5 +1,50 @@
 ## [Unreleased]
 
+## 2.5.0
+### Changed
+* upgrade dependencies
+### Fixed
+* remove duplicated code
+* remove unused variables and packages
+* replace repeated strings with variables
+* add html attributes
+* replace var with let
+* replace v-html with v-text to prevent xss
+
+## 2.4.3
+### Fixed
+* fix translations
+
+## 2.4.2
+### Fixed
+* fix typo
+### Changed
+* change ci/cd
+
+## 2.4.1
+### Fixed
+* fix user setting save
+
+## 2.4.0
+### Added
+* remove focus on opener after click
+* add button to set default colors
+* add menu hover effect
+* add translations
+### Fixed
+* fix deprecated app.php file
+* fix menu with categories header
+* fix minor issues
+### Changed
+* change saving progression
+### Removed
+* Nextcloud 19 is not supported anymore
+* PHP 7.3 is not supported anymore
+
+## 2.3.5
+### Fixed
+* fix white square (#99)
+
 ## 2.3.4
 ### Fixed
 * fix blank line when settings are open (#96)

Makefile

@@ -26,3 +26,8 @@ release: npm-build translations
 
 translations:
 	php bin/generate_l10n.php
+
+.ONESHELL:
+run-code-quality-analysis:
+	export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
+	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr

README.md

@@ -15,10 +15,12 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
 
 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)
 
+[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
+
 Requirements
 ------------
 
-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled
 
 Installation and upgrade

appinfo/app.php

@@ -1,10 +0,0 @@
-<?php
-
-use OCA\SideMenu\AppInfo\Application;
-
-$app = new Application();
-
-if ($app->isEnabled()) {
-    $app->registerAssets();
-    $app->registerServices();
-}

appinfo/info.xml

@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
 
 Requirements:
 
-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>2.3.4</version>
+    <version>2.5.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -46,8 +46,8 @@ If you like this application and if you want to support the development:
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
     <dependencies>
-        <nextcloud min-version="19" max-version="23"/>
-        <php min-version="7.3"/>
+        <nextcloud min-version="20" max-version="24"/>
+        <php min-version="7.4"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

css/admin.css

@@ -129,3 +129,18 @@
 .side-menu-setting-form-long {
     width: 400px;
 }
+
+#side-menu-save-progress {
+    display: inline-block;
+    width: 0;
+    height: 15px;
+    background: #fff;
+}
+
+.btn-reset {
+    display: inline-block;
+    cursor: pointer;
+    position: absolute;
+    margin-top: 17px;
+    margin-left: 5px;
+}

css/sideMenu.css

@@ -29,6 +29,10 @@
     display: none;
 }
 
+#side-menu a {
+    transition: 0.2s;
+}
+
 #side-menu.open {
     display: block;
 }
@@ -59,6 +63,8 @@
 .side-menu-settings img {
     vertical-align: bottom;
     margin-left: 3px;
+    width: 32px;
+    height: 32px;
 }
 
 #side-menu.open .side-menu-settings {
@@ -78,8 +84,8 @@
     margin-left: 3px !important;
 }
 
-.side-menu-opener:active {
-    background-color: var(--color-background-dark) !important;
+.side-menu-opener:active, .side-menu-opener:focus {
+    background-color: var(--side-menu-current-app-background-color, #444) !important;
 }
 
 .side-menu-closer {
@@ -151,6 +157,10 @@
     top: 0;
 }
 
+#side-menu.side-menu-with-categories .side-menu-header {
+    max-width: 295px;
+}
+
 #side-menu.hide-opener .side-menu-logo {
     margin-top: 20px;
 }
@@ -305,6 +315,7 @@
 @media screen and (max-width: 1024px) {
     #side-menu.side-menu-big {
         max-width: 290px;
+        height: 100vh;
     }
 
     .side-menu-categories {
@@ -315,10 +326,6 @@
     .side-menu-category {
         padding: 10px 0;
     }
-
-    #side-menu.side-menu-big {
-        height: 100vh;
-    }
 }
 
 @media screen and (min-width: 1024px) {

lib/AppInfo/Application.php

@@ -9,6 +9,9 @@ use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\IUserSession;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
@@ -18,7 +21,7 @@ use Psr\Container\ContainerInterface;
  *
  * @author Simon Vieille <simon@deblan.fr>
  */
-class Application extends App
+class Application extends App implements IBootstrap
 {
     public const APP_ID = 'side_menu';
 
@@ -44,16 +47,9 @@ class Application extends App
     public function __construct(array $urlParams = [])
     {
         parent::__construct(self::APP_ID, $urlParams);
-
-        $this->config = OC::$server->getConfig();
-        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
-        $this->user = OC::$server[IUserSession::class]->getUser();
     }
 
-    /**
-     * Checks if this app is enabled.
-     */
-    public function isEnabled(): bool
+    protected function isEnabled(): bool
     {
         $enabled = true;
         $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
@@ -74,64 +70,65 @@ class Application extends App
         return $enabled;
     }
 
-    /**
-     * Registes services.
-     */
-    public function registerServices()
-    {
-        $container = $this->getContainer();
-
-        $container->registerService('AppRepository', function (ContainerInterface $c) {
-            return new AppRepository();
-        });
-
-        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
-            return new CategoryRepository();
-        });
-
-        $container->registerService('ConfigProxy', function (ContainerInterface $c) {
-            return new ConfigProxy();
-        });
-    }
-
-    /**
-     * Registers assets.
-     */
-    public function registerAssets()
+    protected function addAssets()
     {
         Util::addScript(self::APP_ID, 'sideMenu');
         Util::addStyle(self::APP_ID, 'sideMenu');
 
-        $stylesheet = OC::$server->getURLGenerator()->linkToRoute(
-            'side_menu.Css.stylesheet',
-            [
-                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
-            ]
-        );
-
-        $script = OC::$server->getURLGenerator()->linkToRoute(
-            'side_menu.Js.script',
-            [
-                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
-            ]
-        );
-
-        Util::addHeader(
-            'link',
-            [
-                'href' => $stylesheet,
-                'rel' => 'stylesheet',
+        $assets = [
+            'stylesheet' => [
+                'route' => 'side_menu.Css.stylesheet',
+                'type' => 'link',
+                'route_attr' => 'href',
+                'attr' => [
+                    'rel' => 'stylesheet',
+                ],
             ],
-            ''
-        );
-
-        Util::addHeader(
-            'script',
-            [
-                'src' => $script,
-                'nonce' => $this->cspnm->getNonce(),
+            'script' => [
+                'route' => 'side_menu.Js.script',
+                'type' => 'script',
+                'route_attr' => 'src',
+                'attr' => [
+                    'nonce' => $this->cspnm->getNonce(),
+                ],
             ],
-            ''
-        );
+        ];
+
+        $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
+
+        foreach ($assets as $value) {
+            $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
+            $value['attr'][$value['route_attr']] = $route;
+
+            Util::addHeader($value['type'], $value['attr'], '');
+        }
+    }
+
+    public function register(IRegistrationContext $context): void
+    {
+        $context->registerService('AppRepository', function () {
+            return new AppRepository();
+        });
+
+        $context->registerService('CategoryRepository', function () {
+            return new CategoryRepository();
+        });
+
+        $context->registerService('ConfigProxy', function () {
+            return new ConfigProxy();
+        });
+    }
+
+    public function boot(IBootContext $context): void
+    {
+        $this->config = OC::$server->getConfig();
+        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = OC::$server[IUserSession::class]->getUser();
+
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        $this->addAssets();
     }
 }

lib/Controller/AdminSettingController.php

@@ -69,7 +69,7 @@ class AdminSettingController extends Controller
     public function exportConfiguration()
     {
         $keys = $this->config->getAppKeys(Application::APP_ID);
-        $config = [];
+        $appConfig = [];
         $excludedKeys = [
             'cache',
             'cache-categories',
@@ -80,11 +80,11 @@ class AdminSettingController extends Controller
                 continue;
             }
 
-            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+            $appConfig[$key] = $this->config->getAppValue(Application::APP_ID, $key);
         }
 
         return new DataDownloadResponse(
-            json_encode($config, JSON_PRETTY_PRINT),
+            json_encode($appConfig, JSON_PRETTY_PRINT),
             'config.json',
             'text/json'
         );

lib/Service/AppRepository.php

@@ -53,7 +53,6 @@ class AppRepository
     {
         $navigation = $this->ocApp->getNavigation();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
-        $categoriesCustom = $this->config->getAppValueArray('categories-custom', '[]');
         $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();
         $visibleApps = [];

lib/Settings/Admin.php

@@ -110,6 +110,18 @@ class Admin implements ISettings
         $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
 
         $parameters = [
+            'defaults' => [
+                'background-color' => $darkenPrimaryColor,
+                'background-color-to' => $darkenPrimaryColor,
+                'current-app-background-color' => $darkenPrimaryColor2,
+                'text-color' => $textColor,
+                'loader-color' => $lightenPrimaryColor,
+                'dark-mode-background-color' => $darkenPrimaryColor,
+                'dark-mode-background-color-to' => $darkenPrimaryColor,
+                'dark-mode-current-app-background-color' => $darkenPrimaryColor2,
+                'dark-mode-text-color' => $textColor,
+                'dark-mode-loader-color' => $textColor,
+            ],
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
             'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),

package.json

@@ -2,7 +2,7 @@
 	"license": "agpl",
 	"private": true,
 	"scripts": {
-		"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.js",
+		"build": "NODE_ENV=production webpack --progress --config webpack.js",
 		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
 		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
 		"lint": "eslint --ext .js,.vue src",
@@ -14,7 +14,7 @@
 		"@nextcloud/axios": "^1.8.0",
 		"@nextcloud/vue": "^1.5.0",
 		"axios": "^0.24.0",
-		"trim": "0.0.1",
+		"trim": "^1.0.1",
 		"vue": "^2.6.11"
 	},
 	"browserslist": [
@@ -28,32 +28,32 @@
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 		"@babel/preset-env": "^7.9.0",
 		"@nextcloud/browserslist-config": "^1.0.0",
+		"@nextcloud/eslint-config": "^8.1.2",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^3.4.2",
-		"eslint": "^5.16.0",
-		"eslint-config-nextcloud": "0.1.1",
-		"eslint-config-standard": "^12.0.0",
+		"eslint": "^8.0.0",
+		"eslint-config-standard": "^17.0.0",
 		"eslint-import-resolver-webpack": "^0.12.1",
-		"eslint-loader": "^3.0.3",
 		"eslint-plugin-import": "^2.20.0",
 		"eslint-plugin-nextcloud": "^0.3.0",
 		"eslint-plugin-node": "^10.0.0",
-		"eslint-plugin-promise": "^4.2.1",
+		"eslint-plugin-promise": "^6.0.0",
 		"eslint-plugin-standard": "^4.0.1",
-		"eslint-plugin-vue": "^5.2.3",
+		"eslint-plugin-vue": "^9.0.0",
+		"eslint-webpack-plugin": "^3.0.0",
 		"file-loader": "^6.0.0",
-		"sass-loader": "^8.0.2",
-		"stylelint": "^8.4.0",
 		"sass": "^1.49.9",
-		"stylelint-config-recommended-scss": "^3.3.0",
-		"stylelint-scss": "^3.16.0",
-		"stylelint-webpack-plugin": "^0.10.5",
+		"sass-loader": "^13.0.2",
+		"stylelint": "^14.0.0",
+		"stylelint-config-recommended-scss": "^7.0.0",
+		"stylelint-scss": "^4.0.0",
+		"stylelint-webpack-plugin": "^3.3.0",
 		"url-loader": "^4.0.0",
 		"vue-loader": "^15.9.1",
 		"vue-template-compiler": "^2.6.11",
-		"webpack": "^4.42.0",
-		"webpack-cli": "^3.3.11",
+		"webpack": "^5.0.0",
+		"webpack-cli": "^4.0.0",
 		"webpack-merge": "^4.2.2",
 		"webpack-node-externals": "^1.7.2"
 	}

src/AdminCategoriesCustom.vue

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <div>
         <ul class="side-menu-setting-list">
             <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
-                <span v-html="item.en"></span>
+                <span v-text="item.en"></span>
             </li>
         </ul>
 
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<Modal v-if="addForm" @close="hideAddForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
-                    <span class="lang" v-html="lang"></span>
+                    <span class="lang" v-text="lang"></span>
                     <input type="text" v-model="newValue[lang]" required>
                 </div>
 
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<Modal v-if="editForm" @close="hideEditForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
-                    <span class="lang" v-html="lang"></span>
+                    <span class="lang" v-text="lang"></span>
                     <input type="text" v-model="editValue[lang]" required>
                 </div>
 

src/Logo.vue

@@ -17,9 +17,9 @@ 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">
+            <img v-bind:src="image" alt="Logo">
         </a>
-        <img v-else v-bind:src="image">
+        <img v-else v-bind:src="image" alt="Logo">
     </div>
 </template>
 

src/SideMenu.vue

@@ -91,13 +91,13 @@ export default {
 
             for (let element of links) {
                 let href = element.getAttribute('href')
-                var parent = element.parentNode
+                let parent = element.parentNode
 
                 if (!parent) {
                     continue
                 }
 
-                var dataId = parent.getAttribute('data-id')
+                let dataId = parent.getAttribute('data-id')
                 dataId = dataId !== null ? dataId : ''
 
                 if (!parent.classList.contains('app-top-side-menu') && !parent.classList.contains('app-hidden') && !menuIsHidden) {

src/SideMenuApp.vue

@@ -17,8 +17,8 @@ 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">
-            <span class="side-menu-app-icon" v-html="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <span class="side-menu-app-icon" v-text="icon"></span>
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>

src/SideMenuBig.vue

@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <Loader v-if="!items.length" />
 
                 <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
@@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'

src/SideMenuBigApp.vue

@@ -17,8 +17,8 @@ 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">
-            <img class="side-menu-app-icon" v-bind:src="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <img class="side-menu-app-icon" v-bind:src="icon" v-bind:alt="label" />
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>

src/SideMenuWithCategories.vue

@@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <Loader v-if="!items.length" />
 
                 <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
@@ -51,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'

src/admin.js

@@ -79,17 +79,20 @@ const saveSettings = (key) => {
         ++value
     }
 
+    const progress = document.querySelector('#side-menu-save-progress')
+
+    progress.style.width = '40px';
+    progress.style.marginLeft = '5px';
+
     const callbacks = {
         success: () => {
-            OC.msg.finishedSuccess(
-                selector,
-                t('side_menu', (key + 1) + '/' + size)
-            )
+            const percent = parseInt((key + 1) * 100 / size);
+
+            progress.setAttribute('value', percent)
 
             if (key < size - 1) {
                 saveSettings(key + 1)
             } else {
-                OC.msg.finishedSuccess(selector, t('side_menu', 'Saved! Page is reloading...'))
                 location.reload()
             }
         },
@@ -131,6 +134,8 @@ const updateAppsCategoriesCustom = () => {
 }
 
 document.addEventListener('DOMContentLoaded', () => {
+    $('*[data-toggle="tooltip"]').tooltip();
+
     if (document.querySelector('#side-menu-categories-custom')) {
         const View = Vue.extend(AdminCategoriesCustom)
         const adminCategoriesCustom = new View({})
@@ -147,6 +152,19 @@ document.addEventListener('DOMContentLoaded', () => {
         saveSettings(0)
     })
 
+    const resets = document.querySelectorAll('.btn-reset')
+
+    for (let btn of resets) {
+        btn.addEventListener('click', (event) => {
+            const target = event.target
+            const values = JSON.parse(target.getAttribute('data-reset'))
+
+            for (let i in values) {
+                document.querySelector(`#${i}`).value = values[i]
+            }
+        })
+    }
+
     const displays = document.querySelectorAll('.side-menu-display')
 
     for (let display of displays) {

src/l10n/fixtures/cs.yaml

@@ -3,8 +3,8 @@
 "No": "Ne"
 "Yes": "Ano"
 "Menu": "Nabídka"
-'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.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>. Pro pohyb po použijte klávesu <span class="keyboard-key">tab</span>.'
-"Top menu": "Hlavní nabídka"
+'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.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
+"Top menu": "Horní nabídka"
 "Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
 "If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
 "Experimental": "Experimentální"
@@ -62,7 +62,7 @@
 "Export the configuration": "Exportovat nastavení"
 "Purge the cache": "Vyprázdnit mezipaměť"
 "Show the link to settings": "Zobrazit odkaz na nastavení"
-"The menu is enabled by default for users": "Nabídka je ve výchozím stavu zapnutá pro uživatele"
+"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
 "Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno."
 "Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny"
 "This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</ code>."
@@ -78,7 +78,15 @@
 "Dark mode colors": "Barvy tmavého režimu"
 "With categories": "S kategoriemi"
 "Custom categories": "Vlastní kategorie"
-"Customize application categories": "Personnaliser les catégories des applications"
 "Customize application categories": "Přizpůsobte kategorie aplikací"
 "Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
 "Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"
+"Reset to default": "Vrátit zpět na výchozí hodnoty"
+"Hidden icon": "Skrytá ikona"
+"Small icon": "Malá ikona"
+"Normal icon": "Normální ikona"
+"Big icon": "Velká ikona"
+"Hidden text": "Skrytý text"
+"Small text": "Malý text"
+"Normal text": "Normální text"
+"Big text": "Velký text"

src/l10n/fixtures/de.yaml

@@ -81,3 +81,12 @@
 "Customize application categories": "Anwendungskategorien anpassen"
 "Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar "
 "Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar"
+"Reset to default": "Auf Standard zurücksetzen"
+"Hidden icon": "Verstecktes Symbol"
+"Small icon": "Kleines Symbol"
+"Normal icon": "Normales Symbol"
+"Big icon": "Große Ikone"
+"Hidden text": "Versteckter Text"
+"Small text": "Kleiner Text"
+"Normal text": "Normaler Text"
+"Big text": "Großer Text"

src/l10n/fixtures/fr.yaml

@@ -15,6 +15,14 @@
 "Small": "Petit"
 "Normal": "Normal"
 "Big": "Gros"
+"Hidden icon": "Icône masqué"
+"Small icon": "Petit icône"
+"Normal icon": "Icône normal"
+"Big icon": "Gros icône"
+"Hidden text": "Text masqué"
+"Small text": "Texte petit"
+"Normal text": "Texte normal"
+"Big text": "Gros texte"
 "Colors": "Couleurs"
 "Background color": "Couleur de fond"
 "Background color of current app": "Couleur de fond de l'application en cours"
@@ -81,3 +89,4 @@
 "Customize application categories": "Personnaliser les catégories des applications"
 "Apps only visible in the top menu": "Applications visibles uniquement dans le menu supérieur"
 "Apps visible in the top and side menus": "Applications visibles dans le menus supérieur et latéral"
+"Reset to default": "Restaurer les valeurs par défaut"

src/l10n/fixtures/zh_CN.yaml

@@ -81,3 +81,12 @@
 "Customize application categories": "自定义应用程序类别"
 "Apps only visible in the top menu": "应用程序仅在顶部菜单中可见"
 "Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序"
+"Reset to default": "重置为默认设置"
+"Hidden icon": "隐藏图标"
+"Small icon": "小图标"
+"Normal icon": "正常图标"
+"Big icon": "大图标"
+"Hidden text": "隐藏文字"
+"Small text": "小文本"
+"Normal text": "普通文本"
+"Big text": "大文本"

templates/js/_alwaysDisplayed.js

@@ -2,7 +2,7 @@ const alwaysDisplayed = function() {
     const elements = querySelectorAll('*')
     const fixedElements = []
 
-    for (var element of elements) {
+    for (let element of elements) {
         if (typeof element !== 'object') {
             continue
         }
@@ -44,7 +44,7 @@ const alwaysDisplayed = function() {
         fixedElements.push(element)
     }
 
-    for (var i in fixedElements) {
+    for (let i in fixedElements) {
         const element = fixedElements[i]
         const computedStyle = window.getComputedStyle(element, null)
         const left = computedStyle.getPropertyValue('left')

templates/js/_topMenuApps.js

@@ -43,7 +43,7 @@ const updateTopMenu = function() {
         return
     }
 
-    navigationAppsHtml = ''
+    let navigationAppsHtml = ''
 
     for (let app of apps) {
         const dataId = app.getAttribute('data-id')
@@ -201,7 +201,7 @@ const updateTopMenu = function() {
     menuCache = menu.innerHTML + menu.nextSibling.innerHTML
 }
 
-for (let i = 0; i < 3000; i+= 100) {
+for (let i = 0; i < 4000; i+= 100) {
     setTimeout(updateTopMenu, i)
 }
 

templates/js/script.php

@@ -149,6 +149,8 @@ if ($_['always-displayed']) {
             if (a !== null) {
                 a.focus()
             }
+
+            headerMenuOpener.blur()
         })
 
         for (let opener of sideMenuOpener) {

templates/settings/admin-form.php

@@ -39,6 +39,8 @@ $choicesSizes = [
     'Big' => 'big',
 ];
 
+$labelShowHideApps = 'Show and hide the list of applications';
+$labelReset = 'Reset to default';
 ?>
 <div id="side-menu-section">
     <div class="section">
@@ -67,6 +69,10 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['background-color-to']); ?>">
 
+                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                            'side-menu-background-color' => $_['defaults']['background-color'],
+                            'side-menu-background-color-to' => $_['defaults']['background-color-to'],
+                        ])) ?>"></div>
                     <div>
                         <em>
                             <?php p($l->t('Transparent')); ?>
@@ -102,6 +108,10 @@ $choicesSizes = [
                         type="color"
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['current-app-background-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-current-app-background-color' => $_['defaults']['current-app-background-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -118,6 +128,10 @@ $choicesSizes = [
                         type="color"
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['text-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-text-color' => $_['defaults']['text-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -134,6 +148,10 @@ $choicesSizes = [
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['loader-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-loader-color' => $_['defaults']['loader-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -227,16 +245,23 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-background-color"
                         name="dark-mode-background-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color']); ?>">
                     <input
+                        id="side-menu-dark-mode-background-color-to"
                         name="dark-mode-background-color-to"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color-to']); ?>">
 
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-background-color' => $_['defaults']['dark-mode-background-color'],
+                        'side-menu-dark-mode-background-color-to' => $_['defaults']['dark-mode-background-color-to'],
+                    ])) ?>"></div>
+
                     <div>
                         <em>
                             <?php p($l->t('Transparent')); ?>
@@ -266,10 +291,15 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-current-app-background-color"
                         name="dark-mode-current-app-background-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-current-app-background-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-current-app-background-color' => $_['defaults']['dark-mode-current-app-background-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -281,10 +311,15 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-text-color"
                         name="dark-mode-text-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-text-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-text-color' => $_['defaults']['dark-mode-text-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -296,10 +331,15 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-loader-color"
                         name="dark-mode-loader-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-loader-color']); ?>">
+
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-loader-color' => $_['defaults']['dark-mode-loader-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -611,7 +651,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
@@ -659,7 +699,7 @@ $choicesSizes = [
                     <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
+                                <?php echo $l->t($label.' icon');  ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -667,7 +707,7 @@ $choicesSizes = [
                     <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
+                                <?php echo $l->t($label.' text'); ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -680,7 +720,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
@@ -734,7 +774,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
@@ -767,7 +807,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="top-side-menu-apps" id="top-side-menu-apps" data-checkbox style="display: none">
@@ -837,11 +877,10 @@ $choicesSizes = [
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Customize application categories')); ?>
-                    <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div id="apps-categories-custom-list" style="display: none">
@@ -957,11 +996,10 @@ $choicesSizes = [
     <div class="section" id="more">
         <button id="side-menu-save" class="btn btn-info">
             <?php p($l->t('Save')); ?>
+            <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
-        <span id="side-menu-message" class="msg"></span>
-
-        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
+        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
             <button class="btn btn-primary" >
                 <?php p($l->t('Export the configuration')); ?>
             </button>
@@ -979,7 +1017,7 @@ $choicesSizes = [
             <span for="side-menu-opener">
                 <?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">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                     <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>

templates/settings/personal-form.php

@@ -25,6 +25,8 @@ $choicesYesNo = [
     'Yes' => '1',
 ];
 
+
+$labelShowHideApps = 'Show and hide the list of applications';
 ?>
 <div id="side-menu-section">
     <?php if ($_['force']): ?>
@@ -85,7 +87,7 @@ $choicesYesNo = [
 
                         <p>
                             <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -131,7 +133,7 @@ $choicesYesNo = [
                     <div class="side-menu-setting-form">
                         <p>
                             <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -171,7 +173,7 @@ $choicesYesNo = [
                     <div class="side-menu-setting-form">
                         <p>
                             <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -202,7 +204,10 @@ $choicesYesNo = [
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+            <button id="side-menu-save" class="btn btn-info">
+                <?php p($l->t('Save')); ?>
+                <progress max="100" value="0" id="side-menu-save-progress"></progress>
+            </button>
 
             <span id="side-menu-message" class="msg"></span>
 
@@ -213,7 +218,7 @@ $choicesYesNo = [
             <span for="side-menu-opener">
                 <?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">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                     <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>