Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Adjust the composer display - MEED-2419 MEED-2402 MEED-2401 MEED-2444 MEED-2443 MEED-2421 - Meeds-io/MIPs#54 #342

Merged
merged 3 commits into from
Sep 8, 2023
Merged

fix: Adjust the composer display - MEED-2419 MEED-2402 MEED-2401 MEED-2444 MEED-2443 MEED-2421 - Meeds-io/MIPs#54 #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9df6e0a
fix: Improve the toolbar post CTA - MEED-2401 - Meeds-io/MIPs#54 (#336)
MayTekayaa Sep 6, 2023
ea965bd
fix: Remove placeholder when editing an activity - MEED-2444 - Meeds-…
MayTekayaa Sep 5, 2023
b5f39a8
fix: Fix the send kudos button activation - MEED-2443 - Meeds-io/MIPs…
MayTekayaa Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ export default {
return this.numberOfKudosAllowed - this.remainingKudos;
},
sendButtonDisabled() {
return !this.kudosMessageText|| this.kudosMessageTextLength > this.MESSAGE_MAX_LENGTH || this.kudosMessageValidityLabel || !this.selectedReceiver;
return !this.kudosMessageText|| this.kudosMessageTextLength > this.MESSAGE_MAX_LENGTH || this.kudosMessageValidityLabel || (this.readOnlySpace && !this.selectedReceiver);
},
remainingPeriodLabel() {
return this.remainingDaysToReset === 1 ? this.$t('exoplatform.kudos.label.day') : this.$t('exoplatform.kudos.label.days') ;
Expand Down
31 changes: 19 additions & 12 deletions kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosComposer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
<template>
<div
class="d-flex flex-row align-center"
@click="openSendKudosDrawer">
<v-icon
color="primary"
size="50">
fa-award
</v-icon>
<v-span class="caption font-weight-bold ms-5">
{{ $t('exoplatform.kudos.title.sendAKudos') }}
</v-span>
</div>
<v-card
id="sendKudosComposerButton"
class="mx-4 mb-3 px-6 py-3"
outlined
flat
hover>
<div
class="d-flex flex-row align-center"
@click="openSendKudosDrawer">
<v-icon
color="primary"
size="50">
fa-award
</v-icon>
<v-span class="caption font-weight-bold ms-5">
{{ $t('exoplatform.kudos.title.sendAKudos') }}
</v-span>
</div>
</v-card>
</template>
<script>
export default {
Expand Down
3 changes: 2 additions & 1 deletion kudos-webapps/src/main/webapp/vue-app/kudos/components/SendKudosToolbarAction.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<template>
<v-btn
id="kudosBtnToolbar"
:ripple="false"
class="d-flex flex-row align-center py-2"
class="d-flex flex-row align-center py-2 px-3"
text
@click="openSendKudosDrawer">
<v-icon
Expand Down