Skip to content

Updated Components to KComponents #4413

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

Merged
merged 3 commits into from
Jan 30, 2024
Merged

Updated Components to KComponents #4413

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
832a0be
Updated Components to KComponents
BabyElias Jan 22, 2024
6bb716d
Merge branch 'learningequality:unstable' into Issue-#219--Kolibri-Des…
BabyElias Jan 26, 2024
80feb39
updated trash icon
BabyElias Jan 26, 2024
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
25 changes: 16 additions & 9 deletions contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,23 @@
:to="channelDetailsLink"
>

<IconButton
<KIconButton
:color="$themeTokens.primary"
data-test="details-button"
class="mr-1"
icon="info"
:text="$tr('details')"
:tooltip="$tr('details')"
@mouseenter.native="hideHighlight = true"
@mouseleave.native="hideHighlight = false"
/>

</KRouterLink>

<IconButton
<KIconButton
v-if="!allowEdit && channel.published"
class="mr-1"
icon="copy"
:text="$tr('copyToken')"
:tooltip="$tr('copyToken')"
data-test="token-button"
@click.stop.prevent="tokenDialog = true"
@mouseenter.native="hideHighlight = true"
Expand Down Expand Up @@ -145,7 +145,10 @@
@click.stop
>
<VListTileAvatar>
<Icon>edit</Icon>
<KIconButton
disabled="true"
icon="edit"
/>
</VListTileAvatar>
<VListTileTitle>{{ $tr('editChannel') }}</VListTileTitle>
</VListTile>
Expand All @@ -155,7 +158,10 @@
@click="tokenDialog = true"
>
<VListTileAvatar>
<Icon>content_copy</Icon>
<KIconButton
disabled="true"
icon="copy"
/>
</VListTileAvatar>
<VListTileTitle>{{ $tr('copyToken') }}</VListTileTitle>
</VListTile>
Expand Down Expand Up @@ -190,7 +196,10 @@
@click.stop="deleteDialog = true"
>
<VListTileAvatar>
<Icon>delete</Icon>
<KIconButton
disabled="true"
icon="trash"
/>
</VListTileAvatar>
<VListTileTitle>{{ $tr('deleteChannel') }}</VListTileTitle>
</VListTile>
Expand Down Expand Up @@ -232,15 +241,13 @@
import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
import Thumbnail from 'shared/views/files/Thumbnail';
import Languages from 'shared/leUtils/Languages';
import IconButton from 'shared/views/IconButton';

export default {
name: 'ChannelItem',
components: {
ChannelStar,
ChannelTokenModal,
Thumbnail,
IconButton,
},
props: {
channelId: {
Expand Down
9 changes: 3 additions & 6 deletions contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelStar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<!-- Adding div wrapper as tests fail when VTooltip is the root -->
<div style="display: inline-block;">
<IconButton
<KIconButton
data-test="button"
:icon="bookmark ? 'star' : 'starBorder'"
:text="starText"
:tooltip="starText"
v-bind="$attrs"
@click="toggleStar"
/>
Expand All @@ -16,13 +16,10 @@
<script>

import { mapActions, mapGetters } from 'vuex';
import IconButton from 'shared/views/IconButton';

export default {
name: 'ChannelStar',
components: {
IconButton,
},

props: {
channelId: {
type: String,
Expand Down