From f6779941261d3fa223b9fbfe7e7f4ba1ad0afede Mon Sep 17 00:00:00 2001 From: callmeroot Date: Sun, 14 Jan 2024 21:35:02 +0530 Subject: [PATCH 1/3] Changed components to KComponents --- .../components/ContentNodeListItem/index.vue | 6 +-- .../views/TreeView/TreeViewBase.vue | 7 ++-- .../frontend/shared/views/AppBar.vue | 37 +++++++++++++++---- .../shared/views/MainNavigationDrawer.vue | 35 ++++++++++++++---- 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue index d58e53b26e..d2e7afbaba 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue @@ -153,12 +153,12 @@ {{ $tr('incompleteDescendantsText', { count: errorsInChannel }) }} diff --git a/contentcuration/contentcuration/frontend/shared/views/AppBar.vue b/contentcuration/contentcuration/frontend/shared/views/AppBar.vue index f437e06e51..98ab6c7272 100644 --- a/contentcuration/contentcuration/frontend/shared/views/AppBar.vue +++ b/contentcuration/contentcuration/frontend/shared/views/AppBar.vue @@ -31,21 +31,35 @@ - people + - settings + @@ -53,7 +67,10 @@ @click="showLanguageModal = true" > - language + @@ -62,13 +79,19 @@ target="_blank" > - open_in_new + - exit_to_app + diff --git a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue index 7f1843ccc5..0c6b6ff4b7 100644 --- a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue +++ b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue @@ -10,7 +10,10 @@ > - clear + Kolibri Studio @@ -19,7 +22,10 @@ - home + {{ $tr('channelsLink') }} @@ -27,7 +33,10 @@ - people + {{ $tr('administrationLink') }} @@ -36,7 +45,10 @@ - settings + {{ $tr('settingsLink') }} @@ -44,7 +56,10 @@ - language + @@ -57,7 +72,10 @@ @click="trackClick('Help')" > - open_in_new + {{ $tr('helpLink') }} @@ -65,7 +83,10 @@ - exit_to_app + {{ $tr('logoutLink') }} From add85c55a008c1a48456adf7752d96955153d456 Mon Sep 17 00:00:00 2001 From: callmeroot Date: Sun, 14 Jan 2024 21:53:39 +0530 Subject: [PATCH 2/3] fix for linting errors --- .../frontend/channelEdit/views/TreeView/TreeViewBase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue index dcb729e290..3d90576e2e 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue @@ -76,7 +76,7 @@ - + {{ $tr('incompleteDescendantsText', { count: errorsInChannel }) }} From 15683eb1d6dc81e26622c2de9d371c96f6e75cc2 Mon Sep 17 00:00:00 2001 From: callmeroot Date: Sun, 21 Jan 2024 11:13:21 +0530 Subject: [PATCH 3/3] required changes --- .../frontend/channelEdit/views/TreeView/TreeViewBase.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue index 3d90576e2e..cdb0899e63 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue @@ -73,10 +73,10 @@ v-on="on" > {{ $formatNumber(errorsInChannel) }} - - + {{ $tr('incompleteDescendantsText', { count: errorsInChannel }) }}