Skip to content

[stable33] fix: Replace icon attributes with template slots #8094

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

Open
backportbot wants to merge 1 commit into
base: stable33
Choose a base branch
from
+71 −23
Open

[stable33] fix: Replace icon attributes with template slots #8094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions src/components/cards/CardMenuEntries.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,35 @@
{{ t('deck', 'Edit title') }}
</NcActionButton>
<NcActionButton v-if="canEdit && !isCurrentUserAssigned"
icon="icon-user"
:close-after-click="true"
@click="assignCardToMe()">
<template #icon>
<AccountPlusIcon :size="20" decorative />
</template>
{{ t('deck', 'Assign to me') }}
</NcActionButton>
<NcActionButton v-if="canEdit && isCurrentUserAssigned"
icon="icon-user"
:close-after-click="true"
@click="unassignCardFromMe()">
<template #icon>
<AccountMinusIcon :size="20" decorative />
</template>
{{ t('deck', 'Unassign myself') }}
</NcActionButton>
<NcActionButton v-if="canEdit"
icon="icon-checkmark"
:close-after-click="true"
@click="changeCardDoneStatus()">
<template #icon>
<CheckIcon :size="20" decorative />
</template>
{{ card.done ? t('deck', 'Mark as not done') : t('deck', 'Mark as done') }}
</NcActionButton>
<NcActionButton v-if="canEdit"
icon="icon-external"
:close-after-click="true"
@click="openCardMoveDialog">
<template #icon>
<OpenInNewIcon :size="20" decorative />
</template>
{{ t('deck', 'Move/copy card') }}
</NcActionButton>
<NcActionButton v-for="action in cardActions"
Expand All @@ -53,9 +61,11 @@
{{ card.archived ? t('deck', 'Unarchive card') : t('deck', 'Archive card') }}
</NcActionButton>
<NcActionButton v-if="canEdit"
icon="icon-delete"
:close-after-click="true"
@click="deleteCard()">
<template #icon>
<DeleteIcon :size="20" decorative />
</template>
{{ t('deck', 'Delete card') }}
</NcActionButton>
</div>
Expand All @@ -66,6 +76,11 @@ import { mapGetters, mapState } from 'vuex'
import ArchiveIcon from 'vue-material-design-icons/ArchiveOutline.vue'
import CardBulletedIcon from 'vue-material-design-icons/CardBulletedOutline.vue'
import PencilIcon from 'vue-material-design-icons/PencilOutline.vue'
import AccountPlusIcon from 'vue-material-design-icons/AccountPlus.vue'
import AccountMinusIcon from 'vue-material-design-icons/AccountMinus.vue'
import CheckIcon from 'vue-material-design-icons/Check.vue'
import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
import DeleteIcon from 'vue-material-design-icons/DeleteOutline.vue'
import { generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import { showUndo } from '@nextcloud/dialogs'
Expand All @@ -75,7 +90,7 @@ import { emit } from '@nextcloud/event-bus'

export default {
name: 'CardMenuEntries',
components: { NcActionButton, ArchiveIcon, CardBulletedIcon, PencilIcon },
components: { NcActionButton, ArchiveIcon, CardBulletedIcon, PencilIcon, AccountPlusIcon, AccountMinusIcon, CheckIcon, OpenInNewIcon, DeleteIcon },
props: {
card: {
type: Object,
Expand Down
67 changes: 50 additions & 17 deletions src/components/navigation/AppNavigationBoard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,19 @@

<template v-if="!deleted" slot="actions">
<template v-if="!isDueSubmenuActive">
<NcActionButton icon="icon-info"
:close-after-click="true"
<NcActionButton :close-after-click="true"
@click="actionDetails">
<template #icon>
<InformationOutlineIcon :size="20" decorative />
</template>
{{ t('deck', 'Board details') }}
</NcActionButton>
<NcActionButton v-if="canManage && !board.archived"
icon="icon-rename"
:close-after-click="true"
@click="actionEdit">
<template #icon>
<PencilIcon :size="20" decorative />
</template>
{{ t('deck', 'Edit board') }}
</NcActionButton>
<NcActionButton v-if="canCreate && !board.archived"
Expand Down Expand Up @@ -64,9 +68,11 @@
{{ t('deck', 'Archive board') }}
</NcActionButton>
<NcActionButton v-if="canManage && !board.archived"
icon="icon-download"
:close-after-click="true"
@click="actionExport">
<template #icon>
<DownloadIcon :size="20" decorative />
</template>
{{ t('deck', 'Export board') }}
</NcActionButton>
<NcActionButton v-if="!board.archived && board.acl.length === 0" :icon="board.settings['notify-due'] === 'off' ? 'icon-sound' : 'icon-sound-off'" @click="board.settings['notify-due'] === 'off' ? updateSetting('notify-due', 'all') : updateSetting('notify-due', 'off')">
Expand All @@ -76,50 +82,62 @@

<!-- Due date reminder settings -->
<template v-if="isDueSubmenuActive">
<NcActionButton :icon="updateDueSetting ? 'icon-loading-small' : 'icon-view-previous'"
:disabled="updateDueSetting"
<NcActionButton :disabled="updateDueSetting"
@click="isDueSubmenuActive=false">
<template #icon>
<NcLoadingIcon v-if="updateDueSetting" :size="20" />
<ChevronLeftIcon v-else :size="20" decorative />
</template>
{{ t('deck', 'Due date reminders') }}
</NcActionButton>

<NcActionButton name="notification"
icon="icon-sound"
:disabled="updateDueSetting"
:class="{ 'forced-active': board.settings['notify-due'] === 'all' }"
@click="updateSetting('notify-due', 'all')">
<template #icon>
<BellOutlineIcon :size="20" decorative />
</template>
{{ t('deck', 'All cards') }}
</NcActionButton>
<NcActionButton name="notification"
icon="icon-user"
:disabled="updateDueSetting"
:class="{ 'forced-active': board.settings['notify-due'] === 'assigned' }"
@click="updateSetting('notify-due', 'assigned')">
<template #icon>
<AccountIcon :size="20" decorative />
</template>
{{ t('deck', 'Assigned cards') }}
</NcActionButton>
<NcActionButton name="notification"
icon="icon-sound-off"
:disabled="updateDueSetting"
:class="{ 'forced-active': board.settings['notify-due'] === 'off' }"
@click="updateSetting('notify-due', 'off')">
<template #icon>
<BellOffOutlineIcon :size="20" decorative />
</template>
{{ t('deck', 'No notifications') }}
</NcActionButton>
</template>
<NcActionButton v-else-if="!board.archived && board.acl.length > 0"
:name="t('deck', 'Due date reminders')"
:icon="dueDateReminderIcon"
@click="isDueSubmenuActive=true">
<template #icon>
<component :is="dueDateReminderIcon" :size="20" decorative />
</template>
{{ dueDateReminderText }}
</NcActionButton>

<NcActionButton v-if="canManage && !isDueSubmenuActive"
icon="icon-delete"
:close-after-click="true"
@click="actionDelete">
<template #icon>
<DeleteIcon :size="20" decorative />
</template>
{{ t('deck', 'Delete board') }}
</NcActionButton>

<NcActionButton v-if="canLeave && !isDueSubmenuActive"
icon="icon-delete"
:close-after-click="true"
@click="actionLeave">
<template #icon>
Expand Down Expand Up @@ -164,14 +182,21 @@
</template>

<script>
import { NcAppNavigationIconBullet, NcAppNavigationItem, NcColorPicker, NcButton, NcTextField, NcActionButton } from '@nextcloud/vue'
import { NcAppNavigationIconBullet, NcAppNavigationItem, NcColorPicker, NcButton, NcTextField, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
import ClickOutside from 'vue-click-outside'
import ArchiveIcon from 'vue-material-design-icons/ArchiveOutline.vue'
import CloneIcon from 'vue-material-design-icons/ContentDuplicate.vue'
import LeaveIcon from 'vue-material-design-icons/ExitRun.vue'
import AccountIcon from 'vue-material-design-icons/AccountOutline.vue'
import CloseIcon from 'vue-material-design-icons/Close.vue'
import CheckIcon from 'vue-material-design-icons/Check.vue'
import InformationOutlineIcon from 'vue-material-design-icons/InformationOutline.vue'
import PencilIcon from 'vue-material-design-icons/PencilOutline.vue'
import DownloadIcon from 'vue-material-design-icons/DownloadOutline.vue'
import DeleteIcon from 'vue-material-design-icons/DeleteOutline.vue'
import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
import BellOutlineIcon from 'vue-material-design-icons/BellOutline.vue'
import BellOffOutlineIcon from 'vue-material-design-icons/BellOffOutline.vue'

import { loadState } from '@nextcloud/initial-state'
import { emit } from '@nextcloud/event-bus'
Expand All @@ -193,12 +218,20 @@ export default {
NcButton,
NcTextField,
NcActionButton,
NcLoadingIcon,
AccountIcon,
ArchiveIcon,
CloneIcon,
CloseIcon,
CheckIcon,
LeaveIcon,
InformationOutlineIcon,
PencilIcon,
DownloadIcon,
DeleteIcon,
ChevronLeftIcon,
BellOutlineIcon,
BellOffOutlineIcon,
BoardCloneModal,
BoardExportModal,
},
Expand Down Expand Up @@ -257,13 +290,13 @@ export default {
},
dueDateReminderIcon() {
if (this.board.settings['notify-due'] === 'all') {
return 'icon-sound'
return 'BellOutlineIcon'
} else if (this.board.settings['notify-due'] === 'assigned') {
return 'icon-user'
return 'AccountIcon'
} else if (this.board.settings['notify-due'] === 'off') {
return 'icon-sound-off'
return 'BellOffOutlineIcon'
}
return ''
return 'BellOutlineIcon'
},
dueDateReminderText() {
if (this.board.settings['notify-due'] === 'all') {
Expand Down
Loading