Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Simon Vieille
|
22e5445330 | ||
|
Simon Vieille
|
0544fd3765 | ||
|
Simon Vieille
|
2635dd89ca | ||
|
Simon Vieille
|
aa203bb406 | ||
|
Simon Vieille
|
368c59a2bd | ||
|
Simon Vieille
|
ab7b1e96fe | ||
|
Simon Vieille
|
f4322a8d71 |
@@ -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.
|
||||
value: |
|
||||
```
|
||||
{
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -0,0 +1,64 @@
|
||||
pipeline:
|
||||
dependencies:
|
||||
image: gitnet.fr/deblan/devenv
|
||||
commands:
|
||||
- make dep
|
||||
when:
|
||||
event: [tag, push, pull_request]
|
||||
branch: [master, develop, feature/*, translations]
|
||||
|
||||
osv_detector:
|
||||
image: gitnet.fr/deblan/docker-osv-detector:v0.9
|
||||
commands:
|
||||
- osv-detector package-lock.json
|
||||
failure: ignore
|
||||
|
||||
build:
|
||||
image: gitnet.fr/deblan/devenv
|
||||
commands:
|
||||
- make build
|
||||
when:
|
||||
branch: [master, develop, feature/*, translations]
|
||||
event: [push, pull_request]
|
||||
|
||||
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]
|
||||
|
||||
package:
|
||||
image: gitnet.fr/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]
|
||||
@@ -1,22 +0,0 @@
|
||||
variables:
|
||||
volumes: &volumes
|
||||
- /data/${CI_REPO}:/builds
|
||||
|
||||
when:
|
||||
event: [tag, push, pull_request, manual]
|
||||
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
|
||||
|
||||
steps:
|
||||
"Build JS":
|
||||
image: node:20
|
||||
commands:
|
||||
- make build
|
||||
|
||||
"Build translations":
|
||||
image: deblan/php:8.3
|
||||
commands:
|
||||
- php bin/generate_l10n.php
|
||||
|
||||
"Build cache":
|
||||
image: gitnet.fr/deblan/woodpecker-cache
|
||||
volumes: *volumes
|
||||
@@ -1,66 +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
|
||||
volumes: *volumes
|
||||
environment:
|
||||
APP_CERTIFICATE:
|
||||
from_secret: app_certificate
|
||||
APP_PUBLIC_CERTIFICATE:
|
||||
from_secret: app_public_certificate
|
||||
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
|
||||
environment:
|
||||
APP_CERTIFICATE:
|
||||
from_secret: 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//}/*
|
||||
@@ -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
|
||||
-145
@@ -1,150 +1,5 @@
|
||||
## [Unreleased]
|
||||
|
||||
## 4.1.1
|
||||
### Fixed
|
||||
* fix(CssController): add missing NoCSRFRequired import (#397)
|
||||
* fix(SideMenu): ncApps must be an array (#369)
|
||||
|
||||
## 4.1.0
|
||||
### Added
|
||||
* add compatibility with NC31
|
||||
### Fixed
|
||||
* fix(service): add service constructor arguments
|
||||
* fix(settings): remove non-existing and unused ILogger service
|
||||
### Changed
|
||||
* refactor(controller): usage of attributes instead of annotations
|
||||
|
||||
## 4.0.1
|
||||
### Fixed
|
||||
* fix top menu labels (fix #368)
|
||||
* fix #369: The menu is displayed even if there are no apps
|
||||
|
||||
## 4.0.0
|
||||
### Added
|
||||
* add compatibility with NC30
|
||||
|
||||
## 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)
|
||||
|
||||
## 3.11.5
|
||||
### Fixed
|
||||
* add missing label on buttons for accessiblity (fix #311)
|
||||
|
||||
## 3.11.4
|
||||
### Fixed
|
||||
* add label on buttons for accessiblity (fix #311)
|
||||
|
||||
## 3.11.3
|
||||
### Fixed
|
||||
* fix menu icon in decks, collectives and other apps (#302)
|
||||
|
||||
## 3.11.2
|
||||
### Fixed
|
||||
* add default translations for Slovak - fix #298
|
||||
|
||||
## 3.11.1
|
||||
### Added
|
||||
* add Portuguese (Brazil) translations - Thanks to igorfreire
|
||||
### Fixed
|
||||
* add width to .side-menu-categories for side menu with categories display - fix #294
|
||||
|
||||
## 3.11.0
|
||||
### Added
|
||||
* add a search component in menus - fix #282
|
||||
### Fixed
|
||||
* remove the label of the link to personal settings - fix #283
|
||||
|
||||
## 3.10.3
|
||||
### Fixed
|
||||
* change the way to load nextcloud components (NcActionLink/NcActions) - fix #274
|
||||
* update @nexcloud/* packages
|
||||
|
||||
## 3.10.2
|
||||
### Fixed
|
||||
* add missing properties
|
||||
|
||||
## 3.10.1
|
||||
### Fixed
|
||||
* fix #269: use php7 syntax
|
||||
|
||||
## 3.10.0
|
||||
### Added
|
||||
* add compatibility with NC28
|
||||
### Fixed
|
||||
* fix NC28 error: remove deprecated method `OC_App::getNavigation()`
|
||||
|
||||
## 3.9.1
|
||||
### Fixed
|
||||
* fix fixed menu on dashboard (#262)
|
||||
|
||||
## 3.9.0
|
||||
### Added
|
||||
* add compatibility with NC27
|
||||
### Fixed
|
||||
* fix app redirect (#261)
|
||||
|
||||
## 3.8.0
|
||||
### Added
|
||||
* add option to show hovered label only on top menu (fix #253)
|
||||
|
||||
## 3.7.4
|
||||
### Fixed
|
||||
* fix Integrity failed (#247)
|
||||
|
||||
## 3.7.3
|
||||
### Fixed
|
||||
* fix #244: use app href for redirection
|
||||
### Added
|
||||
* add signature on build
|
||||
|
||||
## 3.7.2
|
||||
### Added
|
||||
* update pipeline conditions allowing `fix/*`
|
||||
### Fixed
|
||||
* fix #233: load configuration and then retrieve apps in default side menu display
|
||||
|
||||
## 3.7.1
|
||||
### Fixed
|
||||
* fix build process (#230)
|
||||
|
||||
## 3.7.0
|
||||
### Added
|
||||
* add translations (thanks to AHOHNMYC)
|
||||
* add compatibility with NC26
|
||||
|
||||
## 3.6.0
|
||||
### Added
|
||||
* add hidden apps compatible with default menu (#219)
|
||||
|
||||
@@ -9,7 +9,7 @@ dep:
|
||||
npm link @nextcloud/vue || sudo npm link @nextcloud/vue
|
||||
|
||||
.ONESHELL:
|
||||
release:
|
||||
release: build translations
|
||||
if [ -z "$$VERSION" ]; then
|
||||
echo "VERSION required"
|
||||
exit 1
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
[](https://ci.gitnet.fr/deblan/side_menu)
|
||||
[](https://translate.codeberg.org/engage/custom-menu/)
|
||||
|
||||
|
||||
Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
|
||||
You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.
|
||||
|
||||
+17
-16
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
|
||||
<?xml version="1.0"?>
|
||||
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
|
||||
<id>side_menu</id>
|
||||
<name>Custom menu</name>
|
||||
<summary>Modify the display of the menu.</summary>
|
||||
@@ -16,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
|
||||
|
||||
Requirements:
|
||||
|
||||
* PHP >= 8.1
|
||||
* PHP >= 8.0
|
||||
* App `theming` enabled
|
||||
|
||||
If you like this application and if you want to support the development:
|
||||
@@ -31,9 +32,9 @@ 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>4.1.1</version>
|
||||
<version>3.6.0</version>
|
||||
<licence>agpl</licence>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||
<namespace>SideMenu</namespace>
|
||||
<documentation>
|
||||
<admin>https://deblan.gitnet.page/side_menu_doc/</admin>
|
||||
@@ -41,20 +42,20 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
|
||||
</documentation>
|
||||
<category>customization</category>
|
||||
<website>https://gitnet.fr/deblan/side_menu</website>
|
||||
<discussion><![CDATA[https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org]]></discussion>
|
||||
<discussion>https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org</discussion>
|
||||
<bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
|
||||
<repository type="git">https://gitnet.fr/deblan/side_menu</repository>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/admin_settings.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/n19_big_menu.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc18_menu_always_displayed.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png]]></screenshot>
|
||||
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
|
||||
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
|
||||
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/admin_settings.png</screenshot>
|
||||
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/n19_big_menu.png</screenshot>
|
||||
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc18_menu_always_displayed.png</screenshot>
|
||||
<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>
|
||||
<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>
|
||||
<php min-version="8.1" max-version="8.4" />
|
||||
<nextcloud min-version="30" max-version="32"/>
|
||||
<nextcloud min-version="25" max-version="25"/>
|
||||
<php min-version="7.4"/>
|
||||
</dependencies>
|
||||
<settings>
|
||||
<admin>OCA\SideMenu\Settings\Admin</admin>
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
return [
|
||||
'routes' => [
|
||||
['name' => 'App#index', 'url' => '/', 'verb' => 'GET'],
|
||||
['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
|
||||
['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
|
||||
['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
|
||||
['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
|
||||
['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
|
||||
['name' => 'AdminSetting#removeCache', 'url' => '/admin/cache/remove', 'verb' => 'GET'],
|
||||
['name' => 'AdminSetting#exportConfiguration', 'url' => '/admin/config/export', 'verb' => 'GET'],
|
||||
],
|
||||
];
|
||||
+13
-67
@@ -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)
|
||||
{
|
||||
global $argv;
|
||||
$configFile = $argv[1];
|
||||
$databaseFile = $argv[2];
|
||||
|
||||
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
|
||||
{
|
||||
$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) {
|
||||
foreach ($config as $key => $value) {
|
||||
$stmt->execute([
|
||||
'appId' => 'side_menu',
|
||||
'key' => $key,
|
||||
|
||||
+7
-55
@@ -47,7 +47,7 @@
|
||||
margin-top: 2px;
|
||||
float: right;
|
||||
line-height: 34px;
|
||||
height: 42px;
|
||||
height: 28px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
@@ -165,7 +155,7 @@
|
||||
}
|
||||
|
||||
#side-menu.hide-opener .side-menu-logo {
|
||||
margin-top: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#side-menu-loader {
|
||||
@@ -211,6 +201,7 @@
|
||||
max-height: calc(100vh - 55px);
|
||||
overflow: auto;
|
||||
position: relative;
|
||||
top: 5px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
@@ -225,11 +216,6 @@
|
||||
.side-menu-category-title {
|
||||
padding-left: 10px;
|
||||
color: var(--side-menu-text-color, #fff);
|
||||
font-weight: bold;
|
||||
font-size: 20px;
|
||||
margin-bottom: 12px;
|
||||
line-height: 30px;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.side-menu-loader {
|
||||
@@ -237,7 +223,7 @@
|
||||
}
|
||||
|
||||
.side-menu-loader svg {
|
||||
width: 45px;
|
||||
width: 38px;
|
||||
margin: auto;
|
||||
stroke: var(--side-menu-text-color, #fff);
|
||||
}
|
||||
@@ -253,23 +239,14 @@
|
||||
left: 50px;
|
||||
}
|
||||
|
||||
.side-menu-always-displayed #header {
|
||||
position: absolute !important;
|
||||
}
|
||||
|
||||
.side-menu-always-displayed #side-menu {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.side-menu-always-displayed .side-menu-apps-list {
|
||||
height: 100vh;
|
||||
top: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.side-menu-always-displayed .side-menu-apps-list--with-settings {
|
||||
height: calc(100vh - 49px);
|
||||
top: 49px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.side-menu-always-displayed .side-menu-apps-list:hover {
|
||||
@@ -302,9 +279,8 @@
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.side-menu-always-displayed .app-navigation-toggle-wrapper {
|
||||
right: 0 !important;
|
||||
margin-left: 0 !important;
|
||||
.side-menu-always-displayed .app-navigation--close {
|
||||
transform: translateX(calc(-100% + 50px)) !important;
|
||||
}
|
||||
|
||||
#side-menu.side-menu-with-categories {
|
||||
@@ -315,7 +291,6 @@
|
||||
.side-menu-with-categories .side-menu-categories {
|
||||
display: block;
|
||||
padding: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.side-menu-with-categories .side-menu-category {
|
||||
@@ -334,35 +309,12 @@
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.side-menu-search {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.side-menu-search input {
|
||||
background: none;
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
color: var(--side-menu-text-color);
|
||||
}
|
||||
|
||||
.side-menu-search input::placeholder {
|
||||
color: var(--side-menu-text-color);
|
||||
}
|
||||
|
||||
.side-menu-always-displayed .side-menu-search {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 1024px) {
|
||||
#side-menu.side-menu-big {
|
||||
max-width: 290px;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
#side-menu.hide-opener.side-menu-big .side-menu-search {
|
||||
float: none;
|
||||
}
|
||||
|
||||
.side-menu-categories {
|
||||
display: block;
|
||||
padding: 0;
|
||||
|
||||
+32
-55
@@ -3,7 +3,6 @@
|
||||
namespace OCA\SideMenu\AppInfo;
|
||||
|
||||
use OC;
|
||||
use OC\App\AppStore\Fetcher\CategoryFetcher;
|
||||
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
|
||||
use OC\User\User;
|
||||
use OCA\SideMenu\Service\AppRepository;
|
||||
@@ -13,11 +12,7 @@ use OCP\AppFramework\App;
|
||||
use OCP\AppFramework\Bootstrap\IBootContext;
|
||||
use OCP\AppFramework\Bootstrap\IBootstrap;
|
||||
use OCP\AppFramework\Bootstrap\IRegistrationContext;
|
||||
use OCP\EventDispatcher\IEventDispatcher;
|
||||
use OCP\IConfig;
|
||||
use OCP\INavigationManager;
|
||||
use OCP\IUserSession;
|
||||
use OCP\L10N\IFactory;
|
||||
use OCP\Util;
|
||||
use Psr\Container\ContainerInterface;
|
||||
|
||||
@@ -31,7 +26,6 @@ class Application extends App implements IBootstrap
|
||||
public const APP_ID = 'side_menu';
|
||||
|
||||
public const APP_NAME = 'Custom menu';
|
||||
|
||||
/**
|
||||
* @var OC\AllConfig
|
||||
*/
|
||||
@@ -47,55 +41,14 @@ class Application extends App implements IBootstrap
|
||||
*/
|
||||
protected $user;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function __construct(array $urlParams = [])
|
||||
{
|
||||
parent::__construct(self::APP_ID, $urlParams);
|
||||
}
|
||||
|
||||
public function register(IRegistrationContext $context): void
|
||||
{
|
||||
$context->registerService(CategoryRepository::class, function (ContainerInterface $c) {
|
||||
return new CategoryRepository(
|
||||
$c->get(CategoryFetcher::class),
|
||||
$c->get(ConfigProxy::class),
|
||||
$c->get(IConfig::class),
|
||||
$c->get(IFactory::class),
|
||||
$c->get(IUserSession::class)
|
||||
);
|
||||
});
|
||||
|
||||
$context->registerService(AppRepository::class, function (ContainerInterface $c) {
|
||||
return new AppRepository(
|
||||
$c->get(\OC_App::class),
|
||||
$c->get(INavigationManager::class),
|
||||
$c->get(IFactory::class),
|
||||
$c->get(ConfigProxy::class),
|
||||
$c->get(CategoryRepository::class),
|
||||
$c->get(IEventDispatcher::class),
|
||||
$c->get(IUserSession::class)
|
||||
);
|
||||
});
|
||||
|
||||
$context->registerService(ConfigProxy::class, function (ContainerInterface $c) {
|
||||
return new ConfigProxy(
|
||||
$c->get(IConfig::class),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
protected function isEnabled(): bool
|
||||
{
|
||||
$enabled = true;
|
||||
@@ -144,14 +97,38 @@ class Application extends App implements IBootstrap
|
||||
$cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
|
||||
|
||||
foreach ($assets as $value) {
|
||||
$route = \OC::$server->getURLGenerator()->linkToRoute(
|
||||
$value['route'],
|
||||
['v' => $cache]
|
||||
);
|
||||
|
||||
$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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -21,28 +20,39 @@ namespace OCA\SideMenu\Controller;
|
||||
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
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,
|
||||
IRequest $request,
|
||||
protected IConfig $config,
|
||||
protected IURLGenerator $urlGenerator
|
||||
) {
|
||||
/**
|
||||
* @var IConfig
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @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]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/admin/cache/remove')]
|
||||
public function removeCache(): RedirectResponse
|
||||
/**
|
||||
* @NoCSRFRequired
|
||||
*
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function removeCache()
|
||||
{
|
||||
$this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
|
||||
|
||||
@@ -51,9 +61,12 @@ class AdminSettingController extends Controller
|
||||
]).'#more');
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/admin/config/export')]
|
||||
public function exportConfiguration(): DataDownloadResponse
|
||||
/**
|
||||
* @NoCSRFRequired
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function exportConfiguration()
|
||||
{
|
||||
$keys = $this->config->getAppKeys(Application::APP_ID);
|
||||
$appConfig = [];
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -19,12 +18,10 @@
|
||||
|
||||
namespace OCA\SideMenu\Controller;
|
||||
|
||||
use OC;
|
||||
use OCA\SideMenu\Service\AppRepository;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\RedirectResponse;
|
||||
use OCP\IRequest;
|
||||
use OCP\IURLGenerator;
|
||||
@@ -32,22 +29,37 @@ 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,
|
||||
protected IURLGenerator $urlGenerator,
|
||||
protected ConfigProxy $config
|
||||
AppRepository $appRepository,
|
||||
IURLGenerator $urlGenerator,
|
||||
ConfigProxy $config
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->appRepository = $appRepository;
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[NoAdminRequired]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/')]
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
*/
|
||||
public function index(): RedirectResponse
|
||||
{
|
||||
$user = \OC::$server[IUserSession::class]->getUser();
|
||||
$user = OC::$server[IUserSession::class]->getUser();
|
||||
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
|
||||
$hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
|
||||
$isForced = $this->config->getAppValueBool('force', '0');
|
||||
@@ -62,37 +74,33 @@ class AppController extends Controller
|
||||
$inTopMenuApps = in_array($app['id'], $topMenuApps);
|
||||
$inHiddenApps = in_array($app['id'], $hiddenApps);
|
||||
|
||||
if (!$inTopMenuApps && $inHiddenApps) {
|
||||
if (!$inTopMenuApps || $inHiddenApps) {
|
||||
continue;
|
||||
}
|
||||
|
||||
return $this->redirectToApp($app, true);
|
||||
return $this->redirectToApp($app['id']);
|
||||
}
|
||||
|
||||
return $this->redirectToApp('files');
|
||||
}
|
||||
|
||||
protected function redirectToApp($app, bool $isHref = false): RedirectResponse
|
||||
protected function redirectToApp($appId): RedirectResponse
|
||||
{
|
||||
if (!$isHref) {
|
||||
$isIgnoreFrontController = true === \OC::$server->getConfig()->getSystemValue(
|
||||
'htaccess.IgnoreFrontController',
|
||||
false
|
||||
);
|
||||
$isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
|
||||
'htaccess.IgnoreFrontController',
|
||||
false
|
||||
);
|
||||
|
||||
$isFrontControllerActive = 'true' === getenv('front_controller_active');
|
||||
$isFrontControllerActive = 'true' === getenv('front_controller_active');
|
||||
|
||||
if ($isIgnoreFrontController || $isFrontControllerActive) {
|
||||
$path = '/apps/%s/';
|
||||
} else {
|
||||
$path = '/index.php/apps/%s/';
|
||||
}
|
||||
|
||||
$url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $app));
|
||||
if ($isIgnoreFrontController || $isFrontControllerActive) {
|
||||
$path = '/apps/%s/';
|
||||
} else {
|
||||
$url = $app['href'];
|
||||
$path = '/index.php/apps/%s/';
|
||||
}
|
||||
|
||||
$url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId));
|
||||
|
||||
return new RedirectResponse($url);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -19,40 +18,63 @@
|
||||
|
||||
namespace OCA\SideMenu\Controller;
|
||||
|
||||
use OC;
|
||||
use OC\User\User;
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCA\SideMenu\Service\Color;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\Attribute\PublicPage;
|
||||
use OCP\AppFramework\Http\Response;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\IRequest;
|
||||
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,
|
||||
protected ThemingDefaults $theming,
|
||||
protected Color $color
|
||||
ConfigProxy $config,
|
||||
ThemingDefaults $theming,
|
||||
Color $color
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->user = \OC::$server[IUserSession::class]->getUser();
|
||||
$this->user = OC::$server[IUserSession::class]->getUser();
|
||||
$this->config = $config;
|
||||
$this->theming = $theming;
|
||||
$this->color = $color;
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[NoAdminRequired]
|
||||
#[PublicPage]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/css/stylesheet')]
|
||||
public function stylesheet(): TemplateResponse
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
* @PublicPage
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function stylesheet()
|
||||
{
|
||||
$response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
|
||||
$response->addHeader('Content-Type', 'text/css');
|
||||
@@ -85,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
|
||||
|| ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
|
||||
$isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled ||
|
||||
($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
|
||||
} else {
|
||||
$isDarkThemeUserEnabled = false;
|
||||
$isBreezeDarkUserEnabled = false;
|
||||
}
|
||||
|
||||
$isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled)
|
||||
|| ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
|
||||
$isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) ||
|
||||
($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
|
||||
|
||||
$primaryColor = $this->theming->getColorPrimary();
|
||||
$lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -19,15 +18,12 @@
|
||||
|
||||
namespace OCA\SideMenu\Controller;
|
||||
|
||||
use OC;
|
||||
use OC\User\User;
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\Attribute\PublicPage;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\IRequest;
|
||||
@@ -36,28 +32,47 @@ 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,
|
||||
protected ThemingDefaults $themingDefaults,
|
||||
protected IFactory $l10nFactory
|
||||
ConfigProxy $config,
|
||||
ThemingDefaults $themingDefaults,
|
||||
IFactory $l10nFactory
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->themingDefaults = $themingDefaults;
|
||||
|
||||
$this->user = \OC::$server[IUserSession::class]->getUser();
|
||||
$this->user = OC::$server[IUserSession::class]->getUser();
|
||||
$this->config = $config;
|
||||
$this->l10nFactory = $l10nFactory;
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[NoAdminRequired]
|
||||
#[PublicPage]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/js/script')]
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
* @PublicPage
|
||||
*/
|
||||
public function script(): TemplateResponse
|
||||
{
|
||||
$response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
|
||||
@@ -66,10 +81,11 @@ class JsController extends Controller
|
||||
return $response;
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[NoAdminRequired]
|
||||
#[PublicPage]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/js/config')]
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
* @PublicPage
|
||||
*/
|
||||
public function config(): JSONResponse
|
||||
{
|
||||
return new JSONResponse($this->getConfig());
|
||||
@@ -111,10 +127,10 @@ class JsController extends Controller
|
||||
$targetBlankApps = $userTargetBlankApps;
|
||||
}
|
||||
|
||||
$isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
|
||||
$isAvatarSet = OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
|
||||
|
||||
if ($useAvatar && $isAvatarSet) {
|
||||
$avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
|
||||
$avatar = OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
|
||||
'userId' => $this->user->getUid(),
|
||||
'size' => 128,
|
||||
'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
|
||||
@@ -122,13 +138,13 @@ class JsController extends Controller
|
||||
}
|
||||
|
||||
if ($this->config->getAppValueBool('show-settings', '0')) {
|
||||
$settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
|
||||
$settingsNav = OC::$server->getNavigationManager()->getAll('settings');
|
||||
|
||||
if (isset($settingsNav['settings'])) {
|
||||
$settings = [
|
||||
'href' => $settingsNav['settings']['href'],
|
||||
'name' => $settingsNav['settings']['name'],
|
||||
'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
|
||||
'avatar' => OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
|
||||
'userId' => $this->user->getUid(),
|
||||
'size' => 32,
|
||||
'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
|
||||
@@ -138,7 +154,7 @@ class JsController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
$indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
|
||||
$indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
|
||||
|
||||
return [
|
||||
'opener-position' => $this->config->getAppValue('opener-position', 'before'),
|
||||
@@ -155,7 +171,7 @@ class JsController extends Controller
|
||||
'avatar' => $avatar,
|
||||
'top-menu-apps' => $topMenuApps,
|
||||
'top-side-menu-apps' => $topSideMenuApps,
|
||||
'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt(
|
||||
'top-menu-mouse-over-hidden-label' => $this->config->getAppValueBool(
|
||||
'top-menu-mouse-over-hidden-label',
|
||||
'0'
|
||||
),
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -19,15 +18,13 @@
|
||||
|
||||
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;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\Attribute\PublicPage;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\IRequest;
|
||||
use OCP\IUserSession;
|
||||
@@ -35,25 +32,59 @@ 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,
|
||||
protected AppRepository $appRepository,
|
||||
protected CategoryRepository $categoryRepository,
|
||||
protected URLGenerator $router,
|
||||
protected IFactory $l10nFactory
|
||||
ConfigProxy $config,
|
||||
AppRepository $appRepository,
|
||||
CategoryRepository $categoryRepository,
|
||||
URLGenerator $router,
|
||||
IFactory $l10nFactory
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->config = $config;
|
||||
$this->appRepository = $appRepository;
|
||||
$this->categoryRepository = $categoryRepository;
|
||||
$this->l10nFactory = $l10nFactory;
|
||||
$this->router = $router;
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[NoAdminRequired]
|
||||
#[PublicPage]
|
||||
#[FrontpageRoute(verb: 'GET', url: '/nav/items')]
|
||||
public function items(): JSONResponse
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
* @PublicPage
|
||||
*
|
||||
* @return JSONResponse
|
||||
*/
|
||||
public function items()
|
||||
{
|
||||
$user = \OC::$server[IUserSession::class]->getUser();
|
||||
$user = OC::$server[IUserSession::class]->getUser();
|
||||
$items = [];
|
||||
|
||||
if (!$user) {
|
||||
@@ -158,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;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -22,29 +21,52 @@ namespace OCA\SideMenu\Controller;
|
||||
use OCA\SideMenu\AppInfo\Application;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
|
||||
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
||||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
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,
|
||||
protected ConfigProxy $configProxy,
|
||||
protected IUserSession $userSession
|
||||
IConfig $config,
|
||||
ConfigProxy $configProxy,
|
||||
IUserSession $userSession
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->config = $config;
|
||||
$this->configProxy = $configProxy;
|
||||
$this->userSession = $userSession;
|
||||
}
|
||||
|
||||
#[NoCSRFRequired]
|
||||
#[NoAdminRequired]
|
||||
#[FrontpageRoute(verb: 'POST', url: '/personalSetting/valueSet')]
|
||||
public function valueSet($name, $value): array
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
*
|
||||
* @param mixed $name
|
||||
* @param mixed $value
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function valueSet($name, $value)
|
||||
{
|
||||
$doSave = false;
|
||||
$user = $this->userSession->getUser();
|
||||
|
||||
@@ -3,12 +3,6 @@
|
||||
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,27 +12,46 @@ use OCP\L10N\IFactory;
|
||||
*/
|
||||
class AppRepository
|
||||
{
|
||||
/**
|
||||
* @var \OC_App
|
||||
*/
|
||||
protected $ocApp;
|
||||
|
||||
/**
|
||||
* @var IFactory
|
||||
*/
|
||||
protected $l10nFactory;
|
||||
|
||||
/**
|
||||
* @var ConfigProxy
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var CategoryRepository
|
||||
*/
|
||||
protected $categoryRepository;
|
||||
|
||||
public function __construct(
|
||||
protected \OC_App $ocApp,
|
||||
protected INavigationManager $navigationManager,
|
||||
protected IFactory $l10nFactory,
|
||||
protected ConfigProxy $config,
|
||||
protected CategoryRepository $categoryRepository,
|
||||
protected IEventDispatcher $dispatcher,
|
||||
protected IUserSession $userSession,
|
||||
\OC_App $ocApp,
|
||||
IFactory $l10nFactory,
|
||||
ConfigProxy $config,
|
||||
CategoryRepository $categoryRepository
|
||||
) {
|
||||
$this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent(
|
||||
$this->userSession->isLoggedIn(),
|
||||
new TemplateResponse(Application::APP_NAME, '')
|
||||
));
|
||||
$this->ocApp = $ocApp;
|
||||
$this->l10nFactory = $l10nFactory;
|
||||
$this->config = $config;
|
||||
$this->categoryRepository = $categoryRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves visibles apps.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getVisibleApps(): array
|
||||
public function getVisibleApps()
|
||||
{
|
||||
$navigation = $this->navigationManager->getAll();
|
||||
$navigation = $this->ocApp->getNavigation();
|
||||
$appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
|
||||
$categories = $this->categoryRepository->getOrderedCategories();
|
||||
$apps = $this->ocApp->listAllApps();
|
||||
@@ -69,14 +82,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 +102,7 @@ class AppRepository
|
||||
return $visibleApps;
|
||||
}
|
||||
|
||||
public function getAppName($app): string
|
||||
public function getAppName($app)
|
||||
{
|
||||
return $this->config->getAppValue(
|
||||
'app.navigation.name',
|
||||
@@ -106,7 +111,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', '[]');
|
||||
|
||||
@@ -15,18 +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,
|
||||
protected ConfigProxy $config,
|
||||
protected IConfig $iConfig,
|
||||
protected IFactory $l10nFactory,
|
||||
protected IUserSession $userSession
|
||||
) {}
|
||||
CategoryFetcher $categoryFetcher,
|
||||
ConfigProxy $config,
|
||||
IConfig $iConfig,
|
||||
IFactory $l10nFactory,
|
||||
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');
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+62
-12
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -22,25 +21,76 @@ 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,
|
||||
protected ConfigProxy $config,
|
||||
protected AppRepository $appRepository,
|
||||
protected CategoryRepository $categoryRepository,
|
||||
protected ThemingDefaults $theming,
|
||||
protected Color $color,
|
||||
protected LangRepository $langRepository
|
||||
) {}
|
||||
IL10N $l,
|
||||
ILogger $logger,
|
||||
ConfigProxy $config,
|
||||
AppRepository $appRepository,
|
||||
CategoryRepository $categoryRepository,
|
||||
ThemingDefaults $theming,
|
||||
Color $color,
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return TemplateResponse
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -26,26 +25,59 @@ use OCP\Settings\IIconSection;
|
||||
|
||||
class AdminSection implements IIconSection
|
||||
{
|
||||
public function __construct(
|
||||
protected IURLGenerator $url,
|
||||
protected IL10N $l
|
||||
) {}
|
||||
/**
|
||||
* @var IL10N
|
||||
*/
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getIcon()
|
||||
{
|
||||
return $this->url->imagePath(Application::APP_ID, 'icon.svg');
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -24,17 +23,50 @@ use OCA\SideMenu\Service\AppRepository;
|
||||
use OCA\SideMenu\Service\ConfigProxy;
|
||||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\IL10N;
|
||||
use OCP\ILogger;
|
||||
use OCP\IUserSession;
|
||||
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,
|
||||
protected ConfigProxy $config,
|
||||
protected IUserSession $userSession,
|
||||
protected AppRepository $appRepository
|
||||
) {}
|
||||
IL10N $l,
|
||||
ILogger $logger,
|
||||
ConfigProxy $config,
|
||||
IUserSession $userSession,
|
||||
AppRepository $appRepository
|
||||
) {
|
||||
$this->l = $l;
|
||||
$this->logger = $logger;
|
||||
$this->config = $config;
|
||||
$this->userSession = $userSession;
|
||||
$this->appRepository = $appRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return TemplateResponse
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
@@ -27,12 +26,34 @@ use OCP\Settings\IIconSection;
|
||||
|
||||
class PersonalSection implements IIconSection
|
||||
{
|
||||
public function __construct(
|
||||
protected IURLGenerator $url,
|
||||
protected IL10N $l,
|
||||
protected ConfigProxy $configProxy
|
||||
) {}
|
||||
/**
|
||||
* @var IL10N
|
||||
*/
|
||||
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')) {
|
||||
@@ -60,6 +94,9 @@ class PersonalSection implements IIconSection
|
||||
return 70;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getIcon()
|
||||
{
|
||||
return $this->url->imagePath(Application::APP_ID, 'icon.svg');
|
||||
|
||||
+40
-50
@@ -11,15 +11,9 @@
|
||||
"stylelint:fix": "./node_modules/.bin/stylelint src --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nextcloud/axios": "^2.5.1",
|
||||
"@nextcloud/browserslist-config": "^3.0.1",
|
||||
"@nextcloud/event-bus": "^3.3.1",
|
||||
"@nextcloud/initial-state": "^2.2.0",
|
||||
"@nextcloud/l10n": "^3.1.0",
|
||||
"@nextcloud/vue": "^8.19.0",
|
||||
"@vueuse/core": "^11.1.0",
|
||||
"axios": "^1.6.7",
|
||||
"trim": "^1.0.1"
|
||||
"axios": "^0.24.0",
|
||||
"trim": "^1.0.1",
|
||||
"vue": "^2.6.11"
|
||||
},
|
||||
"browserslist": [
|
||||
"extends @nextcloud/browserslist-config"
|
||||
@@ -28,46 +22,42 @@
|
||||
"node": ">=16.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/node": "^7.25.7",
|
||||
"@babel/plugin-transform-private-methods": "^7.25.7",
|
||||
"@babel/preset-typescript": "^7.24.7",
|
||||
"@cypress/vue2": "^2.1.1",
|
||||
"@cypress/webpack-preprocessor": "^6.0.2",
|
||||
"@nextcloud/babel-config": "^1.2.0",
|
||||
"@nextcloud/eslint-config": "^8.4.1",
|
||||
"@nextcloud/stylelint-config": "^3.0.1",
|
||||
"@nextcloud/typings": "^1.9.1",
|
||||
"@nextcloud/webpack-vue-config": "^6.0.1",
|
||||
"@simplewebauthn/types": "^10.0.0",
|
||||
"@types/dockerode": "^3.3.29",
|
||||
"@types/wait-on": "^5.3.4",
|
||||
"@vue/tsconfig": "^0.5.1",
|
||||
"babel-loader": "^9.2.1",
|
||||
"babel-loader-exclude-node-modules-except": "^1.2.1",
|
||||
"babel-plugin-module-resolver": "^5.0.2",
|
||||
"colord": "^2.9.3",
|
||||
"eslint-plugin-cypress": "^3.5.0",
|
||||
"eslint-plugin-es": "^4.1.0",
|
||||
"exports-loader": "^5.0.0",
|
||||
"file-loader": "^6.2.0",
|
||||
"handlebars-loader": "^1.7.3",
|
||||
"jasmine-core": "~2.5.2",
|
||||
"jasmine-sinon": "^0.4.0",
|
||||
"jsdoc": "^4.0.2",
|
||||
"raw-loader": "^4.0.2",
|
||||
"sass": "^1.79.3",
|
||||
"stylelint": "^16.9.0",
|
||||
"stylelint-use-logical": "^2.1.2",
|
||||
"ts-loader": "^9.5.0",
|
||||
"ts-node": "^10.9.1",
|
||||
"tslib": "^2.7.0",
|
||||
"typescript": "^5.6.2",
|
||||
"vue-loader": "^15.9.8",
|
||||
"vue-template-compiler": "^2.7.16",
|
||||
"wait-on": "^8.0.1",
|
||||
"webpack": "^5.94.0",
|
||||
"webpack-cli": "^5.0.2",
|
||||
"webpack-merge": "^6.0.1",
|
||||
"workbox-webpack-plugin": "^7.1.0"
|
||||
"@babel/core": "^7.9.0",
|
||||
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
||||
"@babel/preset-env": "^7.9.0",
|
||||
"@nextcloud/axios": "^1.8.0",
|
||||
"@nextcloud/browserslist-config": "^1.0.0",
|
||||
"@nextcloud/eslint-config": "^8.1.2",
|
||||
"@nextcloud/initial-state": "^2.0.0",
|
||||
"@nextcloud/l10n": "^1.6.0",
|
||||
"@nextcloud/vue": "^7.0.0",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"babel-loader": "^8.1.0",
|
||||
"css-loader": "^3.4.2",
|
||||
"eslint": "^8.0.0",
|
||||
"eslint-config-standard": "^17.0.0",
|
||||
"eslint-import-resolver-webpack": "^0.12.1",
|
||||
"eslint-plugin-import": "^2.20.0",
|
||||
"eslint-plugin-nextcloud": "^0.3.0",
|
||||
"eslint-plugin-node": "^10.0.0",
|
||||
"eslint-plugin-promise": "^6.0.0",
|
||||
"eslint-plugin-standard": "^4.0.1",
|
||||
"eslint-plugin-vue": "^9.0.0",
|
||||
"eslint-webpack-plugin": "^3.0.0",
|
||||
"file-loader": "^6.0.0",
|
||||
"sass": "^1.49.9",
|
||||
"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",
|
||||
"vue-style-loader": "^4.1.3",
|
||||
"vue-template-compiler": "^2.7.13",
|
||||
"webpack": "^5.0.0",
|
||||
"webpack-cli": "^4.0.0",
|
||||
"webpack-merge": "^4.2.2",
|
||||
"webpack-node-externals": "^1.7.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
|
||||
}
|
||||
@@ -84,9 +84,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</style>
|
||||
|
||||
<script>
|
||||
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
|
||||
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
|
||||
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
|
||||
import NcModal from '@nextcloud/vue/dist/Components/NcModal'
|
||||
import NcActions from '@nextcloud/vue/dist/Components/NcActions'
|
||||
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
|
||||
|
||||
export default {
|
||||
name: 'AdminCategoriesCustom',
|
||||
|
||||
+88
-151
@@ -21,20 +21,17 @@
|
||||
-->
|
||||
|
||||
<template>
|
||||
<nav
|
||||
class="app-menu show"
|
||||
:aria-label="t('core', 'Applications menu')"
|
||||
>
|
||||
<nav class="app-menu show">
|
||||
<ul
|
||||
class="app-menu-main"
|
||||
:class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
|
||||
v-if="appList.length"
|
||||
:class="{ 'app-menu-main__hidden-label': hiddenLabels }"
|
||||
v-if="apps !== null"
|
||||
>
|
||||
<li v-for="app in mainAppList(state)"
|
||||
<li v-for="app in mainAppList()"
|
||||
:key="app.id"
|
||||
:data-app-id="app.id"
|
||||
class="app-menu-entry"
|
||||
:class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
|
||||
:class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels }"
|
||||
:style="makeStyle(app)"
|
||||
>
|
||||
<a :href="app.href"
|
||||
@@ -50,8 +47,8 @@
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<NcActions class="app-menu-more" :aria-label="t('core', 'More apps')">
|
||||
<NcActionLink v-for="app in popoverAppList(state)"
|
||||
<NcActions class="app-menu-more" :aria-label="t('core', 'More apps')" v-if="apps !== null">
|
||||
<NcActionLink v-for="app in popoverAppList()"
|
||||
:key="app.id"
|
||||
:aria-label="appLabel(app)"
|
||||
:aria-current="app.active ? 'page' : false"
|
||||
@@ -71,128 +68,91 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
import { n, t } from '@nextcloud/l10n'
|
||||
import { useElementSize } from '@vueuse/core'
|
||||
import { defineComponent, ref } from 'vue'
|
||||
import axios from '@nextcloud/axios'
|
||||
import { generateOcsUrl } from '@nextcloud/router'
|
||||
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
|
||||
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
|
||||
import { NcActions, NcActionLink } from '@nextcloud/vue'
|
||||
|
||||
export default defineComponent({
|
||||
export default {
|
||||
name: 'AppMenu',
|
||||
|
||||
components: {
|
||||
NcActions,
|
||||
NcActionLink,
|
||||
NcActions, NcActionLink,
|
||||
},
|
||||
|
||||
setup() {
|
||||
return {
|
||||
t,
|
||||
n,
|
||||
}
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
apps: null,
|
||||
appList: [],
|
||||
appLimit: 0,
|
||||
observer: null,
|
||||
targetBlankApps: [],
|
||||
hiddenLabels: true,
|
||||
state: 1,
|
||||
hiddenLabels: true
|
||||
}
|
||||
},
|
||||
|
||||
mounted() {
|
||||
axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
|
||||
.then((response) => response.data)
|
||||
.then((data) => {
|
||||
if (data.ocs.meta.statuscode !== 200) {
|
||||
return
|
||||
}
|
||||
const ncApps = loadState('core', 'apps', {})
|
||||
this.apps = {}
|
||||
let orders = {}
|
||||
|
||||
this.setApps(data.ocs.data)
|
||||
})
|
||||
window.menuAppsOrder.forEach((app, order) => {
|
||||
orders[app] = order + 1
|
||||
})
|
||||
|
||||
Array.from(window.topMenuApps).forEach((id) => {
|
||||
if (ncApps.hasOwnProperty(id)) {
|
||||
this.apps[id] = ncApps[id]
|
||||
this.apps[id].order = orders[id] || null
|
||||
}
|
||||
})
|
||||
|
||||
this.targetBlankApps = window.targetBlankApps
|
||||
this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
|
||||
let timeout = null
|
||||
|
||||
window.addEventListener('resize', () => {
|
||||
timeout = window.setTimeout(() => {
|
||||
this.update()
|
||||
}, 300)
|
||||
})
|
||||
this.observer = new ResizeObserver(this.resize)
|
||||
this.observer.observe(this.$el)
|
||||
this.resize()
|
||||
},
|
||||
beforeDestroy() {
|
||||
this.observer.disconnect()
|
||||
},
|
||||
|
||||
methods: {
|
||||
update() {
|
||||
++this.state
|
||||
},
|
||||
|
||||
mainAppList() {
|
||||
return this.appList.slice(0, this.appLimit())
|
||||
},
|
||||
|
||||
popoverAppList() {
|
||||
return this.appList.slice(this.appLimit())
|
||||
},
|
||||
|
||||
appLimit() {
|
||||
const maxApps = Math.floor(this.$root.$el.offsetWidth / 60)
|
||||
|
||||
if (maxApps < this.appList.length) {
|
||||
// Ensure there is space for the overflow menu
|
||||
return Math.max(maxApps - 1, 0)
|
||||
}
|
||||
|
||||
return maxApps
|
||||
},
|
||||
|
||||
setNavigationCounter(id, counter) {
|
||||
const app = this.appList.find(({ app }) => app === id)
|
||||
if (app) {
|
||||
this.$set(app, 'unread', counter)
|
||||
} else {
|
||||
logger.warn(`Could not find app "${id}" for setting navigation count`)
|
||||
}
|
||||
},
|
||||
|
||||
setApps(apps) {
|
||||
this.appList = []
|
||||
let orders = {}
|
||||
|
||||
window.menuAppsOrder.forEach((app, order) => {
|
||||
orders[app] = order + 1
|
||||
})
|
||||
|
||||
apps.forEach((app) => {
|
||||
Array.from(window.topMenuApps).forEach((id) => {
|
||||
if (app.id === id) {
|
||||
app.order = orders[id] || null
|
||||
this.appList.push(app)
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
appLabel(app) {
|
||||
return app.name
|
||||
+ (app.active ? ' (' + t('core', 'Currently open') + ')' : '')
|
||||
+ (app.unread > 0 ? ' (' + n('core', '{count} notification', '{count} notifications', app.unread, { count: app.unread }) + ')' : '')
|
||||
},
|
||||
appList() {
|
||||
let items = Object.values(this.apps)
|
||||
|
||||
items.sort((a, b) => {
|
||||
return a.order < b.order ? -1 : 1;
|
||||
})
|
||||
|
||||
return items
|
||||
},
|
||||
mainAppList() {
|
||||
return this.appList().slice(0, this.appLimit)
|
||||
},
|
||||
popoverAppList() {
|
||||
return this.appList().slice(this.appLimit)
|
||||
},
|
||||
setNavigationCounter(id, counter) {
|
||||
this.$set(this.apps[id], 'unread', counter)
|
||||
},
|
||||
resize() {
|
||||
const availableWidth = this.$el.offsetWidth
|
||||
let appCount = Math.floor(availableWidth / 50) - 1
|
||||
const popoverAppCount = this.appList.length - appCount
|
||||
if (popoverAppCount === 1) {
|
||||
appCount--
|
||||
}
|
||||
if (appCount < 1) {
|
||||
appCount = 0
|
||||
}
|
||||
this.appLimit = appCount
|
||||
},
|
||||
makeStyle(app) {
|
||||
if (app.order !== null) {
|
||||
return `order: ${app.order}`
|
||||
}
|
||||
}
|
||||
},
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -204,7 +164,6 @@ $header-icon-size: 20px;
|
||||
flex-shrink: 1;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.app-menu-main {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
@@ -214,6 +173,7 @@ $header-icon-size: 20px;
|
||||
height: 50px;
|
||||
position: relative;
|
||||
display: flex;
|
||||
opacity: .7;
|
||||
|
||||
&.app-menu-entry__active {
|
||||
opacity: 1;
|
||||
@@ -253,8 +213,7 @@ $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));
|
||||
filter: var(--primary-invert-if-bright);
|
||||
}
|
||||
|
||||
.app-menu-entry--label {
|
||||
@@ -263,8 +222,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%);
|
||||
@@ -272,21 +231,21 @@ $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,
|
||||
&:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
|
||||
&:not(.app-menu-entry__hidden-label):hover,
|
||||
&:not(.app-menu-entry__hidden-label):focus-within {
|
||||
opacity: 1;
|
||||
.app-menu-entry--label {
|
||||
opacity: 1;
|
||||
font-weight: bolder;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
width: auto;
|
||||
overflow: visible;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Show labels
|
||||
@@ -297,30 +256,12 @@ $header-icon-size: 20px;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):hover,
|
||||
&:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
|
||||
&:not(.app-menu-main__hidden-label):hover,
|
||||
&:not(.app-menu-main__hidden-label):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;
|
||||
}
|
||||
|
||||
.app-menu-entry--label {
|
||||
opacity: 1;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
&::before, .app-menu-entry::before {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.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 {
|
||||
@@ -335,42 +276,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"]) {
|
||||
color: var(--color-main-text);
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
background-color: transparent !important;
|
||||
}
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
opacity: 1;
|
||||
outline: none !important;
|
||||
}
|
||||
&:focus-visible {
|
||||
opacity: 1;
|
||||
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);
|
||||
width: $header-icon-size;
|
||||
height: $header-icon-size;
|
||||
padding: calc((50px - $header-icon-size) / 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -379,7 +316,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;
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
<!--
|
||||
@license GNU AGPL version 3 or any later version
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as
|
||||
published by the Free Software Foundation, either version 3 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<template>
|
||||
<div class="side-menu-search">
|
||||
<input type="text" :value="value" :placeholder="t('side_menu', 'Search')" @input="$emit('input', $event.target.value)">
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'AppSearch',
|
||||
props: {
|
||||
value: {
|
||||
required: true
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@@ -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">
|
||||
<span v-text="label"></span>
|
||||
</button>
|
||||
<button class="side-menu-opener side-menu-closer"></button>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'CloserButton',
|
||||
data() {
|
||||
return {
|
||||
label: t('side_menu', 'Close the menu'),
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -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" :arial-label="label">
|
||||
<span v-text="label"></span>
|
||||
</button>
|
||||
<button class="side-menu-opener"></button>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'OpenerButton',
|
||||
data() {
|
||||
return {
|
||||
label: t('side_menu', 'Toggle the menu'),
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -17,9 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<template>
|
||||
<div class="side-menu-settings">
|
||||
<a v-bind:href="href">
|
||||
<!--
|
||||
{{ label }}
|
||||
-->
|
||||
|
||||
<span class="avatardiv avatardiv-shown">
|
||||
<img v-bind:src="avatar" :alt="label">
|
||||
|
||||
@@ -21,10 +21,12 @@ import SideMenu from './SideMenu.vue'
|
||||
import SideMenuBig from './SideMenuBig.vue'
|
||||
import SideMenuWithCategories from './SideMenuWithCategories.vue'
|
||||
import PageLoader from './PageLoader'
|
||||
import SMcreateElement from './lib/createElement'
|
||||
|
||||
Vue.prototype.OC = OC
|
||||
Vue.prototype.t = OC.L10N.translate
|
||||
|
||||
window.SMcreateElement = SMcreateElement
|
||||
window.PageLoader = PageLoader
|
||||
|
||||
const mountSideMenuComponent = () => {
|
||||
|
||||
+30
-59
@@ -16,19 +16,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<template>
|
||||
<div id="side-menu">
|
||||
<div class="side-menu-header" v-if="settings || !openerHover || (!avatar && !alwaysDisplayed && logo) || avatar">
|
||||
<div class="side-menu-header">
|
||||
<SettingsButton
|
||||
v-if="settings"
|
||||
v-bind:href="settings.href"
|
||||
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-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
|
||||
v-bind:image="logo"
|
||||
v-bind:link="logoLink"
|
||||
/>
|
||||
|
||||
<Logo
|
||||
v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}"
|
||||
v-bind:image="avatar"
|
||||
@@ -36,10 +38,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
/>
|
||||
</div>
|
||||
|
||||
<ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
|
||||
<ul class="side-menu-apps-list">
|
||||
<SideMenuApp
|
||||
v-for="(app, key) in apps"
|
||||
v-if="searchMatch(app.name)"
|
||||
v-if="!hiddenApps.includes(app.id)"
|
||||
v-bind:classes="{'side-menu-app': true, 'active': app.active}"
|
||||
v-bind:key="key"
|
||||
v-bind:icon="app.icon"
|
||||
@@ -56,7 +58,6 @@ import axios from 'axios'
|
||||
import OpenerButton from './OpenerButton'
|
||||
import SettingsButton from './SettingsButton'
|
||||
import SideMenuApp from './SideMenuApp'
|
||||
import AppSearch from './AppSearch'
|
||||
import Logo from './Logo'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
|
||||
@@ -67,7 +68,6 @@ export default {
|
||||
OpenerButton,
|
||||
SideMenuApp,
|
||||
Logo,
|
||||
AppSearch,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -79,14 +79,11 @@ export default {
|
||||
targetBlankApps: [],
|
||||
hiddenApps: [],
|
||||
settings: null,
|
||||
openerHover: false,
|
||||
alwaysDisplayed: false,
|
||||
search: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
retrieveApps() {
|
||||
const ncApps = loadState('core', 'apps', [])
|
||||
const ncApps = loadState('core', 'apps', {})
|
||||
let orders = {}
|
||||
let finalApps = []
|
||||
|
||||
@@ -94,26 +91,23 @@ export default {
|
||||
orders[app] = order + 1
|
||||
})
|
||||
|
||||
for (let app of ncApps) {
|
||||
if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
|
||||
continue
|
||||
for (let id in ncApps) {
|
||||
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (this.hiddenApps.includes(app.id)) {
|
||||
continue
|
||||
}
|
||||
|
||||
app.order = orders[app.id] || null
|
||||
let app = ncApps[id]
|
||||
app.order = orders[id] || null
|
||||
|
||||
finalApps.push(app)
|
||||
}
|
||||
|
||||
finalApps.sort((a, b) => {
|
||||
if (a.order === null || b.order === null) {
|
||||
return a.name < b.name ? -1 : 1
|
||||
return a.name < b.name ? -1 : 1;
|
||||
}
|
||||
|
||||
return a.order < b.order ? -1 : 1
|
||||
return a.order < b.order ? -1 : 1;
|
||||
})
|
||||
|
||||
this.apps = finalApps
|
||||
@@ -124,47 +118,24 @@ export default {
|
||||
},
|
||||
|
||||
retrieveConfig() {
|
||||
},
|
||||
axios
|
||||
.get(OC.generateUrl('/apps/side_menu/js/config'))
|
||||
.then((response) => {
|
||||
const config = response.data
|
||||
|
||||
hasSearchMatch(apps) {
|
||||
if (this.search.trim() === '') {
|
||||
return true
|
||||
}
|
||||
|
||||
for (let key in apps) {
|
||||
if (this.searchMatch(apps[key].name)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
},
|
||||
|
||||
searchMatch(name) {
|
||||
if (this.search.trim() === '') {
|
||||
return true
|
||||
}
|
||||
|
||||
return name.toLowerCase().includes(this.search.toLowerCase())
|
||||
this.targetBlankApps = config['target-blank-apps']
|
||||
this.forceLightIcon = config['force-light-icon']
|
||||
this.avatar = config['avatar']
|
||||
this.logo = config['logo']
|
||||
this.logoLink = config['logo-link']
|
||||
this.settings = config['settings']
|
||||
this.hiddenApps = config['big-menu-hidden-apps']
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
axios
|
||||
.get(OC.generateUrl('/apps/side_menu/js/config'))
|
||||
.then((response) => {
|
||||
const config = response.data
|
||||
|
||||
this.targetBlankApps = config['target-blank-apps']
|
||||
this.forceLightIcon = config['force-light-icon']
|
||||
this.avatar = config['avatar']
|
||||
this.logo = config['logo']
|
||||
this.logoLink = config['logo-link']
|
||||
this.settings = config['settings']
|
||||
this.openerHover = config['opener-hover']
|
||||
this.alwaysDisplayed = config['always-displayed']
|
||||
this.hiddenApps = config['big-menu-hidden-apps']
|
||||
this.retrieveApps()
|
||||
})
|
||||
this.retrieveConfig()
|
||||
this.retrieveApps()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
+3
-28
@@ -18,13 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<div id="side-menu" class="side-menu-big">
|
||||
<div class="side-menu-header">
|
||||
<CloserButton />
|
||||
|
||||
<SettingsButton
|
||||
v-if="settings"
|
||||
v-bind:href="settings.href"
|
||||
v-bind:label="settings.name"
|
||||
v-bind:avatar="settings.avatar"
|
||||
/>
|
||||
<AppSearch v-model:search="search" />
|
||||
|
||||
<OpenerButton />
|
||||
</div>
|
||||
|
||||
@@ -32,13 +33,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<div class="side-menu-categories">
|
||||
<Loader v-if="!items.length" />
|
||||
|
||||
<div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" v-bind:key="key">
|
||||
<div class="side-menu-category" v-for="(category, key) in items" v-bind:key="key">
|
||||
<h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
|
||||
|
||||
<ul class="side-menu-apps-list">
|
||||
<SideMenuBigApp
|
||||
v-for="(app, appId) in category.apps"
|
||||
v-if="searchMatch(app.name)"
|
||||
v-bind:key="appId"
|
||||
v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
|
||||
v-bind:icon="app.icon"
|
||||
@@ -59,7 +59,6 @@ import OpenerButton from './OpenerButton'
|
||||
import CloserButton from './CloserButton'
|
||||
import SettingsButton from './SettingsButton'
|
||||
import Loader from './Loader'
|
||||
import AppSearch from './AppSearch'
|
||||
import SideMenuBigApp from './SideMenuBigApp'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
|
||||
@@ -71,7 +70,6 @@ export default {
|
||||
CloserButton,
|
||||
Loader,
|
||||
SideMenuBigApp,
|
||||
AppSearch,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -80,7 +78,6 @@ export default {
|
||||
targetBlank: false,
|
||||
targetBlankApps: [],
|
||||
settings: null,
|
||||
search: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -123,28 +120,6 @@ export default {
|
||||
this.settings = config['settings']
|
||||
})
|
||||
},
|
||||
|
||||
hasSearchMatch(apps) {
|
||||
if (this.search.trim() === '') {
|
||||
return true
|
||||
}
|
||||
|
||||
for (let key in apps) {
|
||||
if (this.searchMatch(apps[key].name)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
},
|
||||
|
||||
searchMatch(name) {
|
||||
if (this.search.trim() === '') {
|
||||
return true
|
||||
}
|
||||
|
||||
return name.toLowerCase().includes(this.search.toLowerCase())
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.retrieveConfig()
|
||||
|
||||
@@ -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 />
|
||||
</div>
|
||||
|
||||
@@ -31,13 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<div class="side-menu-categories">
|
||||
<Loader v-if="!items.length" />
|
||||
|
||||
<div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" v-bind:key="key">
|
||||
<div class="side-menu-category" v-for="(category, key) in items" v-bind:key="key">
|
||||
<h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
|
||||
|
||||
<ul class="side-menu-apps-list">
|
||||
<SideMenuBigApp
|
||||
v-for="(app, appId) in category.apps"
|
||||
v-if="searchMatch(app.name)"
|
||||
v-bind:key="appId"
|
||||
v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
|
||||
v-bind:icon="app.icon"
|
||||
@@ -57,7 +56,6 @@ import axios from 'axios'
|
||||
import OpenerButton from './OpenerButton'
|
||||
import SettingsButton from './SettingsButton'
|
||||
import Loader from './Loader'
|
||||
import AppSearch from './AppSearch'
|
||||
import SideMenuBigApp from './SideMenuBigApp'
|
||||
import { loadState } from '@nextcloud/initial-state'
|
||||
|
||||
@@ -68,7 +66,6 @@ export default {
|
||||
OpenerButton,
|
||||
Loader,
|
||||
SideMenuBigApp,
|
||||
AppSearch,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -77,7 +74,6 @@ export default {
|
||||
targetBlank: false,
|
||||
targetBlankApps: [],
|
||||
settings: null,
|
||||
search: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -120,28 +116,6 @@ export default {
|
||||
this.settings = config['settings']
|
||||
})
|
||||
},
|
||||
|
||||
hasSearchMatch(apps) {
|
||||
if (this.search.trim() === '') {
|
||||
return true
|
||||
}
|
||||
|
||||
for (let key in apps) {
|
||||
if (this.searchMatch(apps[key].name)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
},
|
||||
|
||||
searchMatch(name) {
|
||||
if (this.search.trim() === '') {
|
||||
return true
|
||||
}
|
||||
|
||||
return name.toLowerCase().includes(this.search.toLowerCase())
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.retrieveConfig()
|
||||
|
||||
@@ -91,6 +91,3 @@
|
||||
"Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
|
||||
"These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
|
||||
"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"
|
||||
|
||||
+17
-20
@@ -6,11 +6,11 @@
|
||||
? '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.'
|
||||
: 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span> zum Navigieren.'
|
||||
"Top menu": "Obere Navigationsleiste"
|
||||
"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden sollen"
|
||||
"Apps that not must be moved in the side menu": "Anwendungen, die nicht ins Seitenmenü verschoben werden sollen"
|
||||
"If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
|
||||
"Experimental": "Experimentell"
|
||||
"Save": "Speichern"
|
||||
"You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
|
||||
"You like this app and you want to support me?": "Du magst diese Anwendung und möchtest mich unterstützen?"
|
||||
"Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
|
||||
"Hidden": "Ausblenden"
|
||||
"Small": "Klein"
|
||||
@@ -18,9 +18,9 @@
|
||||
"Big": "Groß"
|
||||
"Colors": "Farben"
|
||||
"Background color": "Hintergrundfarbe"
|
||||
"Background color of current app": "Hintergrundfarbe der aktuellen App"
|
||||
"Background color of current app": "Hintergrundfarbe der aktuellen Anwendung"
|
||||
"Text color": "Textfarbe"
|
||||
"Loader": "Fortschrittsbalken"
|
||||
"Loader": "Ladestandanzeige"
|
||||
"Icon": "Symbol"
|
||||
"Same color": "Selbe Farbe"
|
||||
"Opposite color": "Gegenfarbe"
|
||||
@@ -37,32 +37,32 @@
|
||||
"After the logo": "Nach dem Logo"
|
||||
"Position": "Position"
|
||||
"Show only the opener (hidden logo)": "Nur das Menü-Symbol anzeigen (Logo wird ausgeblendet)"
|
||||
"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol nicht an, wenn keine App vorhanden ist (z.B. bei öffentlichen Seiten)."
|
||||
"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
|
||||
"Panel": "Panel"
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)"
|
||||
"Display the big menu": "Großes Menü anzeigen"
|
||||
"Display the logo": "Logo anzeigen"
|
||||
"Icons and texts": "Symbole und Texte"
|
||||
"Loader enabled": "Fortschrittsbalken anzeigen"
|
||||
"Loader enabled": "Ladestandanzeige aktiviert"
|
||||
"Tips": "Tipps"
|
||||
"Always displayed": "Immer anzeigen"
|
||||
"This is the automatic behavior when the menu is always displayed.": "Dies ist das automatische Verhalten, wenn das Menü immer angezeigt wird."
|
||||
"Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens."
|
||||
"Big menu": "Großes Menü"
|
||||
"Live preview": "Live-Vorschau"
|
||||
"Open apps in new tab": "Öffne Apps in einem neuen Tab"
|
||||
"Open apps in new tab": "Öffne Anwendungen in einem neuen Tab"
|
||||
"Use the global setting": "Verwende die globale Einstellung"
|
||||
"Use my selection": "Verwende meine Auswahl"
|
||||
"Show and hide the list of applications": "Ein- und Ausblenden der Appliste"
|
||||
"Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
|
||||
"Use the avatar instead of the logo": "Avatar anstelle des Logos anzeigen"
|
||||
"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser App zu ändern."
|
||||
"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser Anwendung zu ändern."
|
||||
"Force this configuration to users": "Konfiguration für alle Benutzer erzwingen"
|
||||
"Export the configuration": "Konfiguration exportieren"
|
||||
"Purge the cache": "Cache leeren"
|
||||
"Show the link to settings": "Link zu den Einstellungen anzeigen"
|
||||
"The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer aktiviert"
|
||||
"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
|
||||
"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
|
||||
"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt werden sollen"
|
||||
"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
|
||||
"The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
|
||||
"Others": "Andere"
|
||||
@@ -76,21 +76,18 @@
|
||||
"Dark mode colors": "Farben für den dunklen Modus"
|
||||
"With categories": "Mit Kategorien"
|
||||
"Custom categories": "Benutzerdefinierte Kategorien"
|
||||
"Customize application categories": "App-Kategorien anpassen"
|
||||
"Customize application categories": "Anwendungskategorien anpassen"
|
||||
"Reset to default": "Auf Standard zurücksetzen"
|
||||
"Hidden icon": "Verstecktes Symbol"
|
||||
"Small icon": "Kleines Symbol"
|
||||
"Normal icon": "Normales Symbol"
|
||||
"Big icon": "Großes Icon"
|
||||
"Big icon": "Große Ikone"
|
||||
"Hidden text": "Versteckter Text"
|
||||
"Small text": "Kleiner Text"
|
||||
"Normal text": "Normaler Text"
|
||||
"Big text": "Großer Text"
|
||||
"Applications": "Apps"
|
||||
"Applications kept in the top menu": "Apps in der oberen Navigationsleiste"
|
||||
"Applications kept in the top menu but also shown in side menu": "Apps in der oberen Navigationsleiste, die auch im Seitenmenü angezeigt werden sollen"
|
||||
"These applications must be selected in the previous option.": "Diese Apps müssen auch in der vorherigen Einstellung ausgewählt werden."
|
||||
"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"
|
||||
"Applications": "Anwendungen"
|
||||
"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"
|
||||
|
||||
@@ -91,6 +91,3 @@
|
||||
"Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
|
||||
"These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
|
||||
"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"
|
||||
|
||||
@@ -91,6 +91,3 @@
|
||||
"Applications kept in the top menu but also shown in side menu": "Applications conservées dans le menu supérieur mais également affichées dans le menu latéral"
|
||||
"These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente."
|
||||
"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"
|
||||
|
||||
@@ -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"
|
||||
@@ -91,6 +91,3 @@
|
||||
"Applications kept in the top menu but also shown in side menu": "Applicaties blijven in het topmenu maar worden ook in het zijmenu getoond"
|
||||
"These applications must be selected in the previous option.": "Deze toepassingen moeten bij de vorige optie zijn geselecteerd."
|
||||
"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"
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
"Custom menu": "Menu personalizado"
|
||||
"Enable the custom menu": "Habilitar o menu personalizado"
|
||||
"No": "Não"
|
||||
"Yes": "Sim"
|
||||
"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 o atalho <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para exibir e para esconder o menu lateral. Use <span class="keyboard-key">tab</span> para navegar.'
|
||||
"Top menu": "Menu superior"
|
||||
"Apps that not must be moved in the side menu": "Apps que não devem ser movidos para o menu lateral"
|
||||
"If there is no selection then the global configuration is applied.": "Se não houver seleção, a configuração global será aplicada."
|
||||
"Experimental": "Experimental"
|
||||
"Save": "Salvar"
|
||||
"You like this app and you want to support me?": "Você gosta deste aplicativo e quer me apoiar?"
|
||||
"Buy me a coffee ☕": "Me pague um café ☕"
|
||||
"Hidden": "Oculto"
|
||||
"Small": "Pequeno"
|
||||
"Normal": "Normal"
|
||||
"Big": "Grande"
|
||||
"Hidden icon": "Ícone oculto"
|
||||
"Small icon": "Ícone pequeno"
|
||||
"Normal icon": "Ícone normal"
|
||||
"Big icon": "Ícone grance"
|
||||
"Hidden text": "Texto oculto"
|
||||
"Small text": "Texto pequeno"
|
||||
"Normal text": "Texto normal"
|
||||
"Big text": "Texto grande"
|
||||
"Colors": "Cores"
|
||||
"Background color": "Cor de fundo"
|
||||
"Background color of current app": "Cor de fundo do app atual"
|
||||
"Text color": "Cor do texto"
|
||||
"Loader": "Progresso"
|
||||
"Icon": "Ícone"
|
||||
"Same color": "Mesma cor"
|
||||
"Opposite color": "Cor oposta"
|
||||
"Transparent": "Transparente"
|
||||
"Opaque": "Opaco"
|
||||
"Opener": "Abrir"
|
||||
"Default": "Padrão"
|
||||
"Default (dark)": "Padrão (escuro)"
|
||||
"Hamburger": "Hamburger"
|
||||
"Hamburger (dark)": "Hamburger (escuro)"
|
||||
"Hamburger 2": "Hamburger 2"
|
||||
"Hamburger 2 (dark)": "Hamburger 2 (escuro)"
|
||||
"Before the logo": "Antes da logo"
|
||||
"After the logo": "Depois da logo"
|
||||
"Position": "Posição"
|
||||
"Show only the opener (hidden logo)": "Mostrar apenas o Abrir (ocultar logo)"
|
||||
"Do not display the side menu and the opener if there is no application (eg: public pages).": "Não mostrar o menu lateral e o Abrir se não houver aplicação (p.ex. páginas públicas)."
|
||||
"Panel": "Painel"
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Abrir o menu quando o mouse passar sobre o Abrir (desativado automaticamente em telas de toque)"
|
||||
"Display the big menu": "Mostrar o menu grande"
|
||||
"Display the logo": "Mostrar a logo"
|
||||
"Icons and texts": "Ícones e textos"
|
||||
"Loader enabled": "Progresso ativado"
|
||||
"Tips": "Dicas"
|
||||
"Always displayed": "Sempre visível"
|
||||
"This is the automatic behavior when the menu is always displayed.": "Este é o comportamento automático quando o menu está sempre visível."
|
||||
"Not compatible with touch screens.": "Não compatível com telas de toque."
|
||||
"Big menu": "Menu grande"
|
||||
"Live preview": "Visualização ao vivo"
|
||||
"Open apps in new tab": "Abrir apps em nova aba"
|
||||
"Use the global setting": "Usar configurações globais"
|
||||
"Use my selection": "Usar minha seleção"
|
||||
"Show and hide the list of applications": "Mostrar e ocultar a lista de aplicativos"
|
||||
"Use the avatar instead of the logo": "Use o avatar ao invés da logo"
|
||||
"You do not have permission to change the settings.": "Você não tem permissão para alterar as configurações."
|
||||
"Force this configuration to users": "Forçar esta configuração para os usuários"
|
||||
"Export the configuration": "Exportar a configuração"
|
||||
"Purge the cache": "Limpar o cache"
|
||||
"Show the link to settings": "Mostrar o link para configurações"
|
||||
"The menu is enabled by default for users": "O menu é habilitado por padrão para os usuários"
|
||||
"Except when the configuration is forced.": "Exceto quando a configuração é forçada."
|
||||
"Apps that should not be displayed in the menu": "Apps que não devem ser mostrados no menu"
|
||||
"This feature is only compatible with the <code>big menu</code> display.": "Este recurso só é compatível com a exibição do <code>menu grande</code>."
|
||||
"The logo is a link to the default app": "A logo é um link para o app padrão"
|
||||
"Others": "Outros"
|
||||
"Categories": "Categorias"
|
||||
"Customize sorting": "Personalizar classificação"
|
||||
"Order by": "Ordenar por"
|
||||
"Name": "Nome"
|
||||
"Customed": "Personalizado"
|
||||
"Show and hide the list of categories": "Mostrar e esconder a lista de categorias"
|
||||
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estes parâmetros são usados quando o tema escuro ou o tema Dark Breeze está ativo."
|
||||
"Dark mode colors": "Cores do modo escuro"
|
||||
"With categories": "Com categorias"
|
||||
"Custom categories": "Categorias personalizadas"
|
||||
"Customize application categories": "Personalizar categorias de apps"
|
||||
"Reset to default": "Restaurar padrão"
|
||||
"Applications": "Aplicativos"
|
||||
"Applications kept in the top menu": "Aplicativos mantidos no menu superior"
|
||||
"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"
|
||||
+21
-24
@@ -7,7 +7,7 @@
|
||||
: 'Используйте сочетание клавиш <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>, чтобы открыть или скрыть боковое меню. Используйте <span class="keyboard-key">Tab</span> для навигации.'
|
||||
"Top 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.": "If there is no selection then the global configuration is applied."
|
||||
"Experimental": "Экспериментальный"
|
||||
"Save": "Сохранить"
|
||||
"You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать меня?"
|
||||
@@ -16,11 +16,11 @@
|
||||
"Small": "Маленький"
|
||||
"Normal": "Средний"
|
||||
"Big": "Большой"
|
||||
"Hidden icon": "Без иконки"
|
||||
"Hidden icon": "Скрытая иконка"
|
||||
"Small icon": "Маленькая иконка"
|
||||
"Normal icon": "Средняя иконка"
|
||||
"Big icon": "Большая иконка"
|
||||
"Hidden text": "Без текста"
|
||||
"Hidden text": "Скрытый текст"
|
||||
"Small text": "Маленький текст"
|
||||
"Normal text": "Средний текст"
|
||||
"Big text": "Большой текст"
|
||||
@@ -35,44 +35,44 @@
|
||||
"Transparent": "Прозрачный"
|
||||
"Opaque": "Непрозрачный"
|
||||
"Opener": "Открывалка"
|
||||
"Default": "По умолчанию"
|
||||
"Default (dark)": "По умолчанию (тёмный)"
|
||||
"Default": "По-умолчанию"
|
||||
"Default (dark)": "По-умолчанию (тёмный)"
|
||||
"Hamburger": "Гамбургер"
|
||||
"Hamburger (dark)": "Гамбургер (тёмный)"
|
||||
"Hamburger 2": "Гамбургер 2"
|
||||
"Hamburger 2 (dark)": "Гамбургер 2 (тёмный)"
|
||||
"Before the logo": "Перед логотипом"
|
||||
"After the logo": "После логотипа"
|
||||
"Position": "Положение"
|
||||
"Position": "Позиция"
|
||||
"Show only the opener (hidden logo)": "Показать только открывающую часть (скрытый логотип)"
|
||||
"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)": "Открывать меню при наведении мыши на экран (автоматически отключается на сенсорных экранах)"
|
||||
"Display the big menu": "Отобразить большое меню"
|
||||
"Display the logo": "Показать логотип"
|
||||
"Display the logo": "Показать лого"
|
||||
"Icons and texts": "Иконки и текст"
|
||||
"Loader enabled": "Загрузчик включен"
|
||||
"Loader enabled": "Loader enabled"
|
||||
"Tips": "Советы"
|
||||
"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": "Большое меню"
|
||||
"Live preview": "Live preview"
|
||||
"Open apps in new tab": "Открывать приложения в новой вкладке"
|
||||
"Use the global setting": "Использовать глобальные настройки"
|
||||
"Use my selection": "Использовать мои настройки"
|
||||
"Use the global setting": "Use the global setting"
|
||||
"Use my selection": "Use my selection"
|
||||
"Show and hide the list of applications": "Показать или скрыть список приложений"
|
||||
"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": "Экспортировать конфигурацию"
|
||||
"Purge the cache": "Очистить кэш"
|
||||
"Show the link to settings": "Показать ссылку на настройки"
|
||||
"The menu is enabled by default for users": "Это меню включено по умолчанию для пользователей"
|
||||
"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": "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": "The logo is a link to the default app"
|
||||
"Others": "Прочие"
|
||||
"Categories": "Категории"
|
||||
"Customize sorting": "Настроить сортировку"
|
||||
@@ -80,17 +80,14 @@
|
||||
"Name": "Название"
|
||||
"Customed": "Customed"
|
||||
"Show and hide the list of categories": "Показать или скрыть список категорий"
|
||||
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Эти настройки используются темами Тёмная и Тёмная Breeze."
|
||||
"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": "Цвета тёмной темы"
|
||||
"With categories": "С категориями"
|
||||
"Custom categories": "Пользовательские категории"
|
||||
"Customize application categories": "Изменить категории приложений"
|
||||
"Reset to default": "Сбросить к значениям по умолчанию"
|
||||
"Custom categories": "Custom categories"
|
||||
"Customize application categories": "Customize application categories"
|
||||
"Reset to default": "Сбросить к значениям по-умолчанию"
|
||||
"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": "Скрыть название при наведении мыши"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
"Search": "Search"
|
||||
"Toggle the menu": "Toggle the menu"
|
||||
"Hide labels on mouse over": "Hide labels on mouse over"
|
||||
|
||||
@@ -1,94 +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"
|
||||
"Toggle the menu": "Toggle the menu"
|
||||
@@ -1,100 +1,95 @@
|
||||
"Custom menu": "Custom menu"
|
||||
"Enable the custom menu": "Enable the custom menu"
|
||||
"No": "No"
|
||||
"Yes": "Yes"
|
||||
"Menu": "Menu"
|
||||
"Custom menu": ""
|
||||
"Enable the custom menu": ""
|
||||
"No": ""
|
||||
"Yes": ""
|
||||
"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"
|
||||
: ''
|
||||
"Top menu": ""
|
||||
"Apps that not must be moved in the side menu": ""
|
||||
"If there is no selection then the global configuration is applied.": ""
|
||||
"Experimental": ""
|
||||
"Save": ""
|
||||
"You like this app and you want to support me?": ""
|
||||
"Buy me a coffee ☕": ""
|
||||
"Hidden": ""
|
||||
"Small": ""
|
||||
"Normal": ""
|
||||
"Big": ""
|
||||
"Hidden icon": ""
|
||||
"Small icon": ""
|
||||
"Normal icon": ""
|
||||
"Big icon": ""
|
||||
"Hidden text": ""
|
||||
"Small text": ""
|
||||
"Normal text": ""
|
||||
"Big text": ""
|
||||
"Colors": ""
|
||||
"Background color": ""
|
||||
"Background color of current app": ""
|
||||
"Text color": ""
|
||||
"Loader": ""
|
||||
"Icon": ""
|
||||
"Same color": ""
|
||||
"Opposite color": ""
|
||||
"Transparent": ""
|
||||
"Opaque": ""
|
||||
"Opener": ""
|
||||
"Default": ""
|
||||
"Default (dark)": ""
|
||||
"Hamburger": ""
|
||||
"Hamburger (dark)": ""
|
||||
"Hamburger 2": ""
|
||||
"Hamburger 2 (dark)": ""
|
||||
"Before the logo": ""
|
||||
"After the logo": ""
|
||||
"Position": ""
|
||||
"Show only the opener (hidden logo)": ""
|
||||
"Do not display the side menu and the opener if there is no application (eg: public pages).": ""
|
||||
"Panel": ""
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": ""
|
||||
"Display the big menu": ""
|
||||
"Display the logo": ""
|
||||
"Icons and texts": ""
|
||||
"Loader enabled": ""
|
||||
"Tips": ""
|
||||
"Always displayed": ""
|
||||
"This is the automatic behavior when the menu is always displayed.": ""
|
||||
"Not compatible with touch screens.": ""
|
||||
"Big menu": ""
|
||||
"Live preview": ""
|
||||
"Open apps in new tab": ""
|
||||
"Use the global setting": ""
|
||||
"Use my selection": ""
|
||||
"Show and hide the list of applications": ""
|
||||
"Use the avatar instead of the logo": ""
|
||||
"You do not have permission to change the settings.": ""
|
||||
"Force this configuration to users": ""
|
||||
"Export the configuration": ""
|
||||
"Purge the cache": ""
|
||||
"Show the link to settings": ""
|
||||
"The menu is enabled by default for users": ""
|
||||
"Except when the configuration is forced.": ""
|
||||
"Apps that should not be displayed in the menu": ""
|
||||
"This feature is only compatible with the <code>big menu</code> display.": ""
|
||||
"The logo is a link to the default app": ""
|
||||
"Others": ""
|
||||
"Categories": ""
|
||||
"Customize sorting": ""
|
||||
"Order by": ""
|
||||
"Name": ""
|
||||
"Customed": ""
|
||||
"Show and hide the list of categories": ""
|
||||
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": ""
|
||||
"Dark mode colors": ""
|
||||
"With categories": ""
|
||||
"Custom categories": ""
|
||||
"Customize application categories": ""
|
||||
"Reset to default": ""
|
||||
"Applications": ""
|
||||
"Applications kept in the top menu": ""
|
||||
"Applications kept in the top menu but also shown in side menu": ""
|
||||
"These applications must be selected in the previous option.": ""
|
||||
"Hide labels on mouse over": ""
|
||||
|
||||
@@ -91,6 +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"
|
||||
"Except the hovered app": "Except the hovered app"
|
||||
"Search": "Search"
|
||||
"Toggle menu": "Toggle menu"
|
||||
|
||||
@@ -3,13 +3,7 @@ module.exports = (tagName, attributes) => {
|
||||
|
||||
if (typeof attributes === 'object') {
|
||||
for (let i in attributes) {
|
||||
if (i === 'text') {
|
||||
element.textContent = attributes[i]
|
||||
} else if (i === 'html') {
|
||||
element.innerHTML = attributes[i]
|
||||
} else {
|
||||
element.setAttribute(i, attributes[i])
|
||||
}
|
||||
element.setAttribute(i, attributes[i])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -42,14 +42,10 @@
|
||||
top: 49px;
|
||||
}
|
||||
|
||||
#side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
|
||||
#side-menu.hide-opener .side-menu-header {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
#side-menu.hide-opener.side-menu-with-categories .side-menu-search {
|
||||
float: none;
|
||||
}
|
||||
|
||||
<?php if ($_['size-text'] === 'hidden'): ?>
|
||||
#side-menu, .side-menu-apps-list {
|
||||
<?php if ($_['size-icon'] === 'big'): ?>
|
||||
|
||||
+24
-40
@@ -1,7 +1,5 @@
|
||||
<?php
|
||||
|
||||
header('Content-type: text/javascript');
|
||||
|
||||
$display = 'default';
|
||||
|
||||
if ($_['always-displayed']) {
|
||||
@@ -14,37 +12,14 @@ if ($_['always-displayed']) {
|
||||
|
||||
?>
|
||||
|
||||
const SMcreateElement = (tagName, attributes) => {
|
||||
const element = document.createElement(tagName)
|
||||
|
||||
if (typeof attributes === 'object') {
|
||||
for (let i in attributes) {
|
||||
if (i === 'text') {
|
||||
element.textContent = attributes[i]
|
||||
} else if (i === 'html') {
|
||||
element.innerHTML = attributes[i]
|
||||
} else {
|
||||
element.setAttribute(i, attributes[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return element
|
||||
}
|
||||
|
||||
(function() {
|
||||
const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
|
||||
const sideMenuOpener = SMcreateElement('button', {
|
||||
'class': 'side-menu-opener',
|
||||
'arial-label': t('side_menu', 'Toggle the menu'),
|
||||
'html': `<span>${t('side_menu', 'Toggle the menu')}</span>`
|
||||
})
|
||||
const sideMenuOpener = SMcreateElement('button', {'class': 'side-menu-opener'})
|
||||
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
|
||||
|
||||
@@ -60,15 +35,6 @@ const SMcreateElement = (tagName, attributes) => {
|
||||
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;
|
||||
|
||||
@@ -111,6 +77,22 @@ const SMcreateElement = (tagName, attributes) => {
|
||||
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')
|
||||
@@ -142,8 +124,14 @@ const SMcreateElement = (tagName, attributes) => {
|
||||
|
||||
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) {
|
||||
@@ -191,10 +179,6 @@ const SMcreateElement = (tagName, attributes) => {
|
||||
<?php endif; ?>
|
||||
|
||||
if (nextcloud) {
|
||||
if (logo && logo.parentNode !== nextcloud) {
|
||||
nextcloud.appendChild(logo)
|
||||
}
|
||||
|
||||
<?php if ($_['opener-position'] === 'before'): ?>
|
||||
nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
|
||||
<?php else: ?>
|
||||
|
||||
@@ -878,15 +878,9 @@ $labelAlwaysDisplayed = 'Always displayed';
|
||||
<div class="side-menu-setting-label">
|
||||
<?php p($l->t('Hide labels on mouse over')); ?>
|
||||
</div>
|
||||
<?php
|
||||
$choices = array_merge(
|
||||
$choicesYesNo,
|
||||
['Except the hovered app' => '2']
|
||||
);
|
||||
?>
|
||||
<div class="side-menu-setting-form">
|
||||
<select id="side-menu-top-menu-mouse-over-hidden-label" name="top-menu-mouse-over-hidden-label" class="side-menu-setting">
|
||||
<?php foreach ($choices as $label => $value): ?>
|
||||
<?php foreach ($choicesYesNo as $label => $value): ?>
|
||||
<option value="<?php echo $value ?>" <?php if ($value === $_['top-menu-mouse-over-hidden-label']): ?>selected<?php endif; ?>>
|
||||
<?php echo $l->t($label); ?>
|
||||
</option>
|
||||
@@ -1115,19 +1109,19 @@ $labelAlwaysDisplayed = 'Always displayed';
|
||||
</div>
|
||||
|
||||
<div class="section" id="more">
|
||||
<button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
|
||||
<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>
|
||||
|
||||
<a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
|
||||
<button class="btn btn-primary" arial-label="<?php p($l->t('Export the configuration')); ?>">
|
||||
<button class="btn btn-primary" >
|
||||
<?php p($l->t('Export the configuration')); ?>
|
||||
</button>
|
||||
</a>
|
||||
|
||||
<a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.removeCache') ?>">
|
||||
<button class="btn btn-primary" arial-label="<?php p($l->t('Purge the cache')); ?>">
|
||||
<button class="btn btn-primary" >
|
||||
<?php p($l->t('Purge the cache')); ?> (<?php echo $cacheSize ?> Kb)
|
||||
</button>
|
||||
</a>
|
||||
@@ -1139,7 +1133,7 @@ $labelAlwaysDisplayed = 'Always displayed';
|
||||
<?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" rel="noopener">
|
||||
<button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
|
||||
<button>
|
||||
<?php p($l->t('Buy me a coffee ☕')); ?>
|
||||
</button>
|
||||
</a>
|
||||
|
||||
@@ -240,7 +240,7 @@ $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')); ?>">
|
||||
<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>
|
||||
@@ -255,7 +255,7 @@ $labelReset = 'Reset to default';
|
||||
<?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" rel="noopener">
|
||||
<button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
|
||||
<button>
|
||||
<?php p($l->t('Buy me a coffee ☕')); ?>
|
||||
</button>
|
||||
</a>
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
"extends": "@vue/tsconfig/tsconfig.json",
|
||||
"include": ["./src/**/*.js"],
|
||||
"compilerOptions": {
|
||||
"types": ["node", "vue", "vue-router"],
|
||||
"outDir": "./js/",
|
||||
"target": "ESNext",
|
||||
"module": "ESNext",
|
||||
// Set module resolution to bundler and `noEmit` to be able to set `allowImportingTsExtensions`, so we can import Typescript with .ts extension
|
||||
"moduleResolution": "Bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"noEmit": true,
|
||||
// Allow ts to import js files
|
||||
"allowJs": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"declaration": false,
|
||||
"noImplicitAny": false,
|
||||
"resolveJsonModule": true,
|
||||
"strict": true,
|
||||
},
|
||||
"vueCompilerOptions": {
|
||||
"target": 2.7
|
||||
},
|
||||
"ts-node": {
|
||||
// these options are overrides used only by ts-node
|
||||
// same as our --compilerOptions flag and our TS_NODE_COMPILER_OPTIONS environment variable
|
||||
"compilerOptions": {
|
||||
"moduleResolution": "node",
|
||||
"module": "commonjs",
|
||||
"verbatimModuleSyntax": false
|
||||
}
|
||||
}
|
||||
}
|
||||
+47
-63
@@ -1,70 +1,54 @@
|
||||
const path = require('path')
|
||||
const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
|
||||
const {
|
||||
VueLoaderPlugin
|
||||
} = require('vue-loader')
|
||||
// const StyleLintPlugin = require('stylelint-webpack-plugin')
|
||||
const { VueLoaderPlugin } = require('vue-loader')
|
||||
const StyleLintPlugin = require('stylelint-webpack-plugin')
|
||||
|
||||
module.exports = {
|
||||
devtool: "source-map",
|
||||
entry: {
|
||||
'admin': path.join(__dirname, 'src', 'admin.js'),
|
||||
'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
|
||||
},
|
||||
output: {
|
||||
path: path.resolve(__dirname, './js'),
|
||||
publicPath: '/js',
|
||||
filename: '[name].js?v=[chunkhash]',
|
||||
chunkFilename: 'chunks/[name]-[chunkhash].js',
|
||||
},
|
||||
module: {
|
||||
rules: [{
|
||||
test: /\.css$/,
|
||||
use: ['vue-style-loader', 'css-loader'],
|
||||
},
|
||||
{
|
||||
test: /\.scss$/,
|
||||
use: ['vue-style-loader', 'css-loader', 'sass-loader'],
|
||||
},
|
||||
{
|
||||
test: /\.vue$/,
|
||||
loader: 'vue-loader',
|
||||
},
|
||||
{
|
||||
test: /\.tsx?$/,
|
||||
use: [
|
||||
'babel-loader',
|
||||
{
|
||||
// Fix TypeScript syntax errors in Vue
|
||||
loader: 'ts-loader',
|
||||
options: {
|
||||
transpileOnly: true,
|
||||
devtool: "source-map",
|
||||
entry: {
|
||||
'admin': path.join(__dirname, 'src', 'admin.js'),
|
||||
'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
|
||||
},
|
||||
output: {
|
||||
path: path.resolve(__dirname, './js'),
|
||||
publicPath: '/js',
|
||||
filename: '[name].js?v=[hash]',
|
||||
chunkFilename: 'chunks/[name]-[hash].js',
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.css$/,
|
||||
use: ['vue-style-loader', 'css-loader'],
|
||||
},
|
||||
{
|
||||
test: /\.scss$/,
|
||||
use: ['vue-style-loader', 'css-loader', 'sass-loader'],
|
||||
},
|
||||
{
|
||||
test: /\.vue$/,
|
||||
loader: 'vue-loader',
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
loader: 'babel-loader',
|
||||
exclude: /node_modules/,
|
||||
},
|
||||
{
|
||||
test: /\.(png|jpg|gif|svg)$/,
|
||||
loader: 'url-loader',
|
||||
options: {
|
||||
name: '[name].[ext]?[hash]',
|
||||
limit: 8192,
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
exclude: BabelLoaderExcludeNodeModulesExcept([]),
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
loader: 'babel-loader',
|
||||
exclude: /node_modules/,
|
||||
},
|
||||
{
|
||||
test: /\.(png|jpg|gif|svg)$/,
|
||||
loader: 'url-loader',
|
||||
options: {
|
||||
name: '[name].[ext]?[hash]',
|
||||
limit: 8192,
|
||||
},
|
||||
},
|
||||
},
|
||||
plugins: [
|
||||
new VueLoaderPlugin(),
|
||||
new StyleLintPlugin(),
|
||||
],
|
||||
},
|
||||
plugins: [
|
||||
new VueLoaderPlugin(),
|
||||
// new StyleLintPlugin(),
|
||||
],
|
||||
resolve: {
|
||||
extensions: ['.*', '.js', '.vue'],
|
||||
symlinks: false,
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['*', '.js', '.vue'],
|
||||
symlinks: false,
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user