From 4c0469f61a3c2fae23e50c6a5a2a91b63fac149a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 23 Mar 2023 07:51:19 +0100 Subject: [PATCH 1/5] Add tooltip to header avatar menu - Add 'showProfileNameTitle' to profile avatar. --- webapp/components/AvatarMenu/AvatarMenu.vue | 10 +++++++++- .../_new/generic/ProfileAvatar/ProfileAvatar.vue | 6 +++++- webapp/locales/de.json | 3 +++ webapp/locales/en.json | 3 +++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 5ec031e61..284e33509 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -11,7 +11,15 @@ " @click.prevent="toggleMenu" > - + diff --git a/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue b/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue index 46e3968fc..d681276b5 100644 --- a/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue +++ b/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue @@ -8,7 +8,7 @@ :src="profile.avatar | proxyApiUrl" class="image" :alt="profile.name" - :title="profile.name" + :title="showProfileNameTitle ? profile.name : ''" @error="$event.target.style.display = 'none'" /> @@ -29,6 +29,10 @@ export default { type: Object, default: null, }, + showProfileNameTitle: { + type: Boolean, + default: true, + }, }, computed: { isAnonymous() { diff --git a/webapp/locales/de.json b/webapp/locales/de.json index a4398df4c..e70a33a1e 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -510,6 +510,9 @@ }, "header": { "avatarMenu": { + "button": { + "tooltip": "Mein Profil" + }, "Groups": "Gruppen", "myProfile": "Mein Profil" } diff --git a/webapp/locales/en.json b/webapp/locales/en.json index b6afbfa96..79e9011fb 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -510,6 +510,9 @@ }, "header": { "avatarMenu": { + "button": { + "tooltip": "My profile" + }, "Groups": "Groups", "myProfile": "My profile" } From 1a1561ce14e0159a540a6d38d80377c268af73fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 23 Mar 2023 07:55:10 +0100 Subject: [PATCH 2/5] Fix locale identifier from 'avatarMenu.Groups' to 'avatarMenu.groups' --- webapp/components/AvatarMenu/AvatarMenu.vue | 2 +- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 284e33509..977996092 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -88,7 +88,7 @@ export default { icon: 'user', }, { - name: this.$t('header.avatarMenu.Groups'), + name: this.$t('header.avatarMenu.groups'), path: '/groups', icon: 'users', }, diff --git a/webapp/locales/de.json b/webapp/locales/de.json index e70a33a1e..7a22de72a 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -513,7 +513,7 @@ "button": { "tooltip": "Mein Profil" }, - "Groups": "Gruppen", + "groups": "Gruppen", "myProfile": "Mein Profil" } }, diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 79e9011fb..d928f1f57 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -513,7 +513,7 @@ "button": { "tooltip": "My profile" }, - "Groups": "Groups", + "groups": "Groups", "myProfile": "My profile" } }, From f542ab3052a84fc6723fd3daa691e728bfc239e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 23 Mar 2023 08:00:51 +0100 Subject: [PATCH 3/5] Change text of invite friends header menu button --- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 7a22de72a..ed6800d98 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -523,7 +523,7 @@ }, "invite-codes": { "button": { - "tooltip": "Lade deine Freunde ein" + "tooltip": "Freunde einladen" }, "copy-code": "Einladungslink kopieren", "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index d928f1f57..08397ec1a 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -523,7 +523,7 @@ }, "invite-codes": { "button": { - "tooltip": "Invite your friends" + "tooltip": "Invite friends" }, "copy-code": "Copy Invite Link", "copy-success": "Invite code copied to clipboard", From 28505a5b181008ebcde6fa58b7a4a8459a492018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 23 Mar 2023 08:11:30 +0100 Subject: [PATCH 4/5] Add tooltip to header notifications menu --- .../NotificationMenu/NotificationMenu.vue | 20 +++++++++++++++++-- webapp/locales/de.json | 3 +++ webapp/locales/en.json | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue index 0cc643516..a8609f582 100644 --- a/webapp/components/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/NotificationMenu/NotificationMenu.vue @@ -4,11 +4,27 @@ class="notifications-menu" :to="{ name: 'notifications' }" > - + diff --git a/webapp/locales/de.json b/webapp/locales/de.json index ed6800d98..cead1ab5e 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -651,6 +651,9 @@ "unread": "Ungelesen" }, "group": "Beschreibung", + "headerMenuButton": { + "tooltip": "Meine Benachrichtigungen" + }, "markAllAsRead": "Markiere alle als gelesen", "pageLink": "Alle Benachrichtigungen", "post": "Beitrag oder Gruppe", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 08397ec1a..4590f8955 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -651,6 +651,9 @@ "unread": "Unread" }, "group": "Description", + "headerMenuButton": { + "tooltip": "My notifications" + }, "markAllAsRead": "Mark all as read", "pageLink": "All notifications", "post": "Post or Group", From 26b90fce4704e537126fd15ad950ea04e14890ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 23 Mar 2023 08:21:46 +0100 Subject: [PATCH 5/5] Add tooltip to locale switch menu --- webapp/components/LocaleSwitch/LocaleSwitch.vue | 10 +++++++++- webapp/locales/de.json | 3 +++ webapp/locales/en.json | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue index 12a37e237..11ecb3c2f 100644 --- a/webapp/components/LocaleSwitch/LocaleSwitch.vue +++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue @@ -2,7 +2,15 @@