Compare commits

...

155 Commits

Author SHA1 Message Date
Simon Vieille 25e70f276f Merge pull request 'fix appinfo version' (#308) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/308
2024-01-16 20:40:28 +01:00
Simon Vieille c5e126667d fix appinfo version 2024-01-16 20:39:44 +01:00
Simon Vieille d06b6b9e31 Merge pull request 'release 3.11.3' (#307) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/307
2024-01-16 20:14:53 +01:00
Simon Vieille 197a6dc413 update changelog 2024-01-16 20:13:14 +01:00
Simon Vieille fbe686c526 Merge pull request '[Bug] Menu-Icon in Decks broken - caused of side_menu #302' (#306) from bugfix/issue302 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/306
2024-01-16 20:11:14 +01:00
Simon Vieille b20f5a471a fix #302: remove "!important" on the rule that moves elements 2024-01-15 21:12:24 +01:00
Simon Vieille 5c218bff2a Merge pull request 'releave v3.11.2' (#300) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/300
2023-11-12 20:30:56 +01:00
Simon Vieille f76deeb416 add default translations (fix #298) 2023-11-12 20:30:19 +01:00
Simon Vieille 93a4eccb41 Merge pull request 'Translated using Weblate (Slovak)' (#299) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/299
2023-11-12 20:29:01 +01:00
deblan f8458ed488 Translated using Weblate (Slovak)
Currently translated at 43.4% (40 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/sk/
2023-11-12 19:27:51 +00:00
Simon Vieille b0385c172b Merge pull request 'release v3.11.1' (#297) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/297
2023-11-12 17:03:21 +01:00
Simon Vieille c35ecd7444 release v3.11.1 2023-11-12 16:58:24 +01:00
Simon Vieille 2edb771273 release v3.11.1 2023-11-12 16:58:09 +01:00
Simon Vieille 48a2224e3d Merge pull request 'translations' (#296) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/296
2023-11-12 16:56:07 +01:00
Simon Vieille a05ef44ede Merge pull request 'add width to .side-menu-categories for side menu with categories display' (#295) from bugfix/issue294 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/295
2023-11-12 16:54:58 +01:00
Simon Vieille f6d6e263b6 add width to .side-menu-categories for side menu with categories display 2023-11-12 16:49:24 +01:00
igorfreire b2e0898d5b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/pt_BR/
2023-11-11 20:13:37 +00:00
igorfreire 4af28c303b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (92 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/pt_BR/
2023-11-07 15:15:14 +00:00
Simon Vieille 04ac7e5ed1 Merge pull request 'update changelogs' (#293) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/293
2023-11-05 18:46:46 +01:00
Simon Vieille e199019d3d update changelogs 2023-11-05 18:46:31 +01:00
Simon Vieille 67743485cb Merge pull request 'release v3.11.0' (#292) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/292
2023-11-05 18:45:25 +01:00
Simon Vieille a18732b043 Merge branch 'develop' into translations 2023-11-05 18:40:51 +01:00
Simon Vieille 9ed3e93bf4 release v3.11.0 2023-11-05 18:37:51 +01:00
Simon Vieille 320f4cca3c Merge pull request 'To add option to filter left menu (fix #282)' (#291) from feature/issue282 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/291
2023-11-05 18:34:47 +01:00
Simon Vieille b1ae62ba2a fix view of side menu headers with search 2023-11-05 18:30:24 +01:00
Simon Vieille 5d91b44c20 add translations 2023-11-05 16:04:44 +01:00
Simon Vieille 3ec823c856 add search component 2023-11-05 16:04:33 +01:00
Simon Vieille c9bae926f1 Merge pull request 'Parameter option not located at the same position menu button is (fix #283)' (#290) from bugfix/issue283 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/290
2023-11-05 14:59:49 +01:00
Simon Vieille 7b1d31d1db fix ci 2023-11-04 13:39:32 +01:00
Simon Vieille c5cac45f7e fix ci 2023-11-04 13:38:28 +01:00
Simon Vieille 9a35734657 remove label of the link to personal settings (fix #283) 2023-11-04 13:33:34 +01:00
deblan 3144f56b80 Added translation using Weblate (Slovak) 2023-10-16 08:16:34 +00:00
Simon Vieille 0ce318d6ec Merge pull request 'fix ci syntax' (#281) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/281
2023-09-29 16:48:36 +02:00
Simon Vieille 6248e8ccef Merge pull request 'fix ci syntax' (#280) from bugfix/ci into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/280
2023-09-29 16:48:06 +02:00
Simon Vieille 648bdeae04 fix ci syntax 2023-09-29 16:46:56 +02:00
mschmidm d6a8dee1b2 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/
2023-09-19 12:53:08 +00:00
Simon Vieille c26c5f26df Merge pull request 'release v3.10.3' (#276) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/276
2023-07-24 21:35:58 +02:00
Simon Vieille 1e6d241e5c release v3.10.3 2023-07-24 21:32:13 +02:00
Simon Vieille eeac15d578 Merge pull request 'fix #274' (#275) from feature/issue274 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/275
2023-07-24 21:30:58 +02:00
Simon Vieille 89986cd604 update changelog 2023-07-24 21:12:43 +02:00
Simon Vieille 3c1bd99319 update @nexcloud/* packages
change the way to load nextcloud components (NcActionLink/NcActions)

fix #274
2023-07-24 21:10:30 +02:00
Simon Vieille 6ce7d3223f Merge pull request 'release v3.10.2' (#272) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/272
2023-07-15 15:22:53 +02:00
Simon Vieille 33bb8646f4 release v3.10.2 2023-07-15 15:22:09 +02:00
Simon Vieille 6eb977dad5 Merge pull request 'release v3.10.1' (#271) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/271
2023-07-15 15:03:26 +02:00
Simon Vieille e571be5fcf release v3.10.1 2023-07-15 14:58:43 +02:00
Simon Vieille 432e0f175f Merge pull request 'use php7 syntax' (#270) from feature/issue269 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/270
2023-07-15 14:57:47 +02:00
Simon Vieille 022e8af6a2 update changelog 2023-07-15 14:53:04 +02:00
Simon Vieille b8a5a82fd2 fix #269: use php7 syntax 2023-07-15 14:50:15 +02:00
Simon Vieille 5f307cd046 Merge pull request 'release v3.10.0' (#268) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/268
2023-07-13 22:30:27 +02:00
Simon Vieille 8cd54eea19 release v3.10.0 2023-07-13 22:26:34 +02:00
Simon Vieille 072707772d update changelog 2023-07-11 17:48:45 +02:00
Simon Vieille 0b3d2d9781 Merge pull request 'Remove deprecated method' (#267) from vitormattos/side_menu:feature/remove-deprecated-method into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/267
2023-07-11 17:46:38 +02:00
Vitor Mattos 04af12691c Remove deprecated method
Fix the follow error:

```
Message: Call to undefined method OC_App::getNavigation() in file '/var/www/html/apps-extra/side_menu/lib/Service/AppRepository.php' line 54
```

Reference: https://github.com/nextcloud/server/commit/167763d3125779fc642f7b169389dea029bb73ed

Signed-off-by: Vitor Mattos <vitor@php.rio>
2023-07-10 15:15:41 -03:00
Simon Vieille d2421f90bf Merge pull request 'release v3.9.1' (#266) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/266
2023-06-29 13:04:13 +02:00
Simon Vieille 0ea5a579a6 release v3.9.1 2023-06-29 12:54:49 +02:00
Simon Vieille b9c3543c61 Merge pull request 'fix top position of always opened menu' (#264) from fix/issue262 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/264
2023-06-29 12:53:02 +02:00
Simon Vieille 49979c858b fix top position of always opened menu
fix dashboard menu when using always opened menu
2023-06-23 15:37:03 +02:00
Simon Vieille b16da36507 Merge pull request 'release v3.9.0' (#263) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/263
2023-06-23 12:33:54 +02:00
Simon Vieille def1ec4aa7 release v3.8.0 2023-06-23 12:28:02 +02:00
Simon Vieille 40441a61ae update changelog 2023-06-23 12:27:34 +02:00
Simon Vieille ea3820904c Merge pull request 'fix app redirect' (#261) from fix/issue257 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/261
2023-06-17 15:21:54 +02:00
Simon Vieille dad7d8a964 Merge pull request 'add compatibility with nextcloud 27' (#260) from feature/issue256 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/260
2023-06-17 15:17:24 +02:00
Simon Vieille 32f1869828 add compatibility with nextcloud 27 2023-06-17 13:04:25 +02:00
Simon Vieille dd9fbcb654 fix default menu redirect (#257) 2023-06-17 12:59:45 +02:00
Simon Vieille a96e6e3c70 fix default menu redirect (#257) 2023-06-17 12:53:10 +02:00
Simon Vieille 29f0ead9cc Merge pull request 'release v3.8.0' (#255) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/255
2023-05-25 13:49:08 +02:00
Simon Vieille a5effe1fd3 release v3.8.0 2023-05-25 13:39:45 +02:00
Simon Vieille 13b6ae23c2 ci: remove check-code-quality 2023-05-25 13:39:21 +02:00
Simon Vieille 79ddb5fa47 Merge pull request 'add option to show hovered label only on top menu' (#254) from feature/issue253 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/254
2023-05-23 20:13:11 +02:00
Simon Vieille 1454dbba4d update changelog 2023-05-23 19:56:35 +02:00
Simon Vieille ee8ca7134c refactoring choices 2023-05-23 14:17:45 +02:00
Simon Vieille 93fef37033 add option to show hovered label only on top menu 2023-05-23 14:09:55 +02:00
Simon Vieille e1567b0689 Merge pull request 'v3.7.4' (#249) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/249
2023-04-16 18:05:46 +02:00
Simon Vieille 135f27cc32 release v3.7.4 2023-04-16 18:05:25 +02:00
Simon Vieille c5e1a8d37b Merge pull request 'fix Integrity failed' (#248) from fix/issue247 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/248
2023-04-16 18:03:04 +02:00
Simon Vieille 27f8888a90 update signature generation 2023-04-16 14:24:17 +02:00
Simon Vieille 6583883e2d update signature generation 2023-04-16 14:17:09 +02:00
Simon Vieille 0a556670b1 update signature generation 2023-04-16 14:16:18 +02:00
Simon Vieille aa139bc671 Merge pull request 'release v3.7.3' (#246) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/246
2023-04-14 21:13:10 +02:00
Simon Vieille b9264d7e05 release v3.7.3 2023-04-14 21:12:35 +02:00
Simon Vieille 88c14b6aec Merge pull request 'use app href for redirection' (#245) from fix/issue244 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/245
2023-04-14 21:11:29 +02:00
Simon Vieille 2be53211b8 Merge pull request 'add signature generation' (#243) from feature/issue240 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/243
2023-04-14 21:00:37 +02:00
Simon Vieille dca727c120 use app href for redirection (fix #244) 2023-04-14 20:58:56 +02:00
Simon Vieille 361badff6b update changelog 2023-03-31 17:06:30 +02:00
Simon Vieille 917288eb54 add signature generation
rename steps
2023-03-31 14:07:19 +02:00
Simon Vieille b133ba3a97 Merge pull request 'release of v3.7.2' (#238) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/238
2023-03-27 18:47:15 +02:00
Simon Vieille 2ff4fee927 Merge pull request 'changelog' (#237) from changelog into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/237
2023-03-27 18:36:34 +02:00
Simon Vieille b65c0c650a update app version 2023-03-27 18:35:59 +02:00
Simon Vieille 22335700ce Merge pull request 'update pipeline conditions allowing fix/*' (#234) from feature/ci into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/234
2023-03-27 18:35:12 +02:00
Simon Vieille 7ab2816bd9 update changelog 2023-03-27 18:34:50 +02:00
Simon Vieille 396d3cfbc5 Merge pull request 'load configuration and then retrieve apps in default side menu display' (#235) from feature/issue233 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/235
2023-03-27 18:34:21 +02:00
Simon Vieille 66e4d2989a update pipeline conditions allowing fix/* 2023-03-23 22:22:36 +01:00
Simon Vieille 9ccd11b6dc load configuration and then retrieve apps in default side menu display
fix #233
2023-03-23 22:17:05 +01:00
Simon Vieille aaf2bb55db Merge pull request 'release v3.7.1' (#232) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/232
2023-03-19 10:00:00 +01:00
Simon Vieille a7ec95da7c Merge pull request 'Fix build process' (#231) from fix/issue230 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/231
2023-03-19 09:58:11 +01:00
Simon Vieille 42043c5390 update changelog 2023-03-19 09:52:37 +01:00
Simon Vieille 019f79d45f update ci conf 2023-03-19 09:45:51 +01:00
Simon Vieille 3a80215657 update ci conf 2023-03-19 09:35:59 +01:00
Simon Vieille 7d0b55243e add debug version 2023-03-19 09:34:52 +01:00
Simon Vieille 097ccc9dc9 update ci conf 2023-03-19 09:34:23 +01:00
Simon Vieille 7227f59dab add tag on event restriction for build steps 2023-03-17 17:25:22 +01:00
Simon Vieille 3a51e6ecd5 add debug version 2023-03-17 17:22:59 +01:00
Simon Vieille 112e669723 reduce release task as packaging (ci)
move translation build in specific step (ci)
2023-03-17 17:22:35 +01:00
Simon Vieille fc5a6a4c64 fix typo in ci configuration 2023-03-17 17:13:31 +01:00
Simon Vieille 02afac5267 add debug version 2023-03-17 17:11:16 +01:00
Simon Vieille 1eb392834c use specifics images in ci 2023-03-17 17:10:56 +01:00
Codeberg Translate 08b78a2c64 Merge branch 'origin/translations' into Weblate. 2023-03-16 06:11:25 +00:00
deblan 8f86cbe188 Added translation using Weblate (Portuguese (Brazil)) 2023-03-16 06:11:24 +00:00
Simon Vieille 749f25a231 Merge pull request 'add badge of downloads' (#228) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/228
2023-03-11 00:30:39 +01:00
Simon Vieille 5df389dd42 add badge of downloads 2023-03-11 00:29:32 +01:00
Simon Vieille 04026f5c75 Merge pull request 'release v3.7.0' (#227) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/227
2023-03-09 16:57:33 +01:00
Simon Vieille dbd0de7679 release v3.7.0 2023-03-09 16:46:03 +01:00
Simon Vieille 07a1d356de Merge pull request 'set the app compatible with nextcloud 26' (#225) from feature/nc26 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/225
2023-03-09 15:55:35 +01:00
Simon Vieille d3359337f9 Merge pull request 'translations' (#226) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/226
2023-03-09 15:54:50 +01:00
Simon Vieille 4b9378f923 set the app compatible with nextcloud 26 2023-03-09 14:05:30 +01:00
AHOHNMYC 117e33692b Translated using Weblate (Russian)
Currently translated at 84.7% (78 of 92 strings)

Translation: Custom menu/Application
Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/
2023-03-06 19:08:20 +00:00
Simon Vieille 48b2b30406 Merge pull request 'update issue template' (#223) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/223
2023-02-20 14:06:23 +01:00
Simon Vieille 18e8f42dc3 update issue template 2023-02-20 13:50:53 +01:00
Simon Vieille 22e5445330 Merge pull request 'release v3.6.0' (#221) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/221
2023-02-17 11:53:27 +01:00
Simon Vieille 01669f83c2 release v3.6.0 2023-02-17 11:46:31 +01:00
Simon Vieille f1c33cc626 release v3.6.0 2023-02-17 11:45:57 +01:00
Simon Vieille 87ff20aa19 Merge pull request 'add hidden apps compatible with default menu' (#220) from feature/issue219 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/220
2023-02-17 11:44:41 +01:00
Simon Vieille ce969b4061 Merge branch 'develop' into translations 2023-02-17 10:54:42 +01:00
Simon Vieille ed4ed62fb6 update admin (hidden apps compatible with defaul) 2023-02-17 10:51:39 +01:00
Simon Vieille 5a586c40a1 add hidden apps compatible with default menu (fix #219) 2023-02-17 10:51:11 +01:00
Simon Vieille 0544fd3765 Merge pull request 'doc' (#218) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/218
2023-02-12 16:56:39 +01:00
Simon Vieille b141d7ba7c update readme 2023-02-12 16:56:22 +01:00
Simon Vieille 2635dd89ca Merge pull request 'Doc' (#217) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/217
2023-02-12 00:34:56 +01:00
Simon Vieille 0ee10e08e9 update readme 2023-02-12 00:31:47 +01:00
Simon Vieille 1093042a17 update readme 2023-02-12 00:29:18 +01:00
Simon Vieille 9566d32a89 update readme 2023-02-12 00:28:51 +01:00
Simon Vieille aa203bb406 Merge pull request 'release v3.5.2' (#213) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/213
2023-01-21 22:31:21 +01:00
Simon Vieille 3861d78975 Merge pull request 'login error (#210)' (#212) from feature/login_error into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/212
2023-01-21 22:26:04 +01:00
Simon Vieille 571706986e release v3.5.2 2023-01-21 22:18:45 +01:00
Simon Vieille ed31ed3623 add check if menu exists before adding event listeners 2023-01-21 22:12:17 +01:00
Simon Vieille 368c59a2bd Merge pull request 'next release' (#200) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/200
2023-01-07 10:40:14 +01:00
Simon Vieille 59af6a9068 release v3.5.1 2023-01-07 10:23:19 +01:00
Simon Vieille 1965aedc43 release v3.5.1 2023-01-07 10:22:56 +01:00
Simon Vieille ab46bd7341 docs(changelog): add v3.5.1 2023-01-07 10:21:46 +01:00
Simon Vieille 3aace8cbdd Merge pull request 'translations' (#209) from translations into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/209
2023-01-07 10:19:00 +01:00
Codeberg Translate 6425546cd1 Merge branch 'origin/translations' into Weblate. 2023-01-01 23:31:48 +00:00
gallegonovato 3664b8979d 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/
2023-01-01 23:31:47 +00:00
p-bo 83732994bb 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/
2023-01-01 23:31:47 +00:00
Simon Vieille c65d09e268 Merge pull request 'ci: add osv detector' (#208) from feature/osv into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/208
2023-01-01 14:59:05 +01:00
Simon Vieille 2da2e10017 ci: add osv detector 2023-01-01 14:52:30 +01:00
Simon Vieille 8da90bbc06 Merge branch 'gitea' into develop 2022-12-29 22:53:50 +01:00
Simon Vieille ab7b1e96fe Merge pull request 'add gitea ISSUE/FEATURE templates' (#202) from gitea into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/202
2022-12-29 22:45:50 +01:00
Simon Vieille d4adda19b3 add gitea ISSUE/FEATURE templates 2022-12-29 22:45:36 +01:00
Simon Vieille f4322a8d71 Merge pull request 'add gitea ISSUE/FEATURE templates' (#201) from gitea into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/201
2022-12-29 22:45:03 +01:00
Simon Vieille ae3db9cf7f add gitea ISSUE/FEATURE templates 2022-12-29 22:42:03 +01:00
Simon Vieille 05ff6d483b add gitea ISSUE/FEATURE templates 2022-12-29 22:41:06 +01:00
Simon Vieille dfc61140ec add gitea ISSUE/FEATURE templates 2022-12-29 22:30:33 +01:00
Simon Vieille 4918049270 update changelog 2022-12-28 11:14:09 +01:00
Simon Vieille 4001f162b6 Merge pull request 'Fix custom menu sorting is not applied on Mobile Screens' (#199) from feature/issue189 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/199
2022-12-27 23:20:21 +01:00
Simon Vieille 7a43ca2c75 add sort on in appList and fix appLabel function 2022-12-27 07:02:07 +01:00
33 changed files with 795 additions and 208 deletions
-16
View File
@@ -1,16 +0,0 @@
---
name: "New feature"
about: "Use this template if you want to request a feature"
title: "[FEATURE] "
labels:
- enhancement
---
## Feature
### Description
...
### Benefits
...
@@ -0,0 +1,34 @@
name: New feature
about: Use this template if you want to request a feature
title: "[FEATURE] "
labels:
- enhancement
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request!
- type: textarea
id: description
attributes:
label: Description
description: Describe the feature.
validations:
required: true
- type: textarea
id: benefits
attributes:
label: Benefits
description: Describe the benefits of this feature.
validations:
required: true
- type: textarea
id: extra
attributes:
label: More informations
description: If you want to share more things, this is here!
validations:
required: false
-32
View File
@@ -1,32 +0,0 @@
---
name: "New issue"
about: "Use this template if you have a bug"
title: "[BUG] "
labels:
- bug
---
## Issue
### Environment
* Custom menu version:
* Nextcloud version:
* PHP version:
* Web server (Nginx, Apache2):
* Web browser and version (Firefox 80, Google Chrome 74, etc):
```
Insert your configuration here. You can export the configuration using the admin page.
```
### Steps to reproduce
...
### Observed Results
...
### Expected Results
...
+69
View File
@@ -0,0 +1,69 @@
name: New issue
about: Use this template if you have a bug
title: "[Bug] "
labels:
- bug
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- 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: configuration
attributes:
label: Configuration
description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/tips/#export-the-configuration)).
value: |
```
{
...
}
```
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to reproduce
description: How reproduce the bug?
validations:
required: false
- type: textarea
id: resuts
attributes:
label: Observed Results
description: What happened?
validations:
required: false
- type: textarea
id: expected
attributes:
label: Expected Results
description: What should happen?
validations:
required: false
- type: textarea
id: extra
attributes:
label: More informations
description: If you want to share more things, this is here!
validations:
required: false
+62 -33
View File
@@ -1,49 +1,78 @@
pipeline:
steps:
dependencies:
image: gitnet.fr/deblan/devenv
image: node:16
pull: true
commands:
- make dep
- npm i
when:
event: [tag, push, pull_request]
branch: [master, develop, feature/*, translations]
event: [tag, push, pull_request, manual]
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
build:
image: gitnet.fr/deblan/devenv
osv-detector:
image: gitnet.fr/deblan/osv-detector:v0.10
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
- osv-detector package-lock.json
failure: ignore
when:
event: [pull_request]
dependency_check:
image: node:16-slim
build-js:
image: node:16
commands:
- npm audit
failure: ignore
- npm run build
when:
event: [pull_request]
event: [tag, push, pull_request, manual]
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
package:
image: gitnet.fr/deblan/devenv
build-translations:
image: deblan/php:8.0
commands:
- php bin/generate_l10n.php
when:
event: [tag, push, pull_request, manual]
branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
create-signature:
image: nextcloud:25
secrets: [app_certificate, app_public_certificate]
environment:
SQLITE_DATABASE: /var/www/data/data.db
NEXTCLOUD_ADMIN_USER: admin
NEXTCLOUD_ADMIN_PASSWORD: admin
commands:
- echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
- echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
- mkdir /tmp/app
- cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
- /usr/src/nextcloud/occ integrity:sign-app
--privateKey=/tmp/side_menu.key
--certificate=/tmp/side_menu.crt
--path=/tmp/app
- mv /tmp/app/appinfo/signature.json appinfo/
when:
event: [tag]
# check-code-quality:
# image: sonarsource/sonar-scanner-cli
# secrets: [sonar_token, sonar_host, sonar_project]
# commands:
# - sonar-scanner
# -Dsonar.projectKey=$SONAR_PROJECT
# -Dsonar.sources=.
# -Dsonar.host.url=$SONAR_HOST
# -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
# -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
# -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
# failure: ignore
# when:
# event: [pull_request]
create-package:
image: deblan/php:8.0
volumes:
- /var/www/html/artifacts:/var/www/html/artifacts
secrets: [app_certificate]
commands:
- apt-get update
- apt-get install -y zip make
- mkdir -p "$HOME/.nextcloud/certificates"
- echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
- export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
@@ -52,7 +81,7 @@ pipeline:
when:
event: [tag]
release:
push-release:
image: plugins/gitea-release
volumes:
- /var/www/html/artifacts:/var/www/html/artifacts
+92
View File
@@ -1,5 +1,97 @@
## [Unreleased]
## 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)
## 3.5.2
### Fixed
* add check if menu exists before adding event listeners (#210)
## 3.5.1
### Added
* add translations (thanks to p-bo adn gallegonovato)
### Fixed
* fix #189: sorting not applied on mobile
## 3.5.0
### Added
* add dependency check (ci)
+1 -1
View File
@@ -9,7 +9,7 @@ dep:
npm link @nextcloud/vue || sudo npm link @nextcloud/vue
.ONESHELL:
release: build translations
release:
if [ -z "$$VERSION" ]; then
echo "VERSION required"
exit 1
+3
View File
@@ -3,6 +3,7 @@
[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
[![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/)
![Downloads](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=downloads&query=%24.K_downloads&suffix=K&url=https%3A%2F%2Fapi-side-menu.deblan.org%2Fdownloads.php)
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.
@@ -18,6 +19,8 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark).
You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
## [📘 Read the documentation](https://deblan.gitnet.page/side_menu_doc/)
Requirements
------------
+3 -3
View File
@@ -32,12 +32,12 @@ 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.5.0</version>
<version>3.11.3</version>
<licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
<namespace>SideMenu</namespace>
<documentation>
<admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
<admin>https://deblan.gitnet.page/side_menu_doc/</admin>
<developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
</documentation>
<category>customization</category>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
<screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
<dependencies>
<nextcloud min-version="25" max-version="25"/>
<nextcloud min-version="25" max-version="28"/>
<php min-version="7.4"/>
</dependencies>
<settings>
+38 -6
View File
@@ -47,7 +47,7 @@
margin-top: 2px;
float: right;
line-height: 34px;
height: 28px;
height: 42px;
display: none;
}
@@ -155,7 +155,7 @@
}
#side-menu.hide-opener .side-menu-logo {
margin-top: 20px;
margin-top: 10px;
}
#side-menu-loader {
@@ -201,7 +201,6 @@
max-height: calc(100vh - 55px);
overflow: auto;
position: relative;
top: 5px;
display: flex;
flex-wrap: wrap;
justify-content: center;
@@ -223,7 +222,7 @@
}
.side-menu-loader svg {
width: 38px;
width: 45px;
margin: auto;
stroke: var(--side-menu-text-color, #fff);
}
@@ -239,14 +238,23 @@
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 {
@@ -280,7 +288,7 @@
}
.side-menu-always-displayed .app-navigation--close {
transform: translateX(calc(-100% + 50px)) !important;
transform: translateX(calc(-100% + 50px));
}
#side-menu.side-menu-with-categories {
@@ -291,6 +299,7 @@
.side-menu-with-categories .side-menu-categories {
display: block;
padding: 0;
width: 100%;
}
.side-menu-with-categories .side-menu-category {
@@ -309,12 +318,35 @@
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;
+17 -13
View File
@@ -74,33 +74,37 @@ 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['id']);
return $this->redirectToApp($app, true);
}
return $this->redirectToApp('files');
}
protected function redirectToApp($appId): RedirectResponse
protected function redirectToApp($app, bool $isHref = false): RedirectResponse
{
$isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
'htaccess.IgnoreFrontController',
false
);
if (!$isHref) {
$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/';
if ($isIgnoreFrontController || $isFrontControllerActive) {
$path = '/apps/%s/';
} else {
$path = '/index.php/apps/%s/';
}
$url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $app));
} else {
$path = '/index.php/apps/%s/';
$url = $app['href'];
}
$url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId));
return new RedirectResponse($url);
}
}
+1 -1
View File
@@ -171,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->getAppValueBool(
'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt(
'top-menu-mouse-over-hidden-label',
'0'
),
+9 -1
View File
@@ -3,6 +3,7 @@
namespace OCA\SideMenu\Service;
use OC\User\User;
use OCP\INavigationManager;
use OCP\L10N\IFactory;
/**
@@ -32,8 +33,14 @@ class AppRepository
*/
protected $categoryRepository;
/**
* @var INavigationManager
*/
protected $navigationManager;
public function __construct(
\OC_App $ocApp,
INavigationManager $navigationManager,
IFactory $l10nFactory,
ConfigProxy $config,
CategoryRepository $categoryRepository
@@ -41,6 +48,7 @@ class AppRepository
$this->ocApp = $ocApp;
$this->l10nFactory = $l10nFactory;
$this->config = $config;
$this->navigationManager = $navigationManager;
$this->categoryRepository = $categoryRepository;
}
@@ -51,7 +59,7 @@ class AppRepository
*/
public function getVisibleApps()
{
$navigation = $this->ocApp->getNavigation();
$navigation = $this->navigationManager->getAll();
$appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
$categories = $this->categoryRepository->getOrderedCategories();
$apps = $this->ocApp->listAllApps();
+4 -4
View File
@@ -25,12 +25,12 @@
"@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/axios": "^2.3.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^8.1.2",
"@nextcloud/initial-state": "^2.0.0",
"@nextcloud/l10n": "^1.6.0",
"@nextcloud/vue": "^7.0.0",
"@nextcloud/l10n": "^2.1.0",
"@nextcloud/vue": "^7.12.1",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"css-loader": "^3.4.2",
+34 -11
View File
@@ -24,14 +24,14 @@
<nav class="app-menu show">
<ul
class="app-menu-main"
:class="{ 'app-menu-main__hidden-label': hiddenLabels }"
:class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
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, 'app-menu-entry__hidden-label': hiddenLabels }"
:class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
:style="makeStyle(app)"
>
<a :href="app.href"
@@ -53,6 +53,7 @@
:aria-label="appLabel(app)"
:aria-current="app.active ? 'page' : false"
:href="app.href"
:style="makeStyle(app)"
class="app-menu-popover-entry">
<template #icon>
<div class="app-icon" :class="{ 'has-unread': app.unread > 0 }">
@@ -68,7 +69,8 @@
<script>
import { loadState } from '@nextcloud/initial-state'
import { NcActions, NcActionLink } from '@nextcloud/vue'
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
export default {
name: 'AppMenu',
@@ -110,13 +112,19 @@ export default {
this.observer.disconnect()
},
methods: {
appLabel() {
return (app) => app.name
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() {
return Object.values(this.apps)
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)
@@ -226,8 +234,8 @@ $header-icon-size: 20px;
overflow: hidden;
}
&:not(.app-menu-entry__hidden-label):hover,
&:not(.app-menu-entry__hidden-label):focus-within {
&: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 {
opacity: 1;
.app-menu-entry--label {
opacity: 1;
@@ -238,7 +246,6 @@ $header-icon-size: 20px;
overflow: visible;
}
}
}
// Show labels
@@ -249,8 +256,8 @@ $header-icon-size: 20px;
opacity: 1;
}
&:not(.app-menu-main__hidden-label):hover,
&:not(.app-menu-main__hidden-label):focus-within,
&: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,
.app-menu-entry:not(.app-menu-entry__hidden-label):hover,
.app-menu-entry:not(.app-menu-entry__hidden-label):focus {
img {
@@ -266,6 +273,22 @@ $header-icon-size: 20px;
opacity: 0;
}
}
&.app-menu-main__show-hovered .app-menu-entry:hover,
&.app-menu-main__show-hovered .app-menu-entry:focus {
img {
margin-top: -6px;
}
.app-menu-entry--label {
opacity: 1;
bottom: 0;
}
&::before, .app-menu-entry::before {
opacity: 0;
}
}
}
::v-deep .app-menu-more .button-vue--vue-tertiary {
+32
View File
@@ -0,0 +1,32 @@
<!--
@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>
+2
View File
@@ -17,7 +17,9 @@ 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">
+55 -22
View File
@@ -16,21 +16,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<template>
<div id="side-menu">
<div class="side-menu-header">
<div class="side-menu-header" v-if="settings || !openerHover || (!avatar && !alwaysDisplayed && logo) || avatar">
<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 />
<Logo
v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
v-if="!avatar && !alwaysDisplayed && 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"
@@ -38,9 +36,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/>
</div>
<ul class="side-menu-apps-list">
<ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
<SideMenuApp
v-for="(app, key) in apps"
v-if="!hiddenApps.includes(app.id) && searchMatch(app.name)"
v-bind:classes="{'side-menu-app': true, 'active': app.active}"
v-bind:key="key"
v-bind:icon="app.icon"
@@ -57,6 +56,7 @@ 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,6 +67,7 @@ export default {
OpenerButton,
SideMenuApp,
Logo,
AppSearch,
},
data() {
return {
@@ -76,7 +77,11 @@ export default {
avatar: null,
forceLightIcon: false,
targetBlankApps: [],
hiddenApps: [],
settings: null,
openerHover: false,
alwaysDisplayed: false,
search: '',
}
},
methods: {
@@ -91,7 +96,11 @@ export default {
for (let id in ncApps) {
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
continue;
continue
}
if (this.hiddenApps.includes(id)) {
continue
}
let app = ncApps[id]
@@ -102,10 +111,10 @@ export default {
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
@@ -116,23 +125,47 @@ export default {
},
retrieveConfig() {
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']
})
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()
this.retrieveApps()
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()
})
}
}
</script>
+28 -3
View File
@@ -18,14 +18,13 @@ 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>
@@ -33,12 +32,13 @@ 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-bind:key="key">
<div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" 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,6 +59,7 @@ 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'
@@ -70,6 +71,7 @@ export default {
CloserButton,
Loader,
SideMenuBigApp,
AppSearch,
},
data() {
return {
@@ -78,6 +80,7 @@ export default {
targetBlank: false,
targetBlankApps: [],
settings: null,
search: '',
}
},
methods: {
@@ -120,6 +123,28 @@ 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()
+28 -2
View File
@@ -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,12 +31,13 @@ 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-bind:key="key">
<div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" 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"
@@ -56,6 +57,7 @@ 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'
@@ -66,6 +68,7 @@ export default {
OpenerButton,
Loader,
SideMenuBigApp,
AppSearch,
},
data() {
return {
@@ -74,6 +77,7 @@ export default {
targetBlank: false,
targetBlankApps: [],
settings: null,
search: '',
}
},
methods: {
@@ -116,6 +120,28 @@ 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()
+3 -1
View File
@@ -90,4 +90,6 @@
"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"
"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"
+19 -17
View File
@@ -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": "Anwendungen, die nicht ins Seitenmenü verschoben werden sollen"
"Apps that not must be moved in the side menu": "Apps, 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 App 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 Anwendung"
"Background color of current app": "Hintergrundfarbe der aktuellen App"
"Text color": "Textfarbe"
"Loader": "Ladestandanzeige"
"Loader": "Fortschrittsbalken"
"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 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 App 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": "Ladestandanzeige aktiviert"
"Loader enabled": "Fortschrittsbalken anzeigen"
"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 Anwendungen in einem neuen Tab"
"Open apps in new tab": "Öffne Apps 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 Anwendungsliste"
"Show and hide the list of applications": "Ein- und Ausblenden der Appliste"
"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 App 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"
"Apps that should not be displayed in the menu": "Apps, 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,18 +76,20 @@
"Dark mode colors": "Farben für den dunklen Modus"
"With categories": "Mit Kategorien"
"Custom categories": "Benutzerdefinierte Kategorien"
"Customize application categories": "Anwendungskategorien anpassen"
"Customize application categories": "App-Kategorien anpassen"
"Reset to default": "Auf Standard zurücksetzen"
"Hidden icon": "Verstecktes Symbol"
"Small icon": "Kleines Symbol"
"Normal icon": "Normales Symbol"
"Big icon": "Große Ikone"
"Big icon": "Großes Icon"
"Hidden text": "Versteckter Text"
"Small text": "Kleiner Text"
"Normal text": "Normaler Text"
"Big text": "Großer Text"
"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"
"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"
+3 -1
View File
@@ -90,4 +90,6 @@
"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"
"Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
"Except the hovered app": "Except the hovered app"
"Search": "Search"
+2
View File
@@ -91,3 +91,5 @@
"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"
+2
View File
@@ -91,3 +91,5 @@
"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"
+93
View File
@@ -0,0 +1,93 @@
"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"
+23 -21
View File
@@ -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 the global setting"
"Use my selection": "Use my selection"
"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.": "У вас нет разрешения изменять настройки"
"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,14 +80,16 @@
"Name": "Название"
"Customed": "Customed"
"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."
"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Эти настройки используются темами Тёмная и Тёмная Breeze."
"Dark mode colors": "Цвета тёмной темы"
"With categories": "С категориями"
"Custom categories": "Custom categories"
"Customize application categories": "Customize application categories"
"Reset to default": "Сбросить к значениям по-умолчанию"
"Custom 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": "Hide labels on mouse over"
"Hide labels on mouse over": "Скрыть название при наведении мыши"
"Except the hovered app": "Except the hovered app"
"Search": "Search"
+93
View File
@@ -0,0 +1,93 @@
"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"
+2
View File
@@ -93,3 +93,5 @@
"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": ""
"Except the hovered app": ""
"Search": ""
+2
View File
@@ -91,3 +91,5 @@
"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"
+7 -1
View File
@@ -42,10 +42,16 @@
top: 49px;
}
#side-menu.hide-opener .side-menu-header {
#side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer
{
visibility: hidden;
}
#side-menu.hide-opener.side-menu-with-categories .side-menu-search
{
float: none;
}
<?php if ($_['size-text'] === 'hidden'): ?>
#side-menu, .side-menu-apps-list {
<?php if ($_['size-icon'] === 'big'): ?>
+11 -5
View File
@@ -73,6 +73,10 @@ if ($_['always-displayed']) {
const headerMenuOpener = document.querySelector('#header .side-menu-opener')
const sideMenuOpener = document.querySelectorAll('#side-menu .side-menu-opener')
if (!headerMenuOpener) {
return
}
sideMenuFocus = () => {
let a = document.querySelector('.side-menu-app.active a', sideMenu)
@@ -174,9 +178,11 @@ if ($_['always-displayed']) {
PageLoader()
<?php endif; ?>
<?php if ($_['opener-position'] === 'before'): ?>
nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
<?php else: ?>
nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
<?php endif; ?>
if (nextcloud) {
<?php if ($_['opener-position'] === 'before'): ?>
nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
<?php else: ?>
nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
<?php endif; ?>
}
})();
+23 -14
View File
@@ -41,6 +41,7 @@ $choicesSizes = [
$labelShowHideApps = 'Show and hide the list of applications';
$labelReset = 'Reset to default';
$labelDefault = 'Default';
$labelWithCategories = 'With categories';
$labelBigMenu = 'Big menu';
$labelAlwaysDisplayed = 'Always displayed';
@@ -64,7 +65,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<div>
<label>
<?php p($l->t('Default')); ?>
<?php p($l->t($labelDefault)); ?>
</label>
</div>
<p>
@@ -73,7 +74,7 @@ $labelAlwaysDisplayed = 'Always displayed';
data-alwaysdiplayed="0"
data-bigmenu="0"
data-sidewithcategories="0"
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>">
src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t($labelDefault)); ?>">
</p>
<div>
@@ -150,7 +151,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>
@@ -312,7 +313,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<div class="side-menu-setting-table">
<?php
$choices = [
'Default' => 'side-menu-opener',
$labelDefault => 'side-menu-opener',
'Default (dark)' => 'side-menu-opener-dark',
'Hamburger' => 'side-menu-opener-hamburger',
'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -341,7 +342,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>
@@ -505,7 +506,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<div class="side-menu-setting-table">
<?php
$choices = [
'Default' => 'side-menu-opener',
$labelDefault => 'side-menu-opener',
'Default (dark)' => 'side-menu-opener-dark',
'Hamburger' => 'side-menu-opener-hamburger',
'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -536,7 +537,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>
@@ -621,7 +622,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('Display the logo')); ?>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
</div>
</div>
<div class="side-menu-setting-form">
@@ -640,7 +641,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('Use the avatar instead of the logo')); ?>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
</div>
</div>
<div class="side-menu-setting-form">
@@ -659,7 +660,7 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('The logo is a link to the default app')); ?>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
</div>
</div>
<div class="side-menu-setting-form">
@@ -678,8 +679,10 @@ $labelAlwaysDisplayed = 'Always displayed';
<?php p($l->t('Apps that should not be displayed in the menu')); ?>
<div class="badges">
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>
<div class="side-menu-setting-form">
@@ -801,7 +804,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>
@@ -875,9 +878,15 @@ $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 ($choicesYesNo as $label => $value): ?>
<?php foreach ($choices 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>
@@ -894,7 +903,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>
@@ -1056,7 +1065,7 @@ $labelAlwaysDisplayed = 'Always displayed';
</h2>
<div class="badges">
<span class="badge badge-1"><?php p($l->t('Default')); ?></span>
<span class="badge badge-1"><?php p($l->t($labelDefault)); ?></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>