Skip to content

Commit f22ab15

Browse files
akolsonakolson
authored
Merge pull request #4518 from learningequality/hotfixes
Release v2024.06.04
2 parents acef4d7 + 07dde98 commit f22ab15

File tree

65 files changed

+315
-624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+315
-624
lines changed

‎contentcuration/contentcuration/frontend/accounts/pages/Create.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
:appBarText="$tr('backToLoginButton')"
66
backButton
77
>
8-
<VImg
9-
height="200"
10-
maxHeight="100"
11-
contain
12-
:lazy-src="require('shared/images/kolibri-logo.svg')"
13-
:src="require('shared/images/kolibri-logo.svg')"
14-
/>
8+
<div class="align-center d-flex justify-center mb-2">
9+
<KLogo
10+
altText="Kolibri Logo with background"
11+
:showBackground="true"
12+
:size="120"
13+
/>
14+
</div>
1515
<h2 ref="top" class="mb-4 primary--text text-xs-center">
1616
{{ $tr('createAnAccountTitle') }}
1717
</h2>

‎contentcuration/contentcuration/frontend/accounts/pages/Main.vue

+12-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
class="pa-4"
1313
style="width: 300px;margin: 0 auto;"
1414
>
15-
<VImg
16-
height="200"
17-
maxHeight="100"
18-
contain
19-
:lazy-src="require('shared/images/kolibri-logo.svg')"
20-
:src="require('shared/images/kolibri-logo.svg')"
21-
/>
15+
<div class="k-logo-container">
16+
<KLogo
17+
altText="Kolibri Logo with background"
18+
:showBackground="true"
19+
:size="120"
20+
/>
21+
</div>
2222
<h2 class="primary--text py-2 text-xs-center">
2323
{{ $tr('kolibriStudio') }}
2424
</h2>
@@ -227,4 +227,9 @@
227227
width: 100%;
228228
}
229229
230+
.k-logo-container {
231+
display: flex;
232+
justify-content: center;
233+
}
234+
230235
</style>

‎contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
162162
tr:hover td {
163163
/* stylelint-disable-next-line custom-property-pattern */
164-
background-color: var(--v-greyBackground-base) !important;
164+
background-color: var(--v-greyBackground-lighten1) !important;
165165
}
166166
167167
/deep/ .v-table__overflow {

‎contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<template #progress>
5353
<VProgressLinear
5454
v-if="loading"
55-
color="primary"
55+
color="loading"
5656
indeterminate
5757
data-test="loading"
5858
/>

‎contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
:class="{ expanded: $vuetify.breakpoint.mdAndUp }"
6464
>
6565
<template #progress>
66-
<VProgressLinear v-if="loading" color="primary" indeterminate />
66+
<VProgressLinear v-if="loading" color="loading" indeterminate />
6767
</template>
6868

6969
<template #headerCell="{ header }">

‎contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue

+1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@
363363
}
364364
365365
.copy-retry-btn {
366+
padding-bottom: 2px;
366367
font-size: inherit;
367368
}
368369

‎contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue

+1
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@
420420
align-items: center;
421421
align-self: center;
422422
min-width: max-content;
423+
line-height: 1.6;
423424
pointer-events: auto;
424425
cursor: default;
425426

‎contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeValidator.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<span v-else-if="error" class="mx-2">
1010
<VTooltip bottom lazy>
1111
<template #activator="{ on }">
12-
<Icon color="red" v-on="on">
12+
<Icon :color="$themePalette.red.v_1100" v-on="on">
1313
error
1414
</Icon>
1515
</template>
@@ -19,7 +19,7 @@
1919
<span v-else-if="warning" class="mx-2">
2020
<VTooltip bottom lazy>
2121
<template #activator="{ on }">
22-
<Icon color="amber" v-on="on">
22+
<Icon :color="$themePalette.yellow.v_1100" v-on="on">
2323
warning
2424
</Icon>
2525
</template>

‎contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
v-if="loading"
119119
class="mx-3"
120120
indeterminate
121+
color="loading"
121122
size="15"
122123
width="2"
123124
/>

‎contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- Toolbar + extension -->
2323
<VToolbar
2424
dark
25-
color="primary"
25+
color="appBarDark"
2626
fixed
2727
flat
2828
:clipped-left="!$isRTL"

‎contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div class="mx-2">
44
<template v-if="hasChanges">
5-
<VProgressCircular indeterminate size="16" width="2" color="secondary" />
5+
<VProgressCircular indeterminate size="16" width="2" color="loading" />
66
<span class="mx-2" style="vertical-align: middle;">
77
{{ $tr('savingIndicator') }}
88
</span>

‎contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22

3-
<VCard @click="handleClick">
3+
<VCard hover @click="handleClick">
44
<VCardTitle>
55
<VLayout row wrap>
66
<VFlex class="pt-2 px-4 thumbnail-column">
@@ -229,11 +229,6 @@
229229
230230
.v-card {
231231
cursor: pointer;
232-
233-
&:hover {
234-
/* stylelint-disable-next-line custom-property-pattern */
235-
background-color: var(--v-greyBackground-base);
236-
}
237232
}
238233
239234
h3 {

‎contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22

3-
<VCard :to="channelRoute">
3+
<VCard hover :to="channelRoute">
44
<VCardTitle>
55
<VLayout row wrap>
66
<VFlex lg2 md4 sm5 xs12 class="px-3">
@@ -113,11 +113,6 @@
113113
114114
.v-card {
115115
cursor: pointer;
116-
117-
&:hover {
118-
/* stylelint-disable-next-line custom-property-pattern */
119-
background-color: var(--v-greyBackground-base);
120-
}
121116
}
122117
123118
</style>

‎contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
mixins: [constantsTranslationMixin],
7373
data() {
7474
return {
75-
languageFilter: '',
75+
languageFilter: null,
7676
channels: [],
7777
pageCount: 0,
7878
loading: false,
@@ -110,6 +110,7 @@
110110
},
111111
languageFilter() {
112112
this.loadPage();
113+
this.$emit('update-language', this.languageFilter);
113114
},
114115
},
115116
mounted() {

‎contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue

+7
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<!-- Search or Topics Browsing -->
4949
<ChannelList
5050
v-if="isBrowsing && !$route.params.channelId"
51+
@update-language="updateLanguageQuery"
5152
/>
5253
<ContentTreeList
5354
v-else-if="isBrowsing"
@@ -96,6 +97,7 @@
9697
searchTerm: '',
9798
topicNode: null,
9899
copyNode: null,
100+
languageFromChannelList: null,
99101
};
100102
},
101103
computed: {
@@ -142,6 +144,9 @@
142144
handleBackToBrowse() {
143145
this.$router.push(this.backToBrowseRoute);
144146
},
147+
updateLanguageQuery(language) {
148+
this.languageFromChannelList = language;
149+
},
145150
handleSearchTerm() {
146151
if (this.searchIsValid) {
147152
this.$router.push({
@@ -151,9 +156,11 @@
151156
},
152157
query: {
153158
...this.$route.query,
159+
...(this.isBrowsing ? { languages: this.languageFromChannelList } : {}),
154160
last: this.$route.query.last || this.$route.path,
155161
},
156162
});
163+
this.languageFromChannelList = null;
157164
this.clearNodes();
158165
this.$analytics.trackAction('import_modal', 'Search');
159166
}

‎contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
v-on="on"
7474
>
7575
{{ $formatNumber(errorsInChannel) }}
76-
<Icon color="amber">
76+
<Icon :color="$themePalette.yellow.v_1100">
7777
warning
7878
</Icon>
7979
</div>
@@ -204,7 +204,7 @@
204204
<slot name="extension"></slot>
205205
</template>
206206
</ToolBar>
207-
<MainNavigationDrawer v-model="drawer" />
207+
<MainNavigationDrawer v-model="drawer" color="white" />
208208
<slot></slot>
209209

210210
<PublishModal

‎contentcuration/contentcuration/frontend/channelEdit/vuex/clipboard/actions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export function addClipboardNodeFromListener(context, obj) {
193193
.then(() =>
194194
context.dispatch(
195195
'contentNode/loadContentNodes',
196-
{ '[node_id+channel_id]__in': [obj.source_node_id, obj.source_channel_id] },
196+
{ '[node_id+channel_id]__in': [[obj.source_node_id, obj.source_channel_id]] },
197197
{ root }
198198
)
199199
)

‎contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue

-95
Original file line numberDiff line numberDiff line change
@@ -19,68 +19,6 @@
1919
@click="clearFilters"
2020
/>
2121
</div>
22-
<div v-else>
23-
<VLayout row wrap>
24-
<VFlex
25-
v-for="collection in collections"
26-
:key="`public-collection-${collection.id}`"
27-
xs12
28-
class="py-2"
29-
>
30-
<VCard
31-
tabindex="0"
32-
class="pt-2"
33-
data-test="collection"
34-
@click="setCollection(collection.id)"
35-
@keyup.enter="setCollection(collection.id)"
36-
>
37-
<VLayout>
38-
<div class="px-2 text-xs-center">
39-
<Icon style="font-size: 75px;">
40-
local_hospital
41-
</Icon>
42-
</div>
43-
<VCardTitle primary-title class="pb-2 pt-2">
44-
45-
<!-- TODO: add 'notranslate' class once we figure out how to handle collections
46-
that have multiple channel languages inside -->
47-
<h3 class="headline mb-0">
48-
{{ collection.name }}
49-
</h3>
50-
<p class="body-1 grey--text">
51-
{{ $tr('channelCount', { count: collection.count }) }}
52-
</p>
53-
<p v-if="collection.description">
54-
{{ collection.description }}
55-
</p>
56-
</VCardTitle>
57-
</VLayout>
58-
<VCardActions>
59-
<VSpacer />
60-
<IconButton
61-
icon="copy"
62-
:text="$tr('copyToken')"
63-
@click.stop="displayToken = collection.token"
64-
/>
65-
</VCardActions>
66-
</VCard>
67-
</VFlex>
68-
</VLayout>
69-
70-
<KModal
71-
v-if="displayToken"
72-
:title="$tr('copyTitle')"
73-
:text="$tr('copyTokenInstructions')"
74-
:cancelText="$tr('close')"
75-
@cancel="displayToken = null"
76-
>
77-
<div class="mb-3">
78-
{{ $tr('copyTokenInstructions') }}
79-
</div>
80-
<CopyToken :token="displayToken" />
81-
</KModal>
82-
83-
</div>
8422
</VContainer>
8523

8624
</template>
@@ -90,10 +28,6 @@
9028
import flatten from 'lodash/flatten'; // Tests fail with native Array.flat() method
9129
import { catalogFilterMixin } from './mixins';
9230
import { constantsTranslationMixin } from 'shared/mixins';
93-
import IconButton from 'shared/views/IconButton';
94-
import CopyToken from 'shared/views/CopyToken';
95-
96-
const publicCollections = window.publicCollections || [];
9731
9832
/*
9933
Returns the expected format for filters
@@ -108,16 +42,7 @@
10842
10943
export default {
11044
name: 'CatalogFilterBar',
111-
components: {
112-
IconButton,
113-
CopyToken,
114-
},
11545
mixins: [constantsTranslationMixin, catalogFilterMixin],
116-
data() {
117-
return {
118-
displayToken: null,
119-
};
120-
},
12146
computed: {
12247
currentFilters() {
12348
return flatten([
@@ -150,24 +75,10 @@
15075
createFilter(this.coach, this.$tr('coachContent'), this.resetCoach),
15176
createFilter(this.assessments, this.$tr('assessments'), this.resetAssessments),
15277
createFilter(this.subtitles, this.$tr('subtitles'), this.resetSubtitles),
153-
createFilter(this.collection, this.getCollectionName(), this.resetCollection),
15478
]).filter(Boolean);
15579
},
156-
collections() {
157-
return publicCollections;
158-
},
15980
},
16081
methods: {
161-
getCollectionName() {
162-
const collection = this.collections.find(c => c.id === this.collection);
163-
return collection && collection.name;
164-
},
165-
setCollection(collectionId) {
166-
this.collection = collectionId;
167-
},
168-
resetCollection() {
169-
this.setCollection(null);
170-
},
17182
resetKeywords() {
17283
this.keywords = '';
17384
},
@@ -200,12 +111,6 @@
200111
subtitles: 'Subtitles',
201112
starred: 'Starred',
202113
clearAll: 'Clear all',
203-
channelCount: '{count, plural,\n =1 {# channel}\n other {# channels}}',
204-
copyToken: 'Copy collection token',
205-
copyTitle: 'Copy collection token',
206-
copyTokenInstructions:
207-
'Paste this token into Kolibri to import the channels contained in this collection',
208-
close: 'Close',
209114
},
210115
};
211116

0 commit comments

Comments
 (0)