+
{{ $t('exoplatform.kudos.visibility.title') }}
-
+
-
+
fas fa-redo
From deb334e080b4bdb86115282bf9f12bc8ef373552 Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Mon, 25 Sep 2023 17:47:20 +0100
Subject: [PATCH 12/17] fix: Add some enhancements to the the activity toolbar
icons - MEED-2581 - Meeds-io/MIP#54
This change will add some enhancements to the the toolbar activity icons.
---
.../locale/addon/Kudos_en.properties | 1 +
.../locale/addon/Kudos_fr.properties | 1 +
.../components/SendKudosToolbarAction.vue | 39 ++++++++++++-------
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/kudos-services/src/main/resources/locale/addon/Kudos_en.properties b/kudos-services/src/main/resources/locale/addon/Kudos_en.properties
index c4b45114f..1c253e450 100644
--- a/kudos-services/src/main/resources/locale/addon/Kudos_en.properties
+++ b/kudos-services/src/main/resources/locale/addon/Kudos_en.properties
@@ -6,6 +6,7 @@ NewKudosSentActivityComment.activity_kudos_content={3} Kudos to {1} {2}
NewKudosSentActivityComment.activity_kudos_title=Kudos to {0}
kudos.title=Kudos
+exoplatform.kudos.tooltip=Send kudos
exoplatform.kudos.title.sendAKudos=Send a Kudos
exoplatform.kudos.content.to=To:
exoplatform.kudos.visibility.title=Visible to any member of:
diff --git a/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties b/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties
index 8f7e84456..7c248c867 100644
--- a/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties
+++ b/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties
@@ -6,6 +6,7 @@ NewKudosSentActivityComment.activity_kudos_content={3} Kudos \u00E0 {1} {2}
NewKudosSentActivityComment.activity_kudos_title=Kudos \u00E0 {0}
kudos.title=Kudos
+exoplatform.kudos.tooltip=Envoyer un kudos
exoplatform.kudos.title.sendAKudos=Envoyer un kudos
exoplatform.kudos.content.to=\u00C0 :
exoplatform.kudos.visibility.title=Visible par tout membre du :
diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosToolbarAction.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosToolbarAction.vue
index 8b8eb38dd..6e4917c1f 100644
--- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosToolbarAction.vue
+++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosToolbarAction.vue
@@ -1,16 +1,37 @@
+
+
+
+
+ fa-award
+
+
+
+
+ {{ $t('exoplatform.kudos.tooltip') }}
+
+
fa-award
-
+
{{ $t('kudos.title') }}
@@ -22,14 +43,6 @@ export default {
spaceId: eXo.env.portal.spaceId,
};
},
- computed: {
- iconSize() {
- return this.spaceId ? '27' : '21';
- },
- kudosButtonStyle() {
- return this.spaceId && 'd-flex flex-row align-center py-2 px-3';
- }
- },
methods: {
openSendKudosDrawer() {
document.dispatchEvent(new CustomEvent('exo-kudos-open-send-modal', {detail: {
From b825e35fd16cde3ada18f0cc6209f070c52bbe29 Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Tue, 26 Sep 2023 12:37:31 +0100
Subject: [PATCH 13/17] fix: Clean the kudos drawer after sending one to a user
- MEED-2585 - Meeds-io/MIP#54 (#372)
This change will clean the kudos drawer after sending one to a user.
---
.../src/main/webapp/vue-app/kudos/components/KudosApp.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
index d5bf9f59d..09e2091c0 100644
--- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
+++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
@@ -575,6 +575,7 @@ export default {
this.selectedReceiver = null;
this.resetAudienceChoice();
this.removeAudience();
+ this.noReceiverIdentityId = false;
this.$refs.activityKudosDrawer.close();
this.displayAlert(this.$t('exoplatform.kudos.success.kudosSent'));
})
@@ -610,7 +611,7 @@ export default {
}}));
},
resetAudienceChoice() {
- this.audienceChoice = 'yourNetwork';
+ this.audienceChoice = null;
},
removeAudience() {
this.audience = '';
From f1e6891adaedd4117fd6cae88763300c6ca6e4b8 Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Tue, 26 Sep 2023 14:42:10 +0100
Subject: [PATCH 14/17] feat: Add a tooltip in the kudos drawer for reset
audience icon - MEED-2584 - Meeds-io/MIP#54 (#373)
This change will add a tooltip in the kudos drawer for reset audience icon.
---
.../locale/addon/Kudos_en.properties | 1 +
.../locale/addon/Kudos_fr.properties | 1 +
.../vue-app/kudos/components/KudosApp.vue | 21 ++++++++++++++-----
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/kudos-services/src/main/resources/locale/addon/Kudos_en.properties b/kudos-services/src/main/resources/locale/addon/Kudos_en.properties
index 1c253e450..c6409b21f 100644
--- a/kudos-services/src/main/resources/locale/addon/Kudos_en.properties
+++ b/kudos-services/src/main/resources/locale/addon/Kudos_en.properties
@@ -12,6 +12,7 @@ exoplatform.kudos.content.to=To:
exoplatform.kudos.visibility.title=Visible to any member of:
exoplatform.kudos.visibility.yourNetwork=Your network
exoplatform.kudos.visibility.oneOfYourSpaces=One of your spaces
+exoplatform.kudos.audience.reset.tooltip=Change the audience
exoplatform.kudos.choose.audience=Choose an audience:
exoplatform.kudos.title.message=Message:
exoplatform.kudos.info.noKudosLeft=No kudos left. You 'll get more kudos to send in {0} {1}.
diff --git a/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties b/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties
index 7c248c867..a889fdfc2 100644
--- a/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties
+++ b/kudos-services/src/main/resources/locale/addon/Kudos_fr.properties
@@ -12,6 +12,7 @@ exoplatform.kudos.content.to=\u00C0 :
exoplatform.kudos.visibility.title=Visible par tout membre du :
exoplatform.kudos.visibility.yourNetwork=Votre réseau
exoplatform.kudos.visibility.oneOfYourSpaces=Un de vos espaces
+exoplatform.kudos.audience.reset.tooltip=Changer l'audience
exoplatform.kudos.choose.audience=Choisir l'audience :
exoplatform.kudos.title.message=Message :
exoplatform.kudos.info.noKudosLeft=Vous n'avez plus de kudos disponibles. Vous aurez plus de kudos \u00E0 envoyer dans {0} {1}.
diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
index 09e2091c0..2b62494f5 100644
--- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
+++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
@@ -145,11 +145,22 @@
-
-
- fas fa-redo
-
-
+
+
+
+
+ fas fa-redo
+
+
+
+
+ {{ $t('exoplatform.kudos.audience.reset.tooltip') }}
+
+
From 56fc1a7e7341998dfa320c315a1d102b6e099abf Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Tue, 26 Sep 2023 16:17:14 +0100
Subject: [PATCH 15/17] fix: Review the display of the composer drawer when
space audience chosen - MEED-2569 - Meeds-io/MIP#54 (#374)
This change will add some adjustments to the kudos drawer audience.
---
.../src/main/webapp/vue-app/kudos/components/KudosApp.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
index 2b62494f5..7f95dfc58 100644
--- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
+++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
@@ -151,7 +151,7 @@
icon
v-bind="attrs"
v-on="on"
- @click="removeAudience()">
+ @click="resetAudienceChoice()">
fas fa-redo
@@ -398,7 +398,7 @@ export default {
return this.postInYourSpacesChoice && !this.audience;
},
audienceTypesDisplay() {
- return (!this.spaceId && !this.isLinkedKudos) || (!this.spaceId && !this.readOnlySpace) || !this.readOnlySpace;
+ return (!this.spaceId && !this.isLinkedKudos) || (!this.spaceId && !this.readOnlySpace) || (!this.readOnlySpace && this.postInYourSpacesChoice && !this.audience);
},
audienceAvatarDisplay() {
return (this.audience && this.postInYourSpacesChoice) || this.readOnlySpace;
@@ -585,7 +585,6 @@ export default {
.then(() => {
this.selectedReceiver = null;
this.resetAudienceChoice();
- this.removeAudience();
this.noReceiverIdentityId = false;
this.$refs.activityKudosDrawer.close();
this.displayAlert(this.$t('exoplatform.kudos.success.kudosSent'));
@@ -623,6 +622,7 @@ export default {
},
resetAudienceChoice() {
this.audienceChoice = null;
+ this.audience = '';
},
removeAudience() {
this.audience = '';
From 1a21d0390f3df120839bceb40fbe4238b0aba2fa Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Mon, 2 Oct 2023 10:43:11 +0100
Subject: [PATCH 16/17] fix: Adjust the display of icons used in the composer
drawer - MEED-2606 -Meeds-io/MIP#54 (#378)
This change will adjust the alignment of the action title in composer drawer.
---
.../kudos/components/SendKudosComposer.vue | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
index b9cfce053..adda8b6d8 100644
--- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
+++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
@@ -8,11 +8,17 @@
-
- fa-award
-
+
+
+ fa-award
+
+
{{ $t('exoplatform.kudos.title.sendAKudos') }}
From ce22f972bae7e3a17d64571244114702fa2f9d1b Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:37:21 +0100
Subject: [PATCH 17/17] fix: Align action labels below the composer - MEED-2609
-Meeds-io/MIP#54 (#381)
This change will align action labels below the composer and add the license header for new components.
---
.../kudos/components/SendKudosComposer.vue | 16 ++++++++++++++++
.../components/SendKudosToolbarAction.vue | 18 +++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
index adda8b6d8..1c1f3974b 100644
--- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
+++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
@@ -1,3 +1,19 @@
+
@@ -31,7 +47,7 @@
color="primary">
fa-award
-
+
{{ $t('kudos.title') }}