IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2184-button-for-the-messages-is-missing

Browse Source
This commit is contained in:
Alexander Friedland 2022-09-08 20:31:12 +02:00 committed by GitHub
commit 09cc02ae2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="contribution-messages-formular"> <div class="contribution-messages-formular">
<div> <div class="mt-5">
<b-form @submit.prevent="onSubmit" @reset.prevent="onReset"> <b-form @submit.prevent="onSubmit" @reset.prevent="onReset">
<b-form-textarea <b-form-textarea
id="textarea" id="textarea"

2
admin/src/components/ContributionMessages/slots/IsModerator.vue
View File

@ -5,7 +5,7 @@
<span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span> <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span> <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<small class="ml-4 text-success">{{ $t('moderator') }}</small> <small class="ml-4 text-success">{{ $t('moderator') }}</small>
<div class="mt-2 text-bold h4">{{ message.message }}</div> <div class="mt-2">{{ message.message }}</div>
</div> </div>
</div> </div>
</template> </template>

6
admin/src/components/ContributionMessages/slots/IsNotModerator.vue
View File

@ -2,11 +2,9 @@
<div class="slot-is-not-moderator"> <div class="slot-is-not-moderator">
<div> <div>
<b-avatar :text="initialLetters" variant="info"></b-avatar> <b-avatar :text="initialLetters" variant="info"></b-avatar>
<span class="ml-2 mr-2 text-bold"> <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
{{ message.userFirstName }} {{ message.userLastName }}
</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span> <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<div class="mt-2 text-bold h4">{{ message.message }}</div> <div class="mt-2">{{ message.message }}</div>
</div> </div>
</div> </div>
</template> </template>

1
frontend/src/components/ContributionMessages/ContributionMessagesList.vue
View File

@ -7,7 +7,6 @@
</b-container> </b-container>
<contribution-messages-formular <contribution-messages-formular
v-if="['PENDING', 'IN_PROGRESS'].includes(state)" v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
class="mt-5"
:contributionId="contributionId" :contributionId="contributionId"
@get-list-contribution-messages="getListContributionMessages" @get-list-contribution-messages="getListContributionMessages"
@update-state="updateState" @update-state="updateState"

2
frontend/src/components/ContributionMessages/slots/IsModerator.vue
View File

@ -4,7 +4,7 @@
<span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span> <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span> <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<small class="ml-4 text-success">{{ $t('community.moderator') }}</small> <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
<div class="mt-2 h3">{{ message.message }}</div> <div class="mt-2">{{ message.message }}</div>
</div> </div>
</template> </template>
<script> <script>

6
frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
View File

@ -2,11 +2,9 @@
<div class="slot-is-not-moderator"> <div class="slot-is-not-moderator">
<div class="text-right"> <div class="text-right">
<b-avatar :text="initialLetters" variant="info"></b-avatar> <b-avatar :text="initialLetters" variant="info"></b-avatar>
<span class="ml-2 mr-2 text-bold"> <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
{{ message.userFirstName }} {{ message.userLastName }}
</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span> <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<div class="mt-2 h3">{{ message.message }}</div> <div class="mt-2">{{ message.message }}</div>
</div> </div>
</div> </div>
</template> </template>