From c3c5db8a37555ec09613c6f5061947a55992557e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 28 Jan 2024 23:20:13 +0100 Subject: [PATCH 01/13] add translations --- src/l10n/fixtures/cs.yaml | 1 + src/l10n/fixtures/de.yaml | 1 + src/l10n/fixtures/es.yaml | 1 + src/l10n/fixtures/fr.yaml | 1 + src/l10n/fixtures/nl.yaml | 1 + src/l10n/fixtures/pt_BR.yaml | 1 + src/l10n/fixtures/ru.yaml | 1 + src/l10n/fixtures/sk.yaml | 1 + src/l10n/fixtures/zh_CN.yaml | 1 + 9 files changed, 9 insertions(+) diff --git a/src/l10n/fixtures/cs.yaml b/src/l10n/fixtures/cs.yaml index 9969a4b..4520cb4 100644 --- a/src/l10n/fixtures/cs.yaml +++ b/src/l10n/fixtures/cs.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši" "Except the hovered app": "Except the hovered app" "Search": "Search" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/de.yaml b/src/l10n/fixtures/de.yaml index 3710887..f3f4a91 100644 --- a/src/l10n/fixtures/de.yaml +++ b/src/l10n/fixtures/de.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Labels ausblenden, wenn sich die Maus darüber befindet (Hover)" "Except the hovered app": "Except the hovered app" "Search": "Search" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/es.yaml b/src/l10n/fixtures/es.yaml index 3df3d8c..7322650 100644 --- a/src/l10n/fixtures/es.yaml +++ b/src/l10n/fixtures/es.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón" "Except the hovered app": "Except the hovered app" "Search": "Search" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/fr.yaml b/src/l10n/fixtures/fr.yaml index 0cf835b..dc3cccb 100644 --- a/src/l10n/fixtures/fr.yaml +++ b/src/l10n/fixtures/fr.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Masquer le libellé des applications au passage de la souris" "Except the hovered app": "À l'exception de l'application survolée" "Search": "Rechercher" +"Toggle menu": "Basculer le menu" diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml index f39d188..3b71a0f 100644 --- a/src/l10n/fixtures/nl.yaml +++ b/src/l10n/fixtures/nl.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Hide labels on mouse over" "Except the hovered app": "Except the hovered app" "Search": "Search" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/pt_BR.yaml b/src/l10n/fixtures/pt_BR.yaml index 3089439..cbff738 100644 --- a/src/l10n/fixtures/pt_BR.yaml +++ b/src/l10n/fixtures/pt_BR.yaml @@ -91,3 +91,4 @@ "Applications kept in the top menu but also shown in side menu": "Aplicativos mantidos no menu superior, mas também mostrados no menu lateral" "These applications must be selected in the previous option.": "Estes aplicativos devem ser selecionados na opção anterior." "Hide labels on mouse over": "Ocultar descrição ao passar o mouse" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/ru.yaml b/src/l10n/fixtures/ru.yaml index bb17dad..737de85 100644 --- a/src/l10n/fixtures/ru.yaml +++ b/src/l10n/fixtures/ru.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Скрыть название при наведении мыши" "Except the hovered app": "Except the hovered app" "Search": "Search" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/sk.yaml b/src/l10n/fixtures/sk.yaml index 6f8012e..ed23b08 100644 --- a/src/l10n/fixtures/sk.yaml +++ b/src/l10n/fixtures/sk.yaml @@ -91,3 +91,4 @@ "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" "These applications must be selected in the previous option.": "These applications must be selected in the previous option." "Hide labels on mouse over": "Hide labels on mouse over" +"Toggle menu": "Toggle menu" diff --git a/src/l10n/fixtures/zh_CN.yaml b/src/l10n/fixtures/zh_CN.yaml index 8414cb6..2f544b6 100644 --- a/src/l10n/fixtures/zh_CN.yaml +++ b/src/l10n/fixtures/zh_CN.yaml @@ -93,3 +93,4 @@ "Hide labels on mouse over": "Hide labels on mouse over" "Except the hovered app": "Except the hovered app" "Search": "Search" +"Toggle menu": "Toggle menu" From d8aa018f5aaf634756c261befd1282641fea3ca1 Mon Sep 17 00:00:00 2001 From: deblan Date: Tue, 6 Feb 2024 20:04:43 +0000 Subject: [PATCH 02/13] Added translation using Weblate (Galician) --- src/l10n/fixtures/gl.yaml | 96 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 src/l10n/fixtures/gl.yaml diff --git a/src/l10n/fixtures/gl.yaml b/src/l10n/fixtures/gl.yaml new file mode 100644 index 0000000..dca9159 --- /dev/null +++ b/src/l10n/fixtures/gl.yaml @@ -0,0 +1,96 @@ +"Custom menu": "" +"Enable the custom menu": "" +"No": "" +"Yes": "" +"Menu": "" +? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +: '' +"Top menu": "" +"Apps that not must be moved in the side menu": "" +"If there is no selection then the global configuration is applied.": "" +"Experimental": "" +"Save": "" +"You like this app and you want to support me?": "" +"Buy me a coffee ☕": "" +"Hidden": "" +"Small": "" +"Normal": "" +"Big": "" +"Hidden icon": "" +"Small icon": "" +"Normal icon": "" +"Big icon": "" +"Hidden text": "" +"Small text": "" +"Normal text": "" +"Big text": "" +"Colors": "" +"Background color": "" +"Background color of current app": "" +"Text color": "" +"Loader": "" +"Icon": "" +"Same color": "" +"Opposite color": "" +"Transparent": "" +"Opaque": "" +"Opener": "" +"Default": "" +"Default (dark)": "" +"Hamburger": "" +"Hamburger (dark)": "" +"Hamburger 2": "" +"Hamburger 2 (dark)": "" +"Before the logo": "" +"After the logo": "" +"Position": "" +"Show only the opener (hidden logo)": "" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "" +"Panel": "" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" +"Display the big menu": "" +"Display the logo": "" +"Icons and texts": "" +"Loader enabled": "" +"Tips": "" +"Always displayed": "" +"This is the automatic behavior when the menu is always displayed.": "" +"Not compatible with touch screens.": "" +"Big menu": "" +"Live preview": "" +"Open apps in new tab": "" +"Use the global setting": "" +"Use my selection": "" +"Show and hide the list of applications": "" +"Use the avatar instead of the logo": "" +"You do not have permission to change the settings.": "" +"Force this configuration to users": "" +"Export the configuration": "" +"Purge the cache": "" +"Show the link to settings": "" +"The menu is enabled by default for users": "" +"Except when the configuration is forced.": "" +"Apps that should not be displayed in the menu": "" +"This feature is only compatible with the big menu display.": "" +"The logo is a link to the default app": "" +"Others": "" +"Categories": "" +"Customize sorting": "" +"Order by": "" +"Name": "" +"Customed": "" +"Show and hide the list of categories": "" +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" +"Dark mode colors": "" +"With categories": "" +"Custom categories": "" +"Customize application categories": "" +"Reset to default": "" +"Applications": "" +"Applications kept in the top menu": "" +"Applications kept in the top menu but also shown in side menu": "" +"These applications must be selected in the previous option.": "" +"Hide labels on mouse over": "" +"Except the hovered app": "" +"Search": "" +"Toggle menu": "" From 10b91991a9adab0630da0e7487398814bc23afa6 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 12 Feb 2024 23:29:58 +0100 Subject: [PATCH 03/13] update ci steps names --- .woodpecker.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a8fb90f..61563c0 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,5 +1,5 @@ steps: - check-tag: + "Verify tag and app version": image: alpine commands: - TAG=${CI_COMMIT_TAG/v//} @@ -7,7 +7,7 @@ steps: when: event: [tag] - dependencies: + "Install dependencies": image: node:16 pull: true commands: @@ -16,13 +16,13 @@ steps: event: [tag, push, pull_request, manual] branch: [master, develop, feature/*, fix/*, bugfix/*, translations] - osv-detector: + "Check dependencies": image: gitnet.fr/deblan/osv-detector:v0.10 commands: - osv-detector package-lock.json failure: ignore - build-js: + "Build JS": image: node:16 commands: - npm run build @@ -30,7 +30,7 @@ steps: event: [tag, push, pull_request, manual] branch: [master, develop, feature/*, fix/*, bugfix/*, translations] - build-translations: + "Build translations": image: deblan/php:8.0 commands: - php bin/generate_l10n.php @@ -38,7 +38,7 @@ steps: event: [tag, push, pull_request, manual] branch: [master, develop, feature/*, fix/*, bugfix/*, translations] - create-signature: + "Create signature": image: nextcloud:25 secrets: [app_certificate, app_public_certificate] environment: @@ -73,7 +73,7 @@ steps: # when: # event: [pull_request] - create-package: + "Create package": image: deblan/php:8.0 volumes: - /var/www/html/artifacts:/var/www/html/artifacts @@ -89,7 +89,7 @@ steps: when: event: [tag] - push-release: + "Push release": image: plugins/gitea-release volumes: - /var/www/html/artifacts:/var/www/html/artifacts From 774c314e7bc2f3d77251c62d10f75aa985e1541f Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 14 Feb 2024 11:16:25 +0100 Subject: [PATCH 04/13] add missing label on the 'save' button in personal settings (fix #318) --- templates/settings/personal-form.php | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/settings/personal-form.php b/templates/settings/personal-form.php index ed489bf..793feec 100644 --- a/templates/settings/personal-form.php +++ b/templates/settings/personal-form.php @@ -241,6 +241,7 @@ $labelReset = 'Reset to default';
From b8aa312a14f9feb7231ea9132b058a04159cc845 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 14 Feb 2024 11:26:54 +0100 Subject: [PATCH 05/13] fully apply Nextcloud AppMenu.vue updated (#326) --- src/AppMenu.vue | 52 ++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/AppMenu.vue b/src/AppMenu.vue index f90ebad..4e31f12 100644 --- a/src/AppMenu.vue +++ b/src/AppMenu.vue @@ -168,6 +168,7 @@ $header-icon-size: 20px; flex-shrink: 1; flex-wrap: wrap; } + .app-menu-main { display: flex; flex-wrap: nowrap; @@ -177,7 +178,6 @@ $header-icon-size: 20px; height: 50px; position: relative; display: flex; - opacity: .7; &.app-menu-entry__active { opacity: 1; @@ -217,6 +217,7 @@ $header-icon-size: 20px; width: $header-icon-size; height: $header-icon-size; padding: calc((100% - $header-icon-size) / 2); + box-sizing: content-box; filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright)); } @@ -226,8 +227,8 @@ $header-icon-size: 20px; font-size: 12px; color: var(--color-primary-text); text-align: center; - bottom: -5px; left: 50%; + top: 45%; display: block; min-width: 100%; transform: translateX(-50%); @@ -235,6 +236,7 @@ $header-icon-size: 20px; width: 100%; text-overflow: ellipsis; overflow: hidden; + letter-spacing: -0.5px; } &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover, @@ -242,11 +244,11 @@ $header-icon-size: 20px; opacity: 1; .app-menu-entry--label { opacity: 1; - font-weight: bold; - font-size: 14px; + font-weight: bolder; bottom: 0; - width: auto; - overflow: visible; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; } } } @@ -263,8 +265,10 @@ $header-icon-size: 20px; &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within, .app-menu-entry:not(.app-menu-entry__hidden-label):hover, .app-menu-entry:not(.app-menu-entry__hidden-label):focus { + opacity: 1; + img { - margin-top: -6px; + margin-top: -8px; } .app-menu-entry--label { @@ -280,7 +284,7 @@ $header-icon-size: 20px; &.app-menu-main__show-hovered .app-menu-entry:hover, &.app-menu-main__show-hovered .app-menu-entry:focus { img { - margin-top: -6px; + margin-top: -8px; } .app-menu-entry--label { @@ -295,38 +299,42 @@ $header-icon-size: 20px; } ::v-deep .app-menu-more .button-vue--vue-tertiary { - color: var(--color-primary-text); opacity: .7; margin: 3px; + filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright)); - &:hover { - opacity: 1; - background-color: transparent !important; + &:not([aria-expanded="true"]) { + color: var(--color-primary-element-text); + + &:hover { + opacity: 1; + background-color: transparent !important; + } } - &:focus-visible { - opacity: 1; - background-color: transparent !important; - border-radius: var(--border-radius); - outline: none; - box-shadow: 0 0 0 2px var(--color-primary-text); - } + &:focus-visible { + opacity: 1; + outline: none !important; + } } .app-menu-popover-entry { .app-icon { position: relative; height: 44px; + width: 48px; + display: flex; + align-items: center; + justify-content: center; + filter: var(--background-invert-if-bright, var(--primary-invert-if-bright)); &.has-unread::after { background-color: var(--color-main-text); } img { - filter: var(--background-invert-if-bright, var(--primary-invert-if-bright)); width: $header-icon-size; height: $header-icon-size; - padding: calc((50px - $header-icon-size) / 2); } } } @@ -335,7 +343,7 @@ $header-icon-size: 20px; content: ""; width: 8px; height: 8px; - background-color: var(--color-primary-text); + background-color: var(--color-primary-element-text); border-radius: 50%; position: absolute; display: block; From 951dd742d85e3dbee2763d977c2d7b17bfa81234 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 14 Feb 2024 12:12:08 +0100 Subject: [PATCH 06/13] add accessibility to open and close buttons (#311) refactor the way to focus apps when the menu is opened (#301) --- css/sideMenu.css | 6 ++++++ src/CloserButton.vue | 9 ++++++++- src/OpenerButton.vue | 6 ++++-- src/l10n/fixtures/tpl/base.yaml | 2 +- src/lib/createElement.js | 8 +++++++- templates/js/script.php | 36 +++++++++++---------------------- 6 files changed, 38 insertions(+), 29 deletions(-) diff --git a/css/sideMenu.css b/css/sideMenu.css index b66e53a..8a63202 100644 --- a/css/sideMenu.css +++ b/css/sideMenu.css @@ -83,6 +83,12 @@ padding-left: 12px !important; margin-left: 5px !important; margin-left: 3px !important; + overflow: hidden; +} + +.side-menu-opener span { + position: relative; + left: 50px; } .side-menu-opener:active, .side-menu-opener:focus { diff --git a/src/CloserButton.vue b/src/CloserButton.vue index 99779f8..80ed747 100644 --- a/src/CloserButton.vue +++ b/src/CloserButton.vue @@ -15,11 +15,18 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> diff --git a/src/OpenerButton.vue b/src/OpenerButton.vue index 58298ae..538291c 100644 --- a/src/OpenerButton.vue +++ b/src/OpenerButton.vue @@ -15,7 +15,9 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -->