Merge pull request 'release v3.11.6' (#328) from develop into master

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

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -26,7 +26,7 @@ body:
     id: configuration
     attributes:
       label: Configuration
-      description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/docs/FAQ/export-config/)).
+      description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/tips/#export-the-configuration)).
       value: |
         ```
         {

.gitea/issue_template/QUESTION_TEMPLATE.yml

@@ -1,30 +0,0 @@
-name: New question
-about: Use this template when you don't know how to do something
-title: "[Question] "
-labels:
-  - question
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill information.
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment
-      value: |
-        * Custom menu version: 
-        * Nextcloud version: 
-        * PHP version: 
-        * Web server (Nginx, Apache2): 
-        * Web browser and version (Firefox 80, Google Chrome 74, etc): 
-    validations:
-      required: true
-
-  - type: textarea
-    id: question
-    attributes:
-      label: Question
-    validations:
-      required: true

.gitea/issue_template/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Documentation
-    url: https://deblan.gitnet.page/side_menu_doc/
-    about: Official documentation web site
-  - name: Ask a question in our Matrix room
-    about: If you prefer a chat-like conversation or in need for quick help, this might be an alternative to opening an issue.
-    url: https://matrix.to/#/#custommenu:neutralnetwork.org

.woodpecker.yml

@@ -0,0 +1,103 @@
+steps:
+  check-tag:
+    image: alpine
+    commands:
+      - TAG=${CI_COMMIT_TAG/v//}
+      - grep "<version>$TAG</version>" appinfo/info.xml
+    when:
+      event: [tag]
+
+  dependencies:
+    image: node:16
+    pull: true
+    commands:
+      - npm i
+    when:
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+  osv-detector:
+    image: gitnet.fr/deblan/osv-detector:v0.10
+    commands:
+      - osv-detector package-lock.json
+    failure: ignore
+
+  build-js:
+    image: node:16
+    commands:
+      - npm run build
+    when:
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+  build-translations:
+    image: deblan/php:8.0
+    commands:
+      - php bin/generate_l10n.php
+    when:
+      event: [tag, push, pull_request, manual]
+      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+  create-signature:
+    image: nextcloud:25
+    secrets: [app_certificate, app_public_certificate]
+    environment:
+      SQLITE_DATABASE: /var/www/data/data.db
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: admin
+    commands:
+      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
+      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
+      - mkdir /tmp/app
+      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
+      - /usr/src/nextcloud/occ integrity:sign-app
+        --privateKey=/tmp/side_menu.key
+        --certificate=/tmp/side_menu.crt
+        --path=/tmp/app
+      - mv /tmp/app/appinfo/signature.json appinfo/
+    when:
+      event: [tag]
+
+  # check-code-quality:
+  #   image: sonarsource/sonar-scanner-cli
+  #   secrets: [sonar_token, sonar_host, sonar_project]
+  #   commands:
+  #     - sonar-scanner
+  #       -Dsonar.projectKey=$SONAR_PROJECT
+  #       -Dsonar.sources=.
+  #       -Dsonar.host.url=$SONAR_HOST
+  #       -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
+  #       -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
+  #       -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
+  #   failure: ignore
+  #   when:
+  #     event: [pull_request]
+
+  create-package:
+    image: deblan/php:8.0
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    secrets: [app_certificate]
+    commands:
+      - apt-get update
+      - apt-get install -y zip make
+      - 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]
+
+  push-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]

.woodpecker/.build.yml

@@ -1,28 +0,0 @@
-variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
-
-when:
-  event: [tag, push, pull_request, manual]
-  branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-steps:
-  "Install dependencies":
-    image: node:16
-    pull: true
-    commands:
-      - npm i
-
-  "Build JS":
-    image: node:16
-    commands:
-      - npm run build
-
-  "Build translations":
-    image: deblan/php:8.3
-    commands:
-      - php bin/generate_l10n.php
-
-  "Build cache":
-    image: gitnet.fr/deblan/woodpecker-cache
-    volumes: *volumes

.woodpecker/.publish.yml

@@ -1,61 +0,0 @@
-variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
-    - /var/www/html/artifacts:/var/www/html/artifacts
-
-depends_on:
-  - build
-
-when:
-  event: [tag]
-
-steps:
-  "Verify tag and app version":
-    image: alpine
-    commands:
-      - TAG=${CI_COMMIT_TAG/v//}
-      - grep "<version>$TAG</version>" appinfo/info.xml
-
-  "Create signature":
-    image: nextcloud:25
-    secrets: [app_certificate, app_public_certificate]
-    volumes: *volumes
-    environment:
-      SQLITE_DATABASE: /var/www/data/data.db
-      NEXTCLOUD_ADMIN_USER: admin
-      NEXTCLOUD_ADMIN_PASSWORD: admin
-    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
-      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
-      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
-      - mkdir /tmp/app
-      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
-      - /usr/src/nextcloud/occ integrity:sign-app
-        --privateKey=/tmp/side_menu.key
-        --certificate=/tmp/side_menu.crt
-        --path=/tmp/app
-      - mv /tmp/app/appinfo/signature.json appinfo/
-
-  "Create package":
-    image: deblan/php:8.3
-    volumes: *volumes
-    secrets: [app_certificate]
-    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
-      - apt-get update
-      - apt-get install -y zip make
-      - 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
-
-  "Push release":
-    image: plugins/gitea-release
-    volumes: *volumes
-    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//}/*

.woodpecker/.security.yml

@@ -1,17 +0,0 @@
-variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
-
-depends_on:
-  - build
-
-skip_clone: true
-
-steps:
-  "Check dependencies":
-    image: gitnet.fr/deblan/osv-detector:v0.10
-    volumes: *volumes
-    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
-      - osv-detector package-lock.json
-    failure: ignore

CHANGELOG.md

@@ -1,37 +1,5 @@
 ## [Unreleased]
 
-## 3.13.1
-### Fixed
-* fix #354: remove the opener when the menu is always displayed
-* fix extra margin between the logo and the opener
-
-## 3.13.0
-### Added
-* show apps generated with Tables (fix #349)
-* add constructor property promotion
-### Fixed
-* remove .app-navigation--close translationX for always-displayed menu (fix #348)
-
-## 3.12.0
-### Added
-* add compatibility with NC29
-
-## 3.11.8
-### Fixed
-* move the logo inside #nextcloud element (fix #278 #239) [NC26]
-
-## 3.11.7
-### Added
-* update translations
-* update ci steps names
-### Fixed
-* add accessibility to open and close buttons (#311)
-* fully apply Nextcloud AppMenu.vue updated (#326)
-* add missing label on the 'save' button in personal settings (fix #318)
-### Changed
-* upgrade axios
-* upgrade css-loader
-
 ## 3.11.6
 ### Fixed
 * add --background-invert-if-bright in top menu (fix #326)

appinfo/info.xml

@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.13.1</version>
+    <version>3.11.6</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -54,8 +54,8 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="29"/>
+        <nextcloud min-version="25" max-version="28"/>
-        <php min-version="8.0"/>
+        <php min-version="7.4"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

bin/import_config.php

@@ -1,75 +1,21 @@
 <?php
+/**
+ * Imports a json configuration into a sqlite database.
+ *
+ * Usage:
+ *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
+ */
 
-function showUsageAndExit(int $code)
+$configFile = $argv[1];
-{
+$databaseFile = $argv[2];
-    global $argv;
 
-    echo "${argv[0]} [--help] --config /path/to/config/config.php --file /path/to/config.json\n";
+$content = file_get_contents($configFile);
+$config = json_decode($content, true);
 
-    exit($code);
+$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
-}
+$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
 
-function value(string $shortName, string $longName, array $options, bool $required = true): ?string
+foreach ($config as $key => $value) {
-{
-    $value = $options[$shortName] ?? $options[$longName] ?? null;
-
-    if (is_array($value)) {
-        echo "To much --{$longName}\n";
-        showUsageAndExit(1);
-    }
-
-    if (empty($value) && $required) {
-        echo "--{$longName} is missing\n";
-        showUsageAndExit(1);
-    }
-
-    return $value;
-}
-
-$options = getopt('t:f:c:h', [
-    'type:',
-    'file:',
-    'config:',
-    'help',
-]);
-
-$help = value('h', 'help', $options, false);
-$config = value('c', 'config', $options);
-$file = value('f', 'file', $options);
-
-if (!is_readable($config) && !is_file($config)) {
-    echo "No such file: {$config}\n";
-
-    exit(1);
-}
-
-if (!is_readable($file) && !is_file($file)) {
-    echo "No such file: {$file}\n";
-
-    exit(1);
-}
-
-$appConfig = json_decode(file_get_contents($file), true);
-
-require $config;
-
-if ('mysql' === $CONFIG['dbtype']) {
-    $pdo = new \PDO(
-        'mysql:host='.$CONFIG['dbhost'].';dbname='.$CONFIG['dbname'],
-        $CONFIG['dbuser'],
-        $CONFIG['dbpassword']
-    );
-} elseif ($CONFIG['dbtype']) {
-    $pdo = new \PDO(sprintf('sqlite:%s', $CONFIG['datadirectory'].'/owncloud.db'));
-} else {
-    echo "dbtype is not valid\n";
-
-    exit(1);
-}
-
-$stmt = $pdo->prepare('UPDATE '.$CONFIG['dbtableprefix'].'appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
-
-foreach ($appConfig as $key => $value) {
     $stmt->execute([
         'appId' => 'side_menu',
         'key' => $key,

css/sideMenu.css

@@ -83,16 +83,6 @@
   padding-left: 12px !important;
   margin-left: 5px !important;
   margin-left: 3px !important;
-  overflow: hidden;
-}
-
-.side-menu-opener span {
-  position: relative;
-  left: 50px;
-  display: block;
-  width: 1px;
-  height: 1px;
-  overflow: hidden;
 }
 
 .side-menu-opener:active, .side-menu-opener:focus {
@@ -297,9 +287,8 @@
   display: inline;
 }
 
-.side-menu-always-displayed .app-navigation-toggle-wrapper {
+.side-menu-always-displayed .app-navigation--close {
-  right: 0 !important;
+  transform: translateX(calc(-100% + 50px));
-  margin-left: 0 !important;
 }
 
 #side-menu.side-menu-with-categories {

lib/Controller/AdminSettingController.php

@@ -22,25 +22,37 @@ use OCA\SideMenu\AppInfo\Application;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
 class AdminSettingController extends Controller
 {
-    public function __construct(
+    /**
-        $appName,
+     * @var IConfig
-        IRequest $request,
+     */
-        protected IConfig $config,
+    protected $config;
-        protected IURLGenerator $urlGenerator
+
-    ) {
+    /**
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    public function __construct($appName, IRequest $request, IConfig $config, IURLGenerator $urlGenerator)
+    {
         parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
     }
 
     /**
      * @NoCSRFRequired
+     *
+     * @return RedirectResponse
      */
-    public function removeCache(): RedirectResponse
+    public function removeCache()
     {
         $this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
 
@@ -51,8 +63,10 @@ class AdminSettingController extends Controller
 
     /**
      * @NoCSRFRequired
+     *
+     * @return Response
      */
-    public function exportConfiguration(): DataDownloadResponse
+    public function exportConfiguration()
     {
         $keys = $this->config->getAppKeys(Application::APP_ID);
         $appConfig = [];

lib/Controller/AppController.php

@@ -29,14 +29,28 @@ use OCP\IUserSession;
 
 class AppController extends Controller
 {
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var AppRepository
+     */
+    protected $appRepository;
+
     public function __construct(
         string $appName,
         IRequest $request,
-        protected AppRepository $appRepository,
+        AppRepository $appRepository,
-        protected IURLGenerator $urlGenerator,
+        IURLGenerator $urlGenerator,
-        protected ConfigProxy $config
+        ConfigProxy $config
     ) {
         parent::__construct($appName, $request);
+
+        $this->appRepository = $appRepository;
+        $this->urlGenerator = $urlGenerator;
+        $this->config = $config;
     }
 
     /**

lib/Controller/CssController.php

@@ -32,26 +32,49 @@ use OCP\IUserSession;
 
 class CssController extends Controller
 {
-    protected ?User $user;
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
 
     public function __construct(
         string $appName,
         IRequest $request,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected ThemingDefaults $theming,
+        ThemingDefaults $theming,
-        protected Color $color
+        Color $color
     ) {
         parent::__construct($appName, $request);
 
         $this->user = OC::$server[IUserSession::class]->getUser();
+        $this->config = $config;
+        $this->theming = $theming;
+        $this->color = $color;
     }
 
     /**
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
+     *
+     * @return Response
      */
-    public function stylesheet(): TemplateResponse
+    public function stylesheet()
     {
         $response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
         $response->addHeader('Content-Type', 'text/css');
@@ -84,15 +107,15 @@ class CssController extends Controller
             $isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
             $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
 
-            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled
+            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled ||
-                || ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
+                ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
         } else {
             $isDarkThemeUserEnabled = false;
             $isBreezeDarkUserEnabled = false;
         }
 
-        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled)
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) ||
-            || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+            ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
 
         $primaryColor = $this->theming->getColorPrimary();
         $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);

lib/Controller/JsController.php

@@ -32,14 +32,32 @@ use OCP\L10N\IFactory;
 
 class JsController extends Controller
 {
-    protected ?User $user;
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $themingDefaults;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
 
     public function __construct(
         string $appName,
         IRequest $request,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected ThemingDefaults $themingDefaults,
+        ThemingDefaults $themingDefaults,
-        protected IFactory $l10nFactory
+        IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
 

lib/Controller/NavController.php

@@ -19,6 +19,7 @@
 namespace OCA\SideMenu\Controller;
 
 use OC;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\URLGenerator;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
@@ -31,24 +32,57 @@ use OCP\L10N\IFactory;
 
 class NavController extends Controller
 {
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var AppRepository
+     */
+    protected $appRepository;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var URLGenerator
+     */
+    protected $router;
+
     public function __construct(
         string $appName,
         IRequest $request,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected AppRepository $appRepository,
+        AppRepository $appRepository,
-        protected CategoryRepository $categoryRepository,
+        CategoryRepository $categoryRepository,
-        protected URLGenerator $router,
+        URLGenerator $router,
-        protected IFactory $l10nFactory
+        IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
+        $this->l10nFactory = $l10nFactory;
+        $this->router = $router;
     }
 
     /**
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
+     *
+     * @return JSONResponse
      */
-    public function items(): JSONResponse
+    public function items()
     {
         $user = OC::$server[IUserSession::class]->getUser();
         $items = [];
@@ -155,11 +189,11 @@ class NavController extends Controller
 
         usort($items, function ($a, $b) use ($categoriesLabels) {
             foreach ($categoriesLabels as $key => $value) {
-                if ('other' === $a['categoryId']) {
+                if ($a['categoryId'] === 'other') {
                     return -1;
                 }
 
-                if ('other' === $b['categoryId']) {
+                if ($b['categoryId'] === 'other') {
                     return 1;
                 }
 

lib/Controller/PersonalSettingController.php

@@ -21,20 +21,40 @@ namespace OCA\SideMenu\Controller;
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
 
 class PersonalSettingController extends Controller
 {
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $configProxy;
+
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
     public function __construct(
         $appName,
         IRequest $request,
-        protected IConfig $config,
+        IConfig $config,
-        protected ConfigProxy $configProxy,
+        ConfigProxy $configProxy,
-        protected IUserSession $userSession
+        IUserSession $userSession
     ) {
         parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->configProxy = $configProxy;
+        $this->userSession = $userSession;
     }
 
     /**
@@ -43,8 +63,10 @@ class PersonalSettingController extends Controller
      *
      * @param mixed $name
      * @param mixed $value
+     *
+     * @return Response
      */
-    public function valueSet($name, $value): array
+    public function valueSet($name, $value)
     {
         $doSave = false;
         $user = $this->userSession->getUser();

lib/Service/AppRepository.php

@@ -3,12 +3,7 @@
 namespace OCA\SideMenu\Service;
 
 use OC\User\User;
-use OCA\SideMenu\AppInfo\Application;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\INavigationManager;
-use OCP\IUserSession;
 use OCP\L10N\IFactory;
 
 /**
@@ -18,25 +13,51 @@ use OCP\L10N\IFactory;
  */
 class AppRepository
 {
+    /**
+     * @var \OC_App
+     */
+    protected $ocApp;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
+    /**
+     * @var INavigationManager
+     */
+    protected $navigationManager;
+
     public function __construct(
-        protected \OC_App $ocApp,
+        \OC_App $ocApp,
-        protected INavigationManager $navigationManager,
+        INavigationManager $navigationManager,
-        protected IFactory $l10nFactory,
+        IFactory $l10nFactory,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected CategoryRepository $categoryRepository,
+        CategoryRepository $categoryRepository
-        protected IEventDispatcher $dispatcher,
-        protected IUserSession $userSession,
     ) {
-        $this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent(
+        $this->ocApp = $ocApp;
-            $this->userSession->isLoggedIn(),
+        $this->l10nFactory = $l10nFactory;
-            new TemplateResponse(Application::APP_NAME, '')
+        $this->config = $config;
-        ));
+        $this->navigationManager = $navigationManager;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
      * Retrieves visibles apps.
+     *
+     * @return array
      */
-    public function getVisibleApps(): array
+    public function getVisibleApps()
     {
         $navigation = $this->navigationManager->getAll();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
@@ -69,14 +90,6 @@ class AppRepository
                         'external_links',
                     ],
                 ];
-            } elseif ('tables_application' === substr($app['id'], 0, 18)) {
-                $visibleApps[$app['id']] = [
-                    'id' => $app['id'],
-                    'name' => $this->getAppName($app),
-                    'href' => $app['href'],
-                    'icon' => $app['icon'],
-                    'category' => [],
-                ];
             } elseif ('files' === $app['id']) {
                 $visibleApps[$app['id']] = [
                     'id' => $app['id'],
@@ -97,7 +110,7 @@ class AppRepository
         return $visibleApps;
     }
 
-    public function getAppName($app): string
+    public function getAppName($app)
     {
         return $this->config->getAppValue(
             'app.navigation.name',
@@ -106,7 +119,7 @@ class AppRepository
         );
     }
 
-    public function getOrderedApps(?User $user = null): array
+    public function getOrderedApps(?User $user = null)
     {
         $apps = $this->getVisibleApps();
         $orders = $this->config->getAppValueArray('apps-order', '[]');

lib/Service/CategoryRepository.php

@@ -15,19 +15,51 @@ use OCP\L10N\IFactory;
  */
 class CategoryRepository
 {
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
     public function __construct(
-        protected CategoryFetcher $categoryFetcher,
+        CategoryFetcher $categoryFetcher,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected IConfig $iConfig,
+        IConfig $iConfig,
-        protected IFactory $l10nFactory,
+        IFactory $l10nFactory,
-        protected IUserSession $userSession
+        IUserSession $userSession
     ) {
+        $this->categoryFetcher = $categoryFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->iConfig = $iConfig;
+        $this->userSession = $userSession;
     }
 
     /**
      * Retrieves categories.
+     *
+     * @return array
      */
-    public function getOrderedCategories(): array
+    public function getOrderedCategories()
     {
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $type = $this->config->getAppValue('categories-order-type', 'default');

lib/Service/ConfigProxy.php

@@ -13,7 +13,12 @@ use OCP\IConfig;
  */
 class ConfigProxy
 {
-    public function __construct(protected IConfig $config)
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    public function __construct(IConfig $config)
     {
         $this->config = $config;
     }

lib/Service/LangRepository.php

@@ -11,7 +11,12 @@ use OCP\IDBConnection;
  */
 class LangRepository
 {
-    public function __construct(protected IDBConnection $db)
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
+
+    public function __construct(IDBConnection $db)
     {
         $this->db = $db;
     }

lib/Settings/Admin.php

@@ -21,27 +21,75 @@ namespace OCA\SideMenu\Settings;
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
-use OCA\SideMenu\Service\Color;
 use OCA\SideMenu\Service\ConfigProxy;
-use OCA\SideMenu\Service\LangRepository;
-use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
+use OCA\Theming\ThemingDefaults;
+use OCA\SideMenu\Service\Color;
+use OCA\SideMenu\Service\LangRepository;
 
 class Admin implements ISettings
 {
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $config;
+
+    /**
+     * @var AppRepository
+     */
+    private $appRepository;
+
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
+
+    /**
+     * @var LangRepository
+     */
+    protected $langRepository;
+
     public function __construct(
-        protected IL10N $l,
+        IL10N $l,
-        protected ILogger $logger,
+        ILogger $logger,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected AppRepository $appRepository,
+        AppRepository $appRepository,
-        protected CategoryRepository $categoryRepository,
+        CategoryRepository $categoryRepository,
-        protected ThemingDefaults $theming,
+        ThemingDefaults $theming,
-        protected Color $color,
+        Color $color,
-        protected LangRepository $langRepository
+        LangRepository $langRepository
     ) {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
+        $this->theming = $theming;
+        $this->color = $color;
+        $this->langRepository = $langRepository;
     }
 
     /**

lib/Settings/AdminSection.php

@@ -25,22 +25,51 @@ use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection
 {
-    public function __construct(
+    /**
-        protected IURLGenerator $url,
+     * @var IL10N
-        protected IL10N $l
+     */
-    ) {
+    private $l;
+
+    /**
+     * @var IURLGenerator
+     */
+    private $url;
+
+    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 Application::APP_ID;
     }
 
+    /**
+     * 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(Application::APP_NAME);
     }
 
+    /**
+     * @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;

lib/Settings/Personal.php

@@ -29,13 +29,43 @@ use OCP\Settings\ISettings;
 
 class Personal implements ISettings
 {
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $config;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var AppRepository
+     */
+    private $appRepository;
+
     public function __construct(
-        protected IL10N $l,
+        IL10N $l,
-        protected ILogger $logger,
+        ILogger $logger,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected IUserSession $userSession,
+        IUserSession $userSession,
-        protected AppRepository $appRepository
+        AppRepository $appRepository
     ) {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->appRepository = $appRepository;
     }
 
     /**

lib/Settings/PersonalSection.php

@@ -26,13 +26,34 @@ use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection
 {
-    public function __construct(
+    /**
-        protected IURLGenerator $url,
+     * @var IL10N
-        protected IL10N $l,
+     */
-        protected ConfigProxy $configProxy
+    private $l;
-    ) {
+
+    /**
+     * @var IURLGenerator
+     */
+    private $url;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $configProxy;
+
+    public function __construct(IURLGenerator $url, IL10N $l, ConfigProxy $configProxy)
+    {
+        $this->url = $url;
+        $this->l = $l;
+        $this->configProxy = $configProxy;
     }
 
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'.
+     *
+     * @returns string
+     */
     public function getID()
     {
         if ($this->configProxy->getAppValueBool('force', '0')) {
@@ -42,6 +63,12 @@ class PersonalSection implements IIconSection
         return Application::APP_ID;
     }
 
+    /**
+     * 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()
     {
         if ($this->configProxy->getAppValueBool('force', '0')) {
@@ -51,6 +78,13 @@ class PersonalSection implements IIconSection
         return $this->l->t(Application::APP_NAME);
     }
 
+    /**
+     * @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()
     {
         if ($this->configProxy->getAppValueBool('force', '0')) {

package.json

@@ -11,7 +11,7 @@
 		"stylelint:fix": "./node_modules/.bin/stylelint src --fix"
 	},
 	"dependencies": {
-		"axios": "^1.6.7",
+		"axios": "^0.24.0",
 		"trim": "^1.0.1",
 		"vue": "^2.6.11"
 	},
@@ -33,7 +33,7 @@
 		"@nextcloud/vue": "^7.12.1",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
-		"css-loader": "^6.10.0",
+		"css-loader": "^3.4.2",
 		"eslint": "^8.0.0",
 		"eslint-config-standard": "^17.0.0",
 		"eslint-import-resolver-webpack": "^0.12.1",

src/AppMenu.vue

@@ -168,7 +168,6 @@ $header-icon-size: 20px;
   flex-shrink: 1;
   flex-wrap: wrap;
 }
-
 .app-menu-main {
   display: flex;
   flex-wrap: nowrap;
@@ -178,6 +177,7 @@ $header-icon-size: 20px;
     height: 50px;
     position: relative;
     display: flex;
+    opacity: .7;
 
     &.app-menu-entry__active {
       opacity: 1;
@@ -217,7 +217,6 @@ $header-icon-size: 20px;
       width: $header-icon-size;
       height: $header-icon-size;
       padding: calc((100% - $header-icon-size) / 2);
-      box-sizing: content-box;
       filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
     }
 
@@ -227,8 +226,8 @@ $header-icon-size: 20px;
       font-size: 12px;
       color: var(--color-primary-text);
       text-align: center;
+      bottom: -5px;
       left: 50%;
-      top: 45%;
       display: block;
       min-width: 100%;
       transform: translateX(-50%);
@@ -236,7 +235,6 @@ $header-icon-size: 20px;
       width: 100%;
       text-overflow: ellipsis;
       overflow: hidden;
-      letter-spacing: -0.5px;
     }
 
     &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
@@ -244,11 +242,11 @@ $header-icon-size: 20px;
       opacity: 1;
       .app-menu-entry--label {
         opacity: 1;
-        font-weight: bolder;
+        font-weight: bold;
+        font-size: 14px;
         bottom: 0;
-        width: 100%;
+        width: auto;
-        text-overflow: ellipsis;
+        overflow: visible;
-        overflow: hidden;
       }
     }
   }
@@ -265,10 +263,8 @@ $header-icon-size: 20px;
   &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
   .app-menu-entry:not(.app-menu-entry__hidden-label):hover,
   .app-menu-entry:not(.app-menu-entry__hidden-label):focus {
-    opacity: 1;
-
     img {
-      margin-top: -8px;
+      margin-top: -6px;
     }
 
     .app-menu-entry--label {
@@ -284,7 +280,7 @@ $header-icon-size: 20px;
   &.app-menu-main__show-hovered .app-menu-entry:hover,
   &.app-menu-main__show-hovered .app-menu-entry:focus {
     img {
-      margin-top: -8px;
+      margin-top: -6px;
     }
 
     .app-menu-entry--label {
@@ -299,42 +295,38 @@ $header-icon-size: 20px;
 }
 
 ::v-deep .app-menu-more .button-vue--vue-tertiary {
+  color: var(--color-primary-text);
   opacity: .7;
   margin: 3px;
-  filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
 
-  &:not([aria-expanded="true"]) {
+  &:hover {
-    color: var(--color-primary-element-text);
+    opacity: 1;
-
+    background-color: transparent !important;
-    &:hover {
-      opacity: 1;
-      background-color: transparent !important;
-    }
   }
 
-    &:focus-visible {
+  &:focus-visible {
-      opacity: 1;
+    opacity: 1;
-      outline: none !important;
+    background-color: transparent !important;
-    }
+    border-radius: var(--border-radius);
+    outline: none;
+    box-shadow: 0 0 0 2px var(--color-primary-text);
+  }
 }
 
 .app-menu-popover-entry {
   .app-icon {
     position: relative;
     height: 44px;
-    width: 48px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
 
     &.has-unread::after {
       background-color: var(--color-main-text);
     }
 
     img {
+      filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
       width: $header-icon-size;
       height: $header-icon-size;
+      padding: calc((50px - $header-icon-size) / 2);
     }
   }
 }
@@ -343,7 +335,7 @@ $header-icon-size: 20px;
   content: "";
   width: 8px;
   height: 8px;
-  background-color: var(--color-primary-element-text);
+  background-color: var(--color-primary-text);
   border-radius: 50%;
   position: absolute;
   display: block;

src/CloserButton.vue

@@ -15,18 +15,11 @@ 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" :arial-label="label">
+  <button class="side-menu-opener side-menu-closer"></button>
-    <span v-text="label"></span>
-  </button>
 </template>
 
 <script>
 export default {
   name: 'CloserButton',
-  data() {
-    return {
-      label: t('side_menu', 'Close the menu'),
-    }
-  }
 }
 </script>

src/OpenerButton.vue

@@ -15,9 +15,7 @@ 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" :arial-label="label">
+  <button class="side-menu-opener" :arial-label="label"></button>
-    <span v-text="label"></span>
-  </button>
 </template>
 
 <script>
@@ -25,7 +23,7 @@ export default {
   name: 'OpenerButton',
   data() {
     return {
-      label: t('side_menu', 'Toggle the menu'),
+      label: t('side_menu', 'Toggle menu'),
     }
   }
 }

src/SideMenu.vue

@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         v-bind:label="settings.name"
         v-bind:avatar="settings.avatar" />
       <AppSearch v-model:search="search" />
-      <OpenerButton v-if="!alwaysDisplayed" />
+      <OpenerButton />
       <Logo
         v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
         v-bind:image="logo"

src/l10n/fixtures/cs.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši"
 "Except the hovered app": "Except the hovered app"
 "Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/de.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Labels ausblenden, wenn sich die Maus darüber befindet (Hover)"
 "Except the hovered app": "Except the hovered app"
 "Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/es.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
 "Except the hovered app": "Except the hovered app"
 "Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/fr.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Masquer le libellé des applications au passage de la souris"
 "Except the hovered app": "À l'exception de l'application survolée"
 "Search": "Rechercher"
-"Toggle the menu": "Basculer le menu"

src/l10n/fixtures/gl.yaml

@@ -1,96 +0,0 @@
-"Custom menu": "Custom menu"
-"Enable the custom menu": "Enable the custom menu"
-"No": "No"
-"Yes": "Yes"
-"Menu": "Menu"
-? '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.'
-: '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.'
-"Top menu": "Top menu"
-"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
-"Experimental": "Experimental"
-"Save": "Save"
-"You like this app and you want to support me?": "You like this app and you want to support me?"
-"Buy me a coffee ☕": "Buy me a coffee ☕"
-"Hidden": "Hidden"
-"Small": "Small"
-"Normal": "Normal"
-"Big": "Big"
-"Hidden icon": "Hidden icon"
-"Small icon": "Small icon"
-"Normal icon": "Normal icon"
-"Big icon": "Big icon"
-"Hidden text": "Hidden text"
-"Small text": "Small text"
-"Normal text": "Normal text"
-"Big text": "Big text"
-"Colors": "Colors"
-"Background color": "Background color"
-"Background color of current app": "Background color of current app"
-"Text color": "Text color"
-"Loader": "Loader"
-"Icon": "Icon"
-"Same color": "Same color"
-"Opposite color": "Opposite color"
-"Transparent": "Transparent"
-"Opaque": "Opaque"
-"Opener": "Opener"
-"Default": "Default"
-"Default (dark)": "Default (dark)"
-"Hamburger": "Hamburger"
-"Hamburger (dark)": "Hamburger (dark)"
-"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": "Hamburger 2 (dark)"
-"Before the logo": "Before the logo"
-"After the logo": "After the logo"
-"Position": "Position"
-"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
-"Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
-"Display the big menu": "Display the big menu"
-"Display the logo": "Display the logo"
-"Icons and texts": "Icons and texts"
-"Loader enabled": "Loader enabled"
-"Tips": "Tips"
-"Always displayed": "Always displayed"
-"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Not compatible with touch screens."
-"Big menu": "Big menu"
-"Live preview": "Live preview"
-"Open apps in new tab": "Open apps in new tab"
-"Use the global setting": "Use the global setting"
-"Use my selection": "Use my selection"
-"Show and hide the list of applications": "Show and hide the list of applications"
-"Use the avatar instead of the logo": "Use the avatar instead of the logo"
-"You do not have permission to change the settings.": "You do not have permission to change the settings."
-"Force this configuration to users": "Force this configuration to users"
-"Export the configuration": "Export the configuration"
-"Purge the cache": "Purge the cache"
-"Show the link to settings": "Show the link to settings"
-"The menu is enabled by default for users": "The menu is enabled by default for users"
-"Except when the configuration is forced.": "Except when the configuration is forced."
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
-"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
-"Others": "Others"
-"Categories": "Categories"
-"Customize sorting": "Customize sorting"
-"Order by": "Order by"
-"Name": "Name"
-"Customed": "Customed"
-"Show and hide the list of categories": "Show and hide the list of categories"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
-"Dark mode colors": "Dark mode colors"
-"With categories": "With categories"
-"Custom categories": "Custom categories"
-"Customize application categories": "Customize application categories"
-"Reset to default": "Reset to default"
-"Applications": "Applications"
-"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Hide labels on mouse over"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/nl.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Hide labels on mouse over"
 "Except the hovered app": "Except the hovered app"
 "Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/pt_BR.yaml

@@ -91,4 +91,3 @@
 "Applications kept in the top menu but also shown in side menu": "Aplicativos mantidos no menu superior, mas também mostrados no menu lateral"
 "These applications must be selected in the previous option.": "Estes aplicativos devem ser selecionados na opção anterior."
 "Hide labels on mouse over": "Ocultar descrição ao passar o mouse"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/ru.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Скрыть название при наведении мыши"
 "Except the hovered app": "Except the hovered app"
 "Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/sk.yaml

@@ -91,4 +91,3 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Hide labels on mouse over"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/tpl/base.yaml

@@ -1,100 +1,98 @@
-"Custom menu": "Custom menu"
+"Custom menu": ""
-"Enable the custom menu": "Enable the custom menu"
+"Enable the custom menu": ""
-"No": "No"
+"No": ""
-"Yes": "Yes"
+"Yes": ""
-"Menu": "Menu"
+"Menu": ""
 ? '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.'
-: '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
+"Top menu": ""
-  navigate.'
+"Apps that not must be moved in the side menu": ""
-"Top menu": "Top menu"
+"If there is no selection then the global configuration is applied.": ""
-"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
+"Experimental": ""
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
+"Save": ""
-"Experimental": "Experimental"
+"You like this app and you want to support me?": ""
-"Save": "Save"
+"Buy me a coffee ☕": ""
-"You like this app and you want to support me?": "You like this app and you want to support me?"
+"Hidden": ""
-"Buy me a coffee ☕": "Buy me a coffee ☕"
+"Small": ""
-"Hidden": "Hidden"
+"Normal": ""
-"Small": "Small"
+"Big": ""
-"Normal": "Normal"
+"Hidden icon": ""
-"Big": "Big"
+"Small icon": ""
-"Hidden icon": "Hidden icon"
+"Normal icon": ""
-"Small icon": "Small icon"
+"Big icon": ""
-"Normal icon": "Normal icon"
+"Hidden text": ""
-"Big icon": "Big icon"
+"Small text": ""
-"Hidden text": "Hidden text"
+"Normal text": ""
-"Small text": "Small text"
+"Big text": ""
-"Normal text": "Normal text"
+"Colors": ""
-"Big text": "Big text"
+"Background color": ""
-"Colors": "Colors"
+"Background color of current app": ""
-"Background color": "Background color"
+"Text color": ""
-"Background color of current app": "Background color of current app"
+"Loader": ""
-"Text color": "Text color"
+"Icon": ""
-"Loader": "Loader"
+"Same color": ""
-"Icon": "Icon"
+"Opposite color": ""
-"Same color": "Same color"
+"Transparent": ""
-"Opposite color": "Opposite color"
+"Opaque": ""
-"Transparent": "Transparent"
+"Opener": ""
-"Opaque": "Opaque"
+"Default": ""
-"Opener": "Opener"
+"Default (dark)": ""
-"Default": "Default"
+"Hamburger": ""
-"Default (dark)": "Default (dark)"
+"Hamburger (dark)": ""
-"Hamburger": "Hamburger"
+"Hamburger 2": ""
-"Hamburger (dark)": "Hamburger (dark)"
+"Hamburger 2 (dark)": ""
-"Hamburger 2": "Hamburger 2"
+"Before the logo": ""
-"Hamburger 2 (dark)": "Hamburger 2 (dark)"
+"After the logo": ""
-"Before the logo": "Before the logo"
+"Position": ""
-"After the logo": "After the logo"
+"Show only the opener (hidden logo)": ""
-"Position": "Position"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": ""
-"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
+"Panel": ""
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": ""
-"Panel": "Panel"
+"Display the big menu": ""
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
+"Display the logo": ""
-"Display the big menu": "Display the big menu"
+"Icons and texts": ""
-"Display the logo": "Display the logo"
+"Loader enabled": ""
-"Icons and texts": "Icons and texts"
+"Tips": ""
-"Loader enabled": "Loader enabled"
+"Always displayed": ""
-"Tips": "Tips"
+"This is the automatic behavior when the menu is always displayed.": ""
-"Always displayed": "Always displayed"
+"Not compatible with touch screens.": ""
-"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
+"Big menu": ""
-"Not compatible with touch screens.": "Not compatible with touch screens."
+"Live preview": ""
-"Big menu": "Big menu"
+"Open apps in new tab": ""
-"Live preview": "Live preview"
+"Use the global setting": ""
-"Open apps in new tab": "Open apps in new tab"
+"Use my selection": ""
-"Use the global setting": "Use the global setting"
+"Show and hide the list of applications": ""
-"Use my selection": "Use my selection"
+"Use the avatar instead of the logo": ""
-"Show and hide the list of applications": "Show and hide the list of applications"
+"You do not have permission to change the settings.": ""
-"Use the avatar instead of the logo": "Use the avatar instead of the logo"
+"Force this configuration to users": ""
-"You do not have permission to change the settings.": "You do not have permission to change the settings."
+"Export the configuration": ""
-"Force this configuration to users": "Force this configuration to users"
+"Purge the cache": ""
-"Export the configuration": "Export the configuration"
+"Show the link to settings": ""
-"Purge the cache": "Purge the cache"
+"The menu is enabled by default for users": ""
-"Show the link to settings": "Show the link to settings"
+"Except when the configuration is forced.": ""
-"The menu is enabled by default for users": "The menu is enabled by default for users"
+"Apps that should not be displayed in the menu": ""
-"Except when the configuration is forced.": "Except when the configuration is forced."
+"This feature is only compatible with the <code>big menu</code> display.": ""
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
+"The logo is a link to the default app": ""
-"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
+"Others": ""
-"The logo is a link to the default app": "The logo is a link to the default app"
+"Categories": ""
-"Others": "Others"
+"Customize sorting": ""
-"Categories": "Categories"
+"Order by": ""
-"Customize sorting": "Customize sorting"
+"Name": ""
-"Order by": "Order by"
+"Customed": ""
-"Name": "Name"
+"Show and hide the list of categories": ""
-"Customed": "Customed"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": ""
-"Show and hide the list of categories": "Show and hide the list of categories"
+"Dark mode colors": ""
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
+"With categories": ""
-"Dark mode colors": "Dark mode colors"
+"Custom categories": ""
-"With categories": "With categories"
+"Customize application categories": ""
-"Custom categories": "Custom categories"
+"Reset to default": ""
-"Customize application categories": "Customize application categories"
+"Applications": ""
-"Reset to default": "Reset to default"
+"Applications kept in the top menu": ""
-"Applications": "Applications"
+"Applications kept in the top menu but also shown in side menu": ""
-"Applications kept in the top menu": "Applications kept in the top menu"
+"These applications must be selected in the previous option.": ""
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
+"Hide labels on mouse over": ""
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
+"Except the hovered app": ""
-"Hide labels on mouse over": "Hide labels on mouse over"
+"Search": ""
-"Except the hovered app": "Except the hovered app"
+"Toggle menu": ""
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/zh_CN.yaml

@@ -93,4 +93,3 @@
 "Hide labels on mouse over": "Hide labels on mouse over"
 "Except the hovered app": "Except the hovered app"
 "Search": "Search"
-"Toggle menu": "Toggle menu"

src/lib/createElement.js

@@ -3,13 +3,7 @@ module.exports = (tagName, attributes) => {
 
   if (typeof attributes === 'object') {
     for (let i in attributes) {
-      if (i === 'text') {
+      element.setAttribute(i, attributes[i])
-        element.textContent = attributes[i]
-      } else if (i === 'html') {
-        element.innerHTML = attributes[i]
-      } else {
-        element.setAttribute(i, attributes[i])
-      }
     }
   }
 

templates/css/stylesheet.php

@@ -42,11 +42,13 @@
     top: 49px;
   }
 
-  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
+  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer
+  {
     visibility: hidden;
   }
 
-  #side-menu.hide-opener.side-menu-with-categories .side-menu-search {
+  #side-menu.hide-opener.side-menu-with-categories .side-menu-search
+  {
     float: none;
   }
 

templates/js/script.php

@@ -16,15 +16,13 @@ if ($_['always-displayed']) {
   const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
   const sideMenuOpener = SMcreateElement('button', {
     'class': 'side-menu-opener',
-    'arial-label': t('side_menu', 'Toggle the menu'),
+    'arial-label': t('side_menu', 'Toggle menu')
-    'html': `<span>${t('side_menu', 'Toggle the menu')}</span>`
   })
   const sideMenu = SMcreateElement('div', {id: 'side-menu'})
 
   const body = document.querySelector('body')
   const html = document.querySelector('html')
   const nextcloud = document.querySelector('#nextcloud')
-  const logo = document.querySelector('.header-left .logo')
 
   const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
 
@@ -40,15 +38,6 @@ if ($_['always-displayed']) {
     sideMenu.setAttribute('data-sidewithcategories', '1')
   <?php endif; ?>
 
-  const sideMenuFocus = () => {
-    let a = document.querySelector('#side-menu .side-menu-app.active a')
-      || document.querySelector('#side-menu .side-menu-app a')
-
-    if (a) {
-      a.focus()
-    }
-  }
-
   document.querySelector('body').addEventListener('side-menu.apps', (e) => {
     const apps = e.detail.apps;
 
@@ -91,6 +80,22 @@ if ($_['always-displayed']) {
       return
     }
 
+    sideMenuFocus = () => {
+      let a = document.querySelector('.side-menu-app.active a', sideMenu)
+
+      if (!a) {
+        return
+      }
+
+      if (a.length === 0) {
+        a = sideMenu.querySelector('.side-menu-app:first-child a')
+      }
+
+      if (a.length > 0) {
+        a.focus()
+      }
+    }
+
     <?php if ($_['opener-hover']): ?>
       const sideMenuMouseLeave = () => {
         sideMenu.classList.remove('open')
@@ -122,8 +127,14 @@ if ($_['always-displayed']) {
 
     headerMenuOpener.addEventListener('click', () => {
       sideMenu.classList.add('open')
+
+      const a = sideMenu.querySelector('.side-menu-app.active a')
+
+      if (a !== null) {
+        a.focus()
+      }
+
       headerMenuOpener.blur()
-      sideMenuFocus()
     })
 
     for (let opener of sideMenuOpener) {
@@ -171,10 +182,6 @@ if ($_['always-displayed']) {
   <?php endif; ?>
 
   if (nextcloud) {
-    if (logo && logo.parentNode !== nextcloud) {
-      nextcloud.appendChild(logo)
-    }
-
     <?php if ($_['opener-position'] === 'before'): ?>
       nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
     <?php else: ?>

templates/settings/personal-form.php

@@ -241,7 +241,6 @@ $labelReset = 'Reset to default';
     <div class="section">
         <?php if (!$_['force']): ?>
             <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
-                <?php p($l->t('Save')); ?>
                 <progress max="100" value="0" id="side-menu-save-progress"></progress>
             </button>