Compare commits

..

66 Commits

Author SHA1 Message Date
Simon Vieille bc6470a440 Merge pull request 'develop' (#197) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/197
2022-12-26 14:00:48 +01:00
Simon Vieille 65e21ab4c5 Merge pull request 'next release' (#191) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/191
2022-12-26 13:59:24 +01:00
Simon Vieille 15ac74d8e9 update version 2022-12-26 13:53:40 +01:00
Simon Vieille 40229b93f6 update changelog 2022-12-26 13:53:40 +01:00
Simon Vieille 9b24f714ce Merge pull request 'translations' (#196) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/196
2022-12-26 13:53:06 +01:00
deblan f0f6c4206a Translated using Weblate (Spanish)
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/es/
2022-12-26 12:44:07 +00:00
deblan 3b6478edbb Translated using Weblate (Russian)
Currently translated at 80.4% (74 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/
2022-12-26 12:44:06 +00:00
deblan df7c94fe24 Translated using Weblate (Dutch)
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/nl/
2022-12-26 12:44:06 +00:00
deblan 7b808d87b1 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/zh_Hans/
2022-12-26 12:44:06 +00:00
deblan 39e3cf9dd3 Translated using Weblate (French)
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/fr/
2022-12-26 12:44:06 +00:00
deblan 5598af213d Translated using Weblate (German)
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/de/
2022-12-26 12:44:06 +00:00
deblan 367bd72bfb Translated using Weblate (Czech)
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/cs/
2022-12-26 12:44:06 +00:00
Simon Vieille c46713dc56 add missing translations 2022-12-26 13:40:45 +01:00
Simon Vieille 1594f3583c Merge branch 'develop' into translations 2022-12-26 13:33:45 +01:00
Codeberg Translate ff7f423dcb Merge branch 'origin/translations' into Weblate. 2022-12-26 12:31:12 +00:00
thejenja f3e1784577 Translated using Weblate (Russian)
Currently translated at 80.2% (73 of 91 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/
2022-12-26 12:31:12 +00:00
Simon Vieille 9264b0f10d add translation configuration 2022-12-26 13:07:59 +01:00
Simon Vieille 08b418d55d add 'top-menu-mouse-over-hidden-label' as window property and use it in the AppMenu component 2022-12-26 13:07:59 +01:00
Simon Vieille 47af9088d4 add the 'top-menu-mouse-over-hidden-label' 2022-12-26 13:07:59 +01:00
Simon Vieille 690c437476 add hiddenLabels variables to show or hide of top menu items on mouse over 2022-12-26 13:07:59 +01:00
Simon Vieille be66c27452 Merge pull request '[FEATURE] Option to disable the display of Icon-Names in the top left Menu-Bar (#194)' (#195) from feature/issue194 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/195
2022-12-26 13:05:25 +01:00
Simon Vieille 785edbf5c5 add translation configuration 2022-12-26 12:59:19 +01:00
Simon Vieille 4258327a70 add 'top-menu-mouse-over-hidden-label' as window property and use it in the AppMenu component 2022-12-26 12:57:07 +01:00
Simon Vieille 37e00c51c3 add the 'top-menu-mouse-over-hidden-label' 2022-12-26 12:56:32 +01:00
Simon Vieille f7d463e734 add hiddenLabels variables to show or hide of top menu items on mouse over 2022-12-26 00:56:27 +01:00
Simon Vieille cae4d8ab66 Merge pull request 'translations' (#190) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/190
2022-12-06 13:27:35 +01:00
Simon Vieille 66a1c1eecb Merge branch 'develop' into translations 2022-12-06 06:49:23 +01:00
Simon Vieille cc799060af update chanlog 2022-12-06 06:49:16 +01:00
Simon Vieille a3802ef298 update ci config 2022-12-06 06:48:27 +01:00
Simon Vieille 901668236f Merge branch 'develop' into translations 2022-12-05 23:44:49 +01:00
gallegonovato fef81eab0f Translated using Weblate (Spanish)
Currently translated at 100.0% (91 of 91 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/es/
2022-12-05 22:39:36 +00:00
Simon Vieille 21e0f4cd89 Merge pull request 'feature/dependency_check' (#188) from feature/dependency_check into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/188
2022-12-05 10:18:23 +01:00
Simon Vieille 5411267960 CI: use nodejs for dependency check 2022-12-04 22:52:02 +01:00
Simon Vieille b50cd5c4d0 CI: update dependency check 2022-12-04 22:42:50 +01:00
Simon Vieille 709ace5d4f CI: add dependency check 2022-12-04 22:25:04 +01:00
Simon Vieille b7595a371d Merge pull request 'improve code quality' (#187) from feature/code_quality into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/187
2022-12-04 20:25:56 +01:00
Simon Vieille a7ab4573c5 update makefile run-code-quality-analysis command: use current branch and envvars 2022-12-04 20:23:48 +01:00
Simon Vieille 62c4333278 Merge branch 'develop' into feature/code_quality 2022-12-04 19:49:20 +01:00
Simon Vieille 8a8d8f2910 Merge pull request 'sonar-scanner configuration' (#186) from feature/ci into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/186
2022-12-04 19:47:44 +01:00
Simon Vieille 7c72198736 sonar-scanner configuration 2022-12-04 19:06:19 +01:00
Simon Vieille d1b2a1ee3c sonar-scanner configuration 2022-12-04 18:59:21 +01:00
deblan 355c73185b Added translation using Weblate (Spanish) 2022-12-04 14:45:47 +00:00
Simon Vieille e1797e1e03 split long lines 2022-12-04 13:01:56 +01:00
Simon Vieille 3f04546a6e split long lines 2022-12-04 00:57:17 +01:00
Simon Vieille 0bd1a5baaf split long lines 2022-12-04 00:56:05 +01:00
Simon Vieille 24c87c0104 add missing img alt 2022-12-04 00:47:30 +01:00
Simon Vieille 4d05079c70 split long lines 2022-12-04 00:45:29 +01:00
Simon Vieille 0382e1c61d replace dupplicated string with variables 2022-12-04 00:19:54 +01:00
Simon Vieille 0f34275d04 remove duplicated selector ".side-menu-always-displayed body" 2022-12-04 00:14:38 +01:00
Simon Vieille 1c2f04f63f replace border-size with border-width 2022-12-04 00:13:28 +01:00
Simon Vieille 81bcad348e remove this unused import of 'trim' 2022-12-04 00:09:11 +01:00
Simon Vieille 053615c2c4 remove this unused "$topMenuAppsOrder" local variable 2022-12-04 00:08:20 +01:00
Simon Vieille 113e4db9b6 Merge pull request 'add code_quality in ci' (#185) from feature/ci into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/185
2022-12-04 00:06:59 +01:00
Simon Vieille 89cf28f9a8 add code_quality in ci 2022-12-03 23:47:55 +01:00
Codeberg Translate 127fb45ece Merge branch 'origin/translations' into Weblate. 2022-12-03 21:18:59 +00:00
deblan a1d3df6018 Translated using Weblate (German)
Currently translated at 100.0% (91 of 91 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/de/
2022-12-03 21:18:58 +00:00
Simon Vieille 9c3d9ccbc4 Merge pull request 'release v3.4.1' (#184) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/184
2022-12-02 12:33:30 +01:00
Simon Vieille 45a68cbfc8 release v3.4.1 2022-12-02 12:25:31 +01:00
Simon Vieille f42cb368db Merge pull request 'hide custom categories list when empty' (#183) from feature/issue182 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/183
2022-12-02 12:23:18 +01:00
Simon Vieille 6d940cc7c4 Merge pull request 'translations' (#181) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/181
2022-12-02 12:19:04 +01:00
Simon Vieille 2d30a1f1ea hide custom categories list when empty 2022-12-02 12:16:49 +01:00
Simon Vieille 599e70bf8a Merge branch 'develop' into translations 2022-11-21 08:43:19 +01:00
Simon Vieille d012e464a1 add translations 2022-11-21 08:43:08 +01:00
Codeberg Translate ae2b52cb36 Merge branch 'origin/translations' into Weblate. 2022-11-20 22:26:39 +00:00
zonorti 5444bbf987 Translated using Weblate (Russian)
Currently translated at 67.0% (61 of 91 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/
2022-11-20 22:26:38 +00:00
jorisvandijk ed7d4f4750 Translated using Weblate (Dutch)
Currently translated at 100.0% (91 of 91 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/nl/
2022-11-20 22:26:38 +00:00
28 changed files with 399 additions and 213 deletions
+25 -2
View File
@@ -5,16 +5,39 @@ pipeline:
- make dep
when:
event: [tag, push, pull_request]
branch: [master, develop, feature/*]
branch: [master, develop, feature/*, translations]
build:
image: gitnet.fr/deblan/devenv
commands:
- make build
when:
branch: [master, develop, feature/*]
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]
dependency_check:
image: node:16-slim
commands:
- npm audit
failure: ignore
when:
event: [pull_request]
package:
image: gitnet.fr/deblan/devenv
volumes:
+16
View File
@@ -1,5 +1,21 @@
## [Unreleased]
## 3.5.0
### Added
* add dependency check (ci)
* add code quality check (ci)
* add translations (thanks to gallegonovato)
* add option to disable the display labels in the top menu (#194)
### Fixed
* fix missing img alt (settings image)
* fix code quality alerts
## 3.4.1
### Added
* add translations (thanks to zonorti, jorisvandijk, jak2k)
### Fixed
* fix #183: hide custom categories list when empty (admin page)
## 3.4.0
### Added
* add translations (thanks to Pavelb, nier, Timur, p-bo)
+1 -1
View File
@@ -34,4 +34,4 @@ translations:
.ONESHELL:
run-code-quality-analysis:
export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr
sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=$$SONAR_SERVER -Dsonar.branch.name=$$(git branch --show-current)
+1 -1
View File
@@ -21,7 +21,7 @@ You like this app and you want to support me? ☕ [Buy me a coffee](https://www.
Requirements
------------
* PHP >= 7.4
* PHP >= 8.0
* App `theming` enabled
Installation and upgrade
+2 -2
View File
@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
Requirements:
* PHP >= 7.4
* PHP >= 8.0
* App `theming` enabled
If you like this application and if you want to support the development:
@@ -32,7 +32,7 @@ Notice
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
]]></description>
<version>3.4.0</version>
<version>3.5.0</version>
<licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
<namespace>SideMenu</namespace>
+5 -1
View File
@@ -137,6 +137,10 @@
padding-right: 20px;
}
.side-menu-setting-label--top {
vertical-align: top;
}
.side-menu-setting-form {
display: table-cell;
min-width: 300px;
@@ -182,7 +186,7 @@
}
.badge {
border-size: 1px;
border-width: 1px;
padding: 2px 8px;
margin-right: 2px;
margin-bottom: 5px;
-3
View File
@@ -235,9 +235,6 @@
.side-menu-always-displayed body {
width: calc(100% - 50px) !important;
}
.side-menu-always-displayed body {
position: absolute;
left: 50px;
}
+5 -1
View File
@@ -86,7 +86,11 @@ class AppController extends Controller
protected function redirectToApp($appId): RedirectResponse
{
$isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false);
$isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
'htaccess.IgnoreFrontController',
false
);
$isFrontControllerActive = 'true' === getenv('front_controller_active');
if ($isIgnoreFrontController || $isFrontControllerActive) {
+20 -11
View File
@@ -21,14 +21,14 @@ 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\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCA\Theming\ThemingDefaults;
use OCA\SideMenu\Service\Color;
class CssController extends Controller
{
@@ -58,8 +58,7 @@ class CssController extends Controller
ConfigProxy $config,
ThemingDefaults $theming,
Color $color
)
{
) {
parent::__construct($appName, $request);
$this->user = OC::$server[IUserSession::class]->getUser();
@@ -105,16 +104,18 @@ class CssController extends Controller
$topSideMenuApps = $userTopSideMenuApps;
}
$isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
$isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
$isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
$isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($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);
@@ -125,25 +126,33 @@ class CssController extends Controller
if ($isDarkMode) {
$backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
$backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
$currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2);
$currentAppBackgroundColor = $this->config->getAppValue(
'dark-mode-current-app-background-color',
$darkenPrimaryColor2
);
$loaderColor = $this->config->getAppValue('dark-mode-loader-color', $lightenPrimaryColor);
$textColor = $this->config->getAppValue('dark-mode-text-color', $textColor);
$iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
$iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
$opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');
$backgroundOpacity = dechex($this->config->getAppValueInt('dark-mode-background-color-opacity', '100') * 255 / 100);
$opacity = $this->config->getAppValueInt('dark-mode-background-color-opacity', '100');
$backgroundOpacity = dechex($opacity * 255 / 100);
} else {
$backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
$backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
$currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2);
$currentAppBackgroundColor = $this->config->getAppValue(
'current-app-background-color',
$darkenPrimaryColor2
);
$loaderColor = $this->config->getAppValue('loader-color', $lightenPrimaryColor);
$textColor = $this->config->getAppValue('text-color', $textColor);
$iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
$iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
$opener = $this->config->getAppValue('opener', 'side-menu-opener');
$backgroundOpacity = dechex($this->config->getAppValueInt('background-color-opacity', '100') * 255 / 100);
$opacity = $this->config->getAppValueInt('background-color-opacity', '100');
$backgroundOpacity = dechex($opacity * 255 / 100);
}
$backgroundColor .= $backgroundOpacity;
+4 -1
View File
@@ -95,7 +95,6 @@ class JsController extends Controller
{
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
$topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
$topMenuAppsOrder = $this->config->getAppValueArray('top-menu-apps-order', '[]');
$targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
$useAvatar = $this->config->getAppValueBool('use-avatar', '0');
$isForced = $this->config->getAppValueBool('force', '0');
@@ -172,6 +171,10 @@ class JsController extends Controller
'avatar' => $avatar,
'top-menu-apps' => $topMenuApps,
'top-side-menu-apps' => $topSideMenuApps,
'top-menu-mouse-over-hidden-label' => $this->config->getAppValueBool(
'top-menu-mouse-over-hidden-label',
'0'
),
'target-blank-apps' => $targetBlankApps,
'settings' => $settings,
'logo' => $this->themingDefaults->getLogo(),
+7 -2
View File
@@ -43,8 +43,13 @@ class PersonalSettingController extends Controller
*/
protected $userSession;
public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
{
public function __construct(
$appName,
IRequest $request,
IConfig $config,
ConfigProxy $configProxy,
IUserSession $userSession
) {
parent::__construct($appName, $request);
$this->config = $config;
+2 -1
View File
@@ -74,7 +74,8 @@ class CategoryRepository
}
foreach ($categoriesLabels as $k => $category) {
$categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
$categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ??
$category['translations']['en']['name'];
unset($categoriesLabels[$k]);
}
+16 -3
View File
@@ -125,15 +125,24 @@ class Admin implements ISettings
'background-color' => $backgroundColor,
'background-color-to' => $backgroundColorTo,
'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
'current-app-background-color' => $this->config->getAppValue(
'current-app-background-color',
$darkenPrimaryColor2
),
'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
'text-color' => $this->config->getAppValue('text-color', $textColor),
'dark-mode-background-color' => $darkModeBackgroundColor,
'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
'dark-mode-background-color-opacity' => $this->config->getAppValueInt(
'dark-mode-background-color-opacity',
'100'
),
'dark-mode-current-app-background-color' => $this->config->getAppValue(
'dark-mode-current-app-background-color',
$darkenPrimaryColor2
),
'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
@@ -159,6 +168,10 @@ class Admin implements ISettings
'force' => $this->config->getAppValue('force', '0'),
'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
'top-menu-mouse-over-hidden-label' => $this->config->getAppValue(
'top-menu-mouse-over-hidden-label',
'0'
),
'apps-order' => $this->config->getAppValueArray('apps-order', '[]'),
'ordered-apps' => $this->appRepository->getOrderedApps(),
'top-side-menu-apps' => $this->config->getAppValueArray('top-side-menu-apps', '[]'),
+7 -2
View File
@@ -54,8 +54,13 @@ class Personal implements ISettings
*/
private $appRepository;
public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
{
public function __construct(
IL10N $l,
ILogger $logger,
ConfigProxy $config,
IUserSession $userSession,
AppRepository $appRepository
) {
$this->l = $l;
$this->logger = $logger;
$this->config = $config;
+7 -1
View File
@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<template>
<div>
<ul class="side-menu-setting-list">
<ul class="side-menu-setting-list" :class="{hide: values.length === 0}">
<li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
<span v-text="item.en"></span>
</li>
@@ -77,6 +77,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
}
</style>
<style scoped>
.hide {
display: none;
}
</style>
<script>
import NcModal from '@nextcloud/vue/dist/Components/NcModal'
import NcActions from '@nextcloud/vue/dist/Components/NcActions'
+15 -4
View File
@@ -22,12 +22,16 @@
<template>
<nav class="app-menu show">
<ul class="app-menu-main" v-if="apps !== null">
<ul
class="app-menu-main"
:class="{ 'app-menu-main__hidden-label': hiddenLabels }"
v-if="apps !== null"
>
<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 }"
:class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels }"
:style="makeStyle(app)"
>
<a :href="app.href"
@@ -77,6 +81,7 @@ export default {
appLimit: 0,
observer: null,
targetBlankApps: [],
hiddenLabels: true
}
},
mounted() {
@@ -96,6 +101,7 @@ export default {
})
this.targetBlankApps = window.targetBlankApps
this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
this.observer = new ResizeObserver(this.resize)
this.observer.observe(this.$el)
this.resize()
@@ -220,8 +226,8 @@ $header-icon-size: 20px;
overflow: hidden;
}
&:hover,
&: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;
@@ -241,7 +247,12 @@ $header-icon-size: 20px;
.app-menu-entry:hover,
.app-menu-entry:focus {
opacity: 1;
}
&: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 {
img {
margin-top: -6px;
}
+1 -1
View File
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{{ label }}
<span class="avatardiv avatardiv-shown">
<img v-bind:src="avatar">
<img v-bind:src="avatar" :alt="label">
</span>
</a>
</div>
-1
View File
@@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</template>
<script>
import trim from 'trim'
import axios from 'axios'
import OpenerButton from './OpenerButton'
import SettingsButton from './SettingsButton'
+1
View File
@@ -90,3 +90,4 @@
"Applications kept in the top menu": "Aplikace ponechané v horní nabídce"
"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": "Hide labels on mouse over"
+18 -38
View File
@@ -3,21 +3,14 @@
"No": "Nein"
"Yes": "Ja"
"Menu": "Menü"
? '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.'
? '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": "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."
"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 Anwendung 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"
@@ -44,21 +37,16 @@
"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 Anwendung 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)"
"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": "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."
"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"
@@ -67,20 +55,15 @@
"Use my selection": "Verwende meine Auswahl"
"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 Anwendung 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": "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 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": "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"
"Categories": "Kategorien"
@@ -89,9 +72,7 @@
"Name": "Name"
"Customed": "Benutzerdefiniert"
"Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese\
\ Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code>\
\ angewendet."
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code> angewendet."
"Dark mode colors": "Farben für den dunklen Modus"
"With categories": "Mit Kategorien"
"Custom categories": "Benutzerdefinierte Kategorien"
@@ -105,9 +86,8 @@
"Small text": "Kleiner Text"
"Normal text": "Normaler Text"
"Big text": "Großer Text"
"Applications": "Applications"
"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."
"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"
+93
View File
@@ -0,0 +1,93 @@
"Custom menu": "Menú personalizado"
"Enable the custom menu": "Habilitar el menú personalizado"
"No": "No"
"Yes": "Sí"
"Menu": "Menú"
? '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.'
: 'Usa la combinación de teclas <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para activar y desactivar el menú lateral. Use <span class="keyboard-key">tab</span> para navegar.'
"Top menu": "Menu principal"
"Apps that not must be moved in the side menu": "Aplicaciones que no se deben mover al menú lateral"
"If there is no selection then the global configuration is applied.": "Si no hay selección, se aplica la configuración global."
"Experimental": "En pruebas"
"Save": "Guardar"
"You like this app and you want to support me?": "¿Te gusta esta aplicación y quieres apoyarme?"
"Buy me a coffee ☕": "Cómprame un café ☕"
"Hidden": "Oculto"
"Small": "Pequeño"
"Normal": "Normal"
"Big": "Grande"
"Hidden icon": "Ocultar Icono"
"Small icon": "Icono pequeño"
"Normal icon": "Icono normal"
"Big icon": "Icono grande"
"Hidden text": "Texto oculto"
"Small text": "Texto pequeño"
"Normal text": "Texto normal"
"Big text": "Texto grande"
"Colors": "Colores"
"Background color": "Color de fondo"
"Background color of current app": "Color de fondo de la aplicación actual"
"Text color": "Color del texto"
"Loader": "Cargador"
"Icon": "Icono"
"Same color": "El mismo color"
"Opposite color": "Color opuesto"
"Transparent": "Transparente"
"Opaque": "Opaco"
"Opener": "Abrir"
"Default": "Por defecto"
"Default (dark)": "Por defecto (oscuro)"
"Hamburger": "Hamburguesa"
"Hamburger (dark)": "Hamburger (negro)"
"Hamburger 2": "Hamburguesa 2"
"Hamburger 2 (dark)": "Hamburger 2 (negro)"
"Before the logo": "Antes del logotipo"
"After the logo": "Después del logotipo"
"Position": "Posición"
"Show only the opener (hidden logo)": "Mostrar solo abrir (ocultar logotipo)"
"Do not display the side menu and the opener if there is no application (eg: public pages).": "No mostrar el menú lateral y el abridor si no hay aplicación (por ejemplo: páginas públicas)."
"Panel": "Panel"
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Abra el menú cuando el ratón esté sobre el icono (se desactiva automáticamente en las pantallas táctiles)"
"Display the big menu": "Mostrar el menú grande"
"Display the logo": "Mostrar el logotipo"
"Icons and texts": "Iconos y textos"
"Loader enabled": "Cargador activado"
"Tips": "Consejos"
"Always displayed": "Siempre se muestra"
"This is the automatic behavior when the menu is always displayed.": "Este es el comportamiento automático cuando aún se muestra el menú."
"Not compatible with touch screens.": "No es compatible con las pantallas táctiles."
"Big menu": "Menú grande"
"Live preview": "Previsualización en directo"
"Open apps in new tab": "Abrir las aplicaciones en una nueva pestaña"
"Use the global setting": "Utilizar la configuración global"
"Use my selection": "Utilizar mi selección"
"Show and hide the list of applications": "Mostrar y ocultar la lista de aplicaciones"
"Use the avatar instead of the logo": "Utilizar un avatar en lugar de un logotipo"
"You do not have permission to change the settings.": "No tienes permiso para cambiar la configuración."
"Force this configuration to users": "Forzar esta configuración a todos los usuarios"
"Export the configuration": "Exportar la configuración"
"Purge the cache": "Vaciar la caché"
"Show the link to settings": "Mostrar un enlace a la configuración"
"The menu is enabled by default for users": "El menú está activado por defecto para los usuarios"
"Except when the configuration is forced.": "Excepto cuando la configuración es forzada."
"Apps that should not be displayed in the menu": "Aplicaciones que no deben aparecer en el menú"
"This feature is only compatible with the <code>big menu</code> display.": "Esta función sólo es compatible con la pantalla del <code>menú grande</code>."
"The logo is a link to the default app": "El logotipo es un enlace a la aplicación por defecto"
"Others": "Otros"
"Categories": "Categorías"
"Customize sorting": "Personalizar la clasificación"
"Order by": "Ordenar por"
"Name": "Nombre"
"Customed": "Personalizado"
"Show and hide the list of categories": "Mostrar y ocultar la lista de categorías"
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estos parámetros se utilizan cuando el tema oscuro o el tema oscuro de Breeze están activados."
"Dark mode colors": "Colores del modo oscuro"
"With categories": "Con categorías"
"Custom categories": "Categorías personalizadas"
"Customize application categories": "Personalizar las categorías de las aplicaciones"
"Reset to default": "Restablecer los valores por defecto"
"Applications": "Aplicaciones"
"Applications kept in the top menu": "Aplicaciones guardadas en el menú superior"
"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": "Hide labels on mouse over"
+1
View File
@@ -90,3 +90,4 @@
"Applications kept in the top menu": "Applications conservées dans le menu supérieur"
"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"
+87 -86
View File
@@ -1,92 +1,93 @@
"Custom menu": "Custom menu"
"Enable the custom menu": "Enable the custom menu"
"No": "No"
"Yes": "Yes"
"Custom menu": "Aangepast menu"
"Enable the custom menu": "Het aangepaste menu inschakelen"
"No": "Nee"
"Yes": "Ja"
"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"
: 'Gebruik de snelkoppeling <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> om het zijmenu te openen en te verbergen. Gebruik <span class="keyboard-key">tab</span> om te navigeren.'
"Top menu": "Bovenste menu"
"Apps that not must be moved in the side menu": "Apps die niet moeten worden verplaatst in het zijmenu"
"If there is no selection then the global configuration is applied.": "Als er geen keuze is, wordt de globale configuratie toegepast."
"Experimental": "Experimenteel"
"Save": "Opslaan"
"You like this app and you want to support me?": "Vind je deze app leuk en wil je me steunen?"
"Buy me a coffee ☕": "Koop een koffie voor me ☕"
"Hidden": "Verborgen"
"Small": "Klein"
"Normal": "Normaal"
"Big": "Groot"
"Hidden icon": "Verborgen icoon"
"Small icon": "Klein icoon"
"Normal icon": "Normaal icoon"
"Big icon": "Groot icoon"
"Hidden text": "Verborgen tekst"
"Small text": "Kleine tekst"
"Normal text": "Normale tekst"
"Big text": "Grote tekst"
"Colors": "Kleuren"
"Background color": "Achtergrond kleur"
"Background color of current app": "Achtergrondkleur van huidige app"
"Text color": "Tekst kleur"
"Loader": "Lader"
"Icon": "Icoon"
"Same color": "Zelfde kleur"
"Opposite color": "Tegenovergestelde kleur"
"Transparent": "Transparant"
"Opaque": "Ondoorzichtig"
"Opener": "Opener"
"Default": "Default"
"Default (dark)": "Default (dark)"
"Default": "Standaard"
"Default (dark)": "Standaard (donker)"
"Hamburger": "Hamburger"
"Hamburger (dark)": "Hamburger (dark)"
"Hamburger (dark)": "Hamburger (donker)"
"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"
"Hamburger 2 (dark)": "Hamburger 2 (donker)"
"Before the logo": "Voor het logo"
"After the logo": "Na het logo"
"Position": "Positie"
"Show only the opener (hidden logo)": "Toon alleen de opener (verborgen logo)"
"Do not display the side menu and the opener if there is no application (eg: public pages).": "Geef het zijmenu en de opener niet weer als er geen toepassing is (bijv. openbare pagina's)."
"Panel": "Paneel"
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open het menu wanneer de muis over de opener gaat (automatisch uitgeschakeld op aanraakschermen)"
"Display the big menu": "Toon het grote menu"
"Display the logo": "Toon het logo"
"Icons and texts": "Iconen en teksten"
"Loader enabled": "Lader ingeschakeld"
"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."
"Always displayed": "Altijd weergegeven"
"This is the automatic behavior when the menu is always displayed.": "Dit is het automatische gedrag wanneer het menu altijd wordt weergegeven."
"Not compatible with touch screens.": "Niet compatibel met aanraakschermen."
"Big menu": "Groot menu"
"Live preview": "Live voorbeeld"
"Open apps in new tab": "Open apps in nieuwe tab"
"Use the global setting": "Gebruik de globale instellingen"
"Use my selection": "Gebruik mijn selectie"
"Show and hide the list of applications": "De lijst met toepassingen tonen en verbergen"
"Use the avatar instead of the logo": "Gebruik avatar in plaats van het logo"
"You do not have permission to change the settings.": "Je hebt geen toestemming om de instellingen te veranderen."
"Force this configuration to users": "Forceer deze configuratie aan gebruikers"
"Export the configuration": "Exporteer de configuratie"
"Purge the cache": "De cache wissen"
"Show the link to settings": "Toon de link naar de instellingen"
"The menu is enabled by default for users": "Het menu is standaard ingeschakeld voor gebruikers"
"Except when the configuration is forced.": "Behalve als de configuratie geforceerd is."
"Apps that should not be displayed in the menu": "Apps die niet in het menu weergegeven mogen worden"
"This feature is only compatible with the <code>big menu</code> display.": "Deze functie is alleen compatibel met het <code>grote menu</code> scherm."
"The logo is a link to the default app": "Het logo is een link naar de standaard app"
"Others": "Overige"
"Categories": "Categorieën"
"Customize sorting": "Sortering aanpassen"
"Order by": "Sorteer op"
"Name": "Naam"
"Customed": "Aangepast"
"Show and hide the list of categories": "De lijst met categorieën tonen en verbergen"
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Deze parameters worden gebruikt wanneer Dark theme of Breeze Dark Theme zijn ingeschakeld."
"Dark mode colors": "Donkere modus kleuren"
"With categories": "Met categorieën"
"Custom categories": "Aangepaste categorieën"
"Customize application categories": "Toepassingscategorieën aanpassen"
"Reset to default": "Terugzetten naar standaard"
"Applications": "Applicaties"
"Applications kept in the top menu": "Applicaties bewaard in het bovenste menu"
"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"
+10 -9
View File
@@ -1,5 +1,5 @@
"Custom menu": "Custom menu"
"Enable the custom menu": "Enable the custom menu"
"Enable the custom menu": "Включить пользовательское меню"
"No": "Нет"
"Yes": "Да"
"Menu": "Меню"
@@ -31,10 +31,10 @@
"Loader": "Загрузчик"
"Icon": "Иконка"
"Same color": "Такой же цвет"
"Opposite color": "Opposite color"
"Opposite color": "Противоположный цвет"
"Transparent": "Прозрачный"
"Opaque": "Opaque"
"Opener": "Opener"
"Opaque": "Непрозрачный"
"Opener": "Открывалка"
"Default": "По-умолчанию"
"Default (dark)": "По-умолчанию (тёмный)"
"Hamburger": "Гамбургер"
@@ -44,10 +44,10 @@
"Before the logo": "Перед логотипом"
"After the logo": "После логотипа"
"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)."
"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)": "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 logo": "Показать лого"
"Icons and texts": "Иконки и текст"
@@ -67,7 +67,7 @@
"Force this configuration to users": "Force this configuration to users"
"Export the configuration": "Экспортировать конфигурацию"
"Purge the cache": "Очистить кэш"
"Show the link to settings": "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"
@@ -75,7 +75,7 @@
"The logo is a link to the default app": "The logo is a link to the default app"
"Others": "Прочие"
"Categories": "Категории"
"Customize sorting": "Customize sorting"
"Customize sorting": "Настроить сортировку"
"Order by": "В порядке"
"Name": "Название"
"Customed": "Customed"
@@ -90,3 +90,4 @@
"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"
+1
View File
@@ -92,3 +92,4 @@
"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": ""
+7 -13
View File
@@ -3,11 +3,8 @@
"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."
: "使用快捷键 <span class=\"keyboard-key\">Ctrl</span>+<span class=\"keyboard-key\">o</span>\
\ 打开或隐藏侧边栏菜单。使用<span class=\"keyboard-key\">tab</span> 来导航。"
? "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."
: "使用快捷键 <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.": "如不选择,将应用全局设定。"
@@ -40,11 +37,9 @@
"After the logo": "在logo后"
"Position": "位置"
"Show only the opener (hidden logo)": "只显示容器 (隐藏logo)"
"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用,不显示侧边栏菜单和容器\
\ (例如 : 公共页面)。"
"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用,不显示侧边栏菜单和容器 (例如 : 公共页面)。"
"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 logo": "显示logo"
"Icons and texts": "图标与文字"
@@ -93,7 +88,6 @@
"Big text": "大文本"
"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."
"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"
+1
View File
@@ -27,6 +27,7 @@ if ($_['always-displayed']) {
window.topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
window.topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']), "\n"; ?>
window.menuAppsOrder = <?php echo json_encode($_['apps-order']), "\n"; ?>
window.topMenuAppsMouseOverHiddenLabel = <?php echo json_encode($_['top-menu-mouse-over-hidden-label']), "\n"; ?>
<?php if ($display === 'big-menu'): ?>
sideMenu.setAttribute('data-bigmenu', '1')
+46 -29
View File
@@ -41,6 +41,9 @@ $choicesSizes = [
$labelShowHideApps = 'Show and hide the list of applications';
$labelReset = 'Reset to default';
$labelWithCategories = 'With categories';
$labelBigMenu = 'Big menu';
$labelAlwaysDisplayed = 'Always displayed';
?>
<div id="side-menu-section">
@@ -75,7 +78,7 @@ $labelReset = 'Reset to default';
<div>
<label>
<?php p($l->t('With categories')); ?>
<?php p($l->t($labelWithCategories)); ?>
</label>
</div>
<p>
@@ -84,12 +87,12 @@ $labelReset = 'Reset to default';
data-alwaysdiplayed="0"
data-bigmenu="0"
data-sidewithcategories="1"
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t('With categories')); ?>">
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t($labelWithCategories)); ?>">
</p>
<div>
<label for="side-menu-opener">
<?php p($l->t('Big menu')); ?>
<?php p($l->t($labelBigMenu)); ?>
</label>
</div>
<p>
@@ -98,12 +101,12 @@ $labelReset = 'Reset to default';
data-alwaysdiplayed="0"
data-bigmenu="1"
data-sidewithcategories="0"
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t($labelBigMenu)); ?>">
</p>
<div>
<label for="side-menu-opener">
<?php p($l->t('Always displayed')); ?>
<?php p($l->t($labelAlwaysDisplayed)); ?>
</label>
</div>
<p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
@@ -113,7 +116,7 @@ $labelReset = 'Reset to default';
data-alwaysdiplayed="1"
data-bigmenu="0"
data-sidewithcategories="0"
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t('Always displayed')); ?>">
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t($labelAlwaysDisplayed)); ?>">
</p>
<input
@@ -148,9 +151,9 @@ $labelReset = 'Reset to default';
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div>
<div class="side-menu-setting-table">
@@ -339,9 +342,9 @@ $labelReset = 'Reset to default';
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div>
<p>
@@ -534,9 +537,9 @@ $labelReset = 'Reset to default';
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div>
<div class="side-menu-setting-table">
@@ -675,8 +678,8 @@ $labelReset = 'Reset to default';
<?php p($l->t('Apps that should not be displayed in the menu')); ?>
<div class="badges">
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
</div>
</div>
<div class="side-menu-setting-form">
@@ -799,9 +802,9 @@ $labelReset = 'Reset to default';
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div>
<div class="side-menu-setting-table">
@@ -868,6 +871,20 @@ $labelReset = 'Reset to default';
</div>
</div>
</div>
<div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<?php p($l->t('Hide labels on mouse over')); ?>
</div>
<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 ($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>
<?php endforeach; ?>
</select>
</div>
</div>
</div>
</div>
@@ -878,9 +895,9 @@ $labelReset = 'Reset to default';
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div>
<div class="side-menu-setting-table">
@@ -924,8 +941,8 @@ $labelReset = 'Reset to default';
</h2>
<div class="badges">
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
</div>
<div class="side-menu-setting-table">
@@ -951,7 +968,7 @@ $labelReset = 'Reset to default';
</div>
<div class="side-menu-setting-row">
<div class="side-menu-setting-label">
<div class="side-menu-setting-label side-menu-setting-label--top">
<?php p($l->t('Custom categories')); ?>
</div>
<div class="side-menu-setting-form">
@@ -1040,9 +1057,9 @@ $labelReset = 'Reset to default';
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
<span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
<span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
<span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
<span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
<span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
</div>
<p>