From 5aeec3662e2106e88a9188f25bef0022e4a02c5d Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 27 Jan 2023 08:35:50 +0000
Subject: [PATCH] Polishing TIC: Courseware Import Wording und Position
Closes #2066
Merge request studip/studip!1345
---
.../assets/stylesheets/scss/courseware.scss | 6 ++---
.../courseware/CoursewareActionWidget.vue | 21 +--------------
.../courseware/CoursewareExportWidget.vue | 2 +-
.../courseware/CoursewareImportWidget.vue | 26 ++++++++++++++++---
.../CoursewareStructuralElement.vue | 2 +-
.../CoursewareStructuralElementDialogCopy.vue | 2 +-
...oursewareStructuralElementDialogImport.vue | 2 +-
.../CoursewareStructuralElementDialogLink.vue | 2 +-
8 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/resources/assets/stylesheets/scss/courseware.scss b/resources/assets/stylesheets/scss/courseware.scss
index 2536047e9f5..1eb349aa12f 100644
--- a/resources/assets/stylesheets/scss/courseware.scss
+++ b/resources/assets/stylesheets/scss/courseware.scss
@@ -2072,9 +2072,6 @@ v i e w w i d g e t
.cw-action-widget-oer{
@include background-icon(oer-campus, clickable);
}
- .cw-action-widget-link {
- @include background-icon(group, clickable);
- }
.cw-action-widget-remove-lock{
@include background-icon(lock-unlocked, clickable);
}
@@ -2100,6 +2097,9 @@ v i e w w i d g e t
.cw-import-widget-import{
@include background-icon(import, clickable);
}
+ .cw-action-widget-link {
+ @include background-icon(group, clickable);
+ }
}
/* * * * * * * * * * * * * *
diff --git a/resources/vue/components/courseware/CoursewareActionWidget.vue b/resources/vue/components/courseware/CoursewareActionWidget.vue
index ee446feddd3..08348b9f5a2 100644
--- a/resources/vue/components/courseware/CoursewareActionWidget.vue
+++ b/resources/vue/components/courseware/CoursewareActionWidget.vue
@@ -7,11 +7,6 @@
{{ $gettext('Seite hinzufügen') }}
</button>
</li>
- <li v-if="inCourseContext && userIsTeacher" class="cw-action-widget-link">
- <button @click="linkElement">
- {{ $gettext('Seite verknüpfen') }}
- </button>
- </li>
</ul>
</template>
</sidebar-widget>
@@ -19,7 +14,7 @@
<script>
import SidebarWidget from '../SidebarWidget.vue';
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions } from 'vuex';
export default {
name: 'courseware-action-widget',
@@ -28,34 +23,20 @@ export default {
SidebarWidget,
},
computed: {
- ...mapGetters({
- context: 'context',
- userIsTeacher: 'userIsTeacher',
- }),
canEdit() {
if (!this.structuralElement) {
return false;
}
return this.structuralElement.attributes['can-edit'];
},
- currentId() {
- return this.structuralElement?.id;
- },
- inCourseContext() {
- return this.context.type === 'courses';
- }
},
methods: {
...mapActions({
showElementAddDialog: 'showElementAddDialog',
- showElementLinkDialog: 'showElementLinkDialog',
}),
addElement() {
this.showElementAddDialog(true);
},
- linkElement() {
- this.showElementLinkDialog(true);
- },
},
};
</script>
diff --git a/resources/vue/components/courseware/CoursewareExportWidget.vue b/resources/vue/components/courseware/CoursewareExportWidget.vue
index 2b4b6255bf3..c8baa4fac8d 100644
--- a/resources/vue/components/courseware/CoursewareExportWidget.vue
+++ b/resources/vue/components/courseware/CoursewareExportWidget.vue
@@ -4,7 +4,7 @@
<ul class="widget-list widget-links cw-export-widget" v-if="structuralElement">
<li v-if="showExportArchiv" class="cw-export-widget-export">
<button @click="exportElement">
- {{ $gettext('Lerninhalte exportieren') }}
+ {{ $gettext('Seiten exportieren') }}
</button>
</li>
<li v-if="showExportPdf" class="cw-export-widget-export-pdf">
diff --git a/resources/vue/components/courseware/CoursewareImportWidget.vue b/resources/vue/components/courseware/CoursewareImportWidget.vue
index d2ed4448dcb..e57f325b69f 100644
--- a/resources/vue/components/courseware/CoursewareImportWidget.vue
+++ b/resources/vue/components/courseware/CoursewareImportWidget.vue
@@ -4,12 +4,17 @@
<ul class="widget-list widget-links cw-import-widget">
<li class="cw-import-widget-archive">
<button @click="importElements">
- {{ $gettext('Lerninhalte importieren') }}
+ {{ $gettext('Seiten importieren') }}
</button>
</li>
<li class="cw-import-widget-copy">
<button @click="copyElements">
- {{ $gettext('Lerninhalte kopieren') }}
+ {{ $gettext('Seiten kopieren') }}
+ </button>
+ </li>
+ <li v-if="inCourseContext && userIsTeacher" class="cw-action-widget-link">
+ <button @click="linkElement">
+ {{ $gettext('Seiten verknüpfen') }}
</button>
</li>
</ul>
@@ -19,17 +24,27 @@
<script>
import SidebarWidget from '../SidebarWidget.vue';
-import { mapActions } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
export default {
name: 'courseware-import-widget',
components: {
SidebarWidget,
},
+ computed: {
+ ...mapGetters({
+ context: 'context',
+ userIsTeacher: 'userIsTeacher',
+ }),
+ inCourseContext() {
+ return this.context.type === 'courses';
+ }
+ },
methods: {
...mapActions({
showElementImportDialog: 'showElementImportDialog',
- showElementCopyDialog: 'showElementCopyDialog'
+ showElementCopyDialog: 'showElementCopyDialog',
+ showElementLinkDialog: 'showElementLinkDialog',
}),
importElements() {
this.showElementImportDialog(true);
@@ -37,6 +52,9 @@ export default {
copyElements() {
this.showElementCopyDialog(true);
},
+ linkElement() {
+ this.showElementLinkDialog(true);
+ },
},
}
</script>
\ No newline at end of file
diff --git a/resources/vue/components/courseware/CoursewareStructuralElement.vue b/resources/vue/components/courseware/CoursewareStructuralElement.vue
index 6237ccba464..af5331b2db9 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElement.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElement.vue
@@ -131,7 +131,7 @@
/>
<courseware-companion-box
v-if="editView"
- :msgCompanion="$gettextInterpolate($gettext('Dieser Inhalt ist aus den persönlichen Lerninhalten von %{ ownerName } verlinkt und kann nur dort bearbeitet werden.'), { ownerName: ownerName })"
+ :msgCompanion="$gettextInterpolate($gettext('Dieser Inhalt ist aus den persönlichen Lernmaterialien von %{ ownerName } verlinkt und kann nur dort bearbeitet werden.'), { ownerName: ownerName })"
mood="pointing"
/>
<component
diff --git a/resources/vue/components/courseware/CoursewareStructuralElementDialogCopy.vue b/resources/vue/components/courseware/CoursewareStructuralElementDialogCopy.vue
index 68ad1435c91..cf0565e57f6 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElementDialogCopy.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElementDialogCopy.vue
@@ -1,6 +1,6 @@
<template>
<studip-wizard-dialog
- :title="$gettext('Lerninhalte kopieren')"
+ :title="$gettext('Seiten kopieren')"
:confirmText="$gettext('Kopieren')"
:closeText="$gettext('Abbrechen')"
:lastRequiredSlotId="3"
diff --git a/resources/vue/components/courseware/CoursewareStructuralElementDialogImport.vue b/resources/vue/components/courseware/CoursewareStructuralElementDialogImport.vue
index 6c6bb817544..4ce202eb0b6 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElementDialogImport.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElementDialogImport.vue
@@ -1,6 +1,6 @@
<template>
<studip-dialog
- :title="$gettext('Lerninhalte importieren')"
+ :title="$gettext('Seiten importieren')"
:confirmText="$gettext('Importieren')"
:confirmDisabled="importRunning || importAborted"
:closeText="importRunning || importAborted ? $gettext('Schließen') : $gettext('Abbrechen')"
diff --git a/resources/vue/components/courseware/CoursewareStructuralElementDialogLink.vue b/resources/vue/components/courseware/CoursewareStructuralElementDialogLink.vue
index ee9fd4bcfe5..47a01cd6650 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElementDialogLink.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElementDialogLink.vue
@@ -1,6 +1,6 @@
<template>
<studip-wizard-dialog
- :title="$gettext('Seite verknüpfen')"
+ :title="$gettext('Seiten verknüpfen')"
:confirmText="$gettext('Verknüpfen')"
:closeText="$gettext('Abbrechen')"
:lastRequiredSlotId="2"
--
GitLab