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

Changed components to KComponents #4398

Merged
merged 4 commits into from
Jan 22, 2024
Merged

Changed components to KComponents #4398

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f677994
Changed components to KComponents
BabyElias Jan 14, 2024
add85c5
fix for linting errors
BabyElias Jan 14, 2024
e71c647
Merge branch 'learningequality:unstable' into Issue-#219--Kolibri-Des…
BabyElias Jan 21, 2024
15683eb
required changes
BabyElias Jan 21, 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
6 changes: 2 additions & 4 deletions ...entcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@
</VListTileContent>
<template v-if="!copying">
<VListTileAction class="actions-end-col">
<IconButton
<KIconButton
v-if="isTopic"
:aria-hidden="hover"
data-test="btn-chevron"
icon="chevronRight"
:text="$tr('openTopic')"
:tooltip="$tr('openTopic')"
size="small"
@click="$emit('topicChevronClick')"
/>
Expand Down Expand Up @@ -209,7 +209,6 @@
import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
import { RolesNames } from 'shared/leUtils/Roles';
import ImageOnlyThumbnail from 'shared/views/files/ImageOnlyThumbnail';
import IconButton from 'shared/views/IconButton';
import ToggleText from 'shared/views/ToggleText';
import ContextMenuCloak from 'shared/views/ContextMenuCloak';
import DraggableHandle from 'shared/views/draggable/DraggableHandle';
Expand All @@ -223,7 +222,6 @@
DraggableHandle,
ContextMenuCloak,
ImageOnlyThumbnail,
IconButton,
ContentNodeValidator,
ContentNodeChangedIcon,
ToggleText,
Expand Down
7 changes: 4 additions & 3 deletions contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@
v-on="on"
>
{{ $formatNumber(errorsInChannel) }}
<Icon color="amber">
warning
</Icon>
<KIcon
icon="warningIncomplete"
/>

</div>
</template>
<span>{{ $tr('incompleteDescendantsText', { count: errorsInChannel }) }}</span>
Expand Down
37 changes: 30 additions & 7 deletions contentcuration/contentcuration/frontend/shared/views/AppBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,46 @@
<Menu>
<template #activator="{ on }">
<VBtn flat style="text-transform: none;" v-on="on">
<Icon>person</Icon>
<KIconButton
disabled="true"
icon="person"
color="white"
/>
<span class="mx-2 subheading">{{ user.first_name }}</span>
<Icon>arrow_drop_down</Icon>
<KIconButton
disabled="true"
icon="dropdown"
color="white"
/>
</VBtn>
</template>
<VList>
<VListTile v-if="user.is_admin" :href="administrationLink">
<VListTileAction>
<Icon>people</Icon>
<KIconButton
disabled="true"
icon="people"
/>
</VListTileAction>
<VListTileTitle v-text="$tr('administration')" />
</VListTile>
<VListTile :href="settingsLink">
<VListTileAction>
<Icon>settings</Icon>
<KIconButton
disabled="true"
icon="settings"
/>
</VListTileAction>
<VListTileTitle v-text="$tr('settings')" />
</VListTile>
<VListTile
@click="showLanguageModal = true"
>
<VListTileAction>
<Icon>language</Icon>
<KIconButton
disabled="true"
icon="language"
/>
</VListTileAction>
<VListTileTitle v-text="$tr('changeLanguage')" />
</VListTile>
Expand All @@ -62,13 +79,19 @@
target="_blank"
>
<VListTileAction>
<Icon>open_in_new</Icon>
<KIconButton
disabled="true"
icon="openNewTab"
/>
</VListTileAction>
<VListTileTitle v-text="$tr('help')" />
</VListTile>
<VListTile @click="logout">
<VListTileAction>
<Icon>exit_to_app</Icon>
<KIconButton
disabled="true"
icon="logout"
/>
</VListTileAction>
<VListTileTitle v-text="$tr('logOut')" />
</VListTile>
Expand Down
35 changes: 28 additions & 7 deletions contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
>
<VToolbar color="primary" dark>
<VBtn flat icon :tabindex="handleclickTab" @click="drawer = false">
<Icon>clear</Icon>
<KIconButton
icon="clear"
color="white"
/>
</VBtn>
<VToolbarTitle class="notranslate">
Kolibri Studio
Expand All @@ -19,15 +22,21 @@
<VList>
<VListTile :href="channelsLink" :tabindex="handleclickTab">
<VListTileAction>
<Icon>home</Icon>
<KIconButton
disabled="true"
icon="home"
/>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle>{{ $tr('channelsLink') }}</VListTileTitle>
</VListTileContent>
</VListTile>
<VListTile v-if="user.is_admin" :href="administrationLink" :tabindex="handleclickTab">
<VListTileAction>
<Icon>people</Icon>
<KIconButton
disabled="true"
icon="people"
/>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle>{{ $tr('administrationLink') }}</VListTileTitle>
Expand All @@ -36,15 +45,21 @@
</VListTile>
<VListTile :href="settingsLink" :tabindex="handleclickTab" @click="trackClick('Settings')">
<VListTileAction>
<Icon>settings</Icon>
<KIconButton
disabled="true"
icon="settings"
/>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle>{{ $tr('settingsLink') }}</VListTileTitle>
</VListTileContent>
</VListTile>
<VListTile @click="openLanguageModal">
<VListTileAction>
<Icon>language</Icon>
<KIconButton
disabled="true"
icon="language"
/>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle v-text="$tr('changeLanguage')" />
Expand All @@ -57,15 +72,21 @@
@click="trackClick('Help')"
>
<VListTileAction>
<Icon>open_in_new</Icon>
<KIconButton
disabled="true"
icon="openNewTab"
/>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle>{{ $tr('helpLink') }}</VListTileTitle>
</VListTileContent>
</VListTile>
<VListTile @click="logout">
<VListTileAction>
<Icon>exit_to_app</Icon>
<KIconButton
disabled="true"
icon="logout"
/>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle>{{ $tr('logoutLink') }}</VListTileTitle>
Expand Down
Loading