From ec96413c6b8baa8821073e7bfe7907f9b4a7c876 Mon Sep 17 00:00:00 2001
From: farbod <zamanifarbod2@gmail.com>
Date: Wed, 5 Jan 2022 14:04:03 +0100
Subject: [PATCH] companion instead of messagebox
---
resources/vue/components/courseware/CoursewareAudioBlock.vue | 4 +---
.../vue/components/courseware/CoursewareBeforeAfterBlock.vue | 4 +---
resources/vue/components/courseware/CoursewareCanvasBlock.vue | 4 +---
.../vue/components/courseware/CoursewareDialogCardsBlock.vue | 4 +---
.../vue/components/courseware/CoursewareDocumentBlock.vue | 4 +---
.../vue/components/courseware/CoursewareDownloadBlock.vue | 4 +---
resources/vue/components/courseware/CoursewareFolderBlock.vue | 4 +---
.../vue/components/courseware/CoursewareGalleryBlock.vue | 4 +---
.../vue/components/courseware/CoursewareHeadlineBlock.vue | 4 +---
.../vue/components/courseware/CoursewareImageMapBlock.vue | 4 +---
resources/vue/components/courseware/CoursewareVideoBlock.vue | 4 +---
.../vue/components/courseware/block-folder-validator-mixin.js | 4 ++++
12 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/resources/vue/components/courseware/CoursewareAudioBlock.vue b/resources/vue/components/courseware/CoursewareAudioBlock.vue
index 70af59689bf..d73142faa90 100755
--- a/resources/vue/components/courseware/CoursewareAudioBlock.vue
+++ b/resources/vue/components/courseware/CoursewareAudioBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="currentTitle !== ''" class="cw-block-title">{{ currentTitle }}</div>
<audio
:src="currentURL"
diff --git a/resources/vue/components/courseware/CoursewareBeforeAfterBlock.vue b/resources/vue/components/courseware/CoursewareBeforeAfterBlock.vue
index e16aaaff51e..7b4a63e2a7a 100755
--- a/resources/vue/components/courseware/CoursewareBeforeAfterBlock.vue
+++ b/resources/vue/components/courseware/CoursewareBeforeAfterBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<TwentyTwenty :before="currentBeforeUrl" :after="currentAfterUrl" />
</template>
<template v-if="canEdit" #edit>
diff --git a/resources/vue/components/courseware/CoursewareCanvasBlock.vue b/resources/vue/components/courseware/CoursewareCanvasBlock.vue
index 13f9ea02325..70bfc4140d8 100755
--- a/resources/vue/components/courseware/CoursewareCanvasBlock.vue
+++ b/resources/vue/components/courseware/CoursewareCanvasBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="currentTitle" class="cw-block-title">
{{ currentTitle }}
</div>
diff --git a/resources/vue/components/courseware/CoursewareDialogCardsBlock.vue b/resources/vue/components/courseware/CoursewareDialogCardsBlock.vue
index e50dea5bc20..57acf0e59fa 100755
--- a/resources/vue/components/courseware/CoursewareDialogCardsBlock.vue
+++ b/resources/vue/components/courseware/CoursewareDialogCardsBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div class="cw-block-dialog-cards-content">
<button
class="cw-dialogcards-prev cw-dialogcards-navbutton"
diff --git a/resources/vue/components/courseware/CoursewareDocumentBlock.vue b/resources/vue/components/courseware/CoursewareDocumentBlock.vue
index 1a271f89c61..e7a6b2c85d7 100755
--- a/resources/vue/components/courseware/CoursewareDocumentBlock.vue
+++ b/resources/vue/components/courseware/CoursewareDocumentBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="hasFile" class="cw-pdf-header cw-block-title">
<button class="cw-pdf-button-prev" :class="{ inactive: pageNum - 1 === 0 }" @click="prevPage" />
<span class="cw-pdf-title">{{ currentTitle }}</span>
diff --git a/resources/vue/components/courseware/CoursewareDownloadBlock.vue b/resources/vue/components/courseware/CoursewareDownloadBlock.vue
index 255ad38758d..592ca4586e2 100755
--- a/resources/vue/components/courseware/CoursewareDownloadBlock.vue
+++ b/resources/vue/components/courseware/CoursewareDownloadBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="currentTitle !== ''" class="cw-block-title">{{ currentTitle }}</div>
<div v-if="currentFile !== null" class="cw-block-download-content">
<div v-if="currentInfo !== '' && !userHasDownloaded" class="messagebox messagebox_info">
diff --git a/resources/vue/components/courseware/CoursewareFolderBlock.vue b/resources/vue/components/courseware/CoursewareFolderBlock.vue
index bcf6ccc5667..66b9ececbc8 100755
--- a/resources/vue/components/courseware/CoursewareFolderBlock.vue
+++ b/resources/vue/components/courseware/CoursewareFolderBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="currentTitle !== ''" class="cw-block-title">{{ currentTitle }}</div>
<ul class="cw-block-folder-list">
<li v-for="file in files" :key="file.id" class="cw-block-folder-file-item">
diff --git a/resources/vue/components/courseware/CoursewareGalleryBlock.vue b/resources/vue/components/courseware/CoursewareGalleryBlock.vue
index cca5b267780..c299527f439 100755
--- a/resources/vue/components/courseware/CoursewareGalleryBlock.vue
+++ b/resources/vue/components/courseware/CoursewareGalleryBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="files.length !== 0" class="cw-block-gallery-content" :style="{ 'max-height': currentHeight + 'px' }">
<div
v-for="(image, index) in files"
diff --git a/resources/vue/components/courseware/CoursewareHeadlineBlock.vue b/resources/vue/components/courseware/CoursewareHeadlineBlock.vue
index 2d28340fa51..c1763cd4a0b 100755
--- a/resources/vue/components/courseware/CoursewareHeadlineBlock.vue
+++ b/resources/vue/components/courseware/CoursewareHeadlineBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="closeEdit"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div
class="cw-block-headline-content"
:class="[currentStyle, currentHeight === 'half' ? 'half' : 'full']"
diff --git a/resources/vue/components/courseware/CoursewareImageMapBlock.vue b/resources/vue/components/courseware/CoursewareImageMapBlock.vue
index 76cbd98ddd3..cb9742c58d9 100755
--- a/resources/vue/components/courseware/CoursewareImageMapBlock.vue
+++ b/resources/vue/components/courseware/CoursewareImageMapBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<img :src="currentUrl" class="cw-image-map-original-img" ref="original_img" @load="buildCanvas" />
<canvas class="cw-image-map-canvas" ref="canvas"></canvas>
<img
diff --git a/resources/vue/components/courseware/CoursewareVideoBlock.vue b/resources/vue/components/courseware/CoursewareVideoBlock.vue
index be2f62e7f34..c5f70b522a1 100755
--- a/resources/vue/components/courseware/CoursewareVideoBlock.vue
+++ b/resources/vue/components/courseware/CoursewareVideoBlock.vue
@@ -9,9 +9,7 @@
@closeEdit="initCurrentData"
>
<template #content>
- <div v-if="showInvalidFolderMessage" class="messagebox messagebox_error">
- {{ invalidFolderMessageText }}
- </div>
+ <courseware-companion-box v-show="showInvalidFolderMessage" :msgCompanion="invalidFolderMessageText" mood="pointing"/>
<div v-if="currentTitle !== '' && currentURL" class="cw-block-title">{{ currentTitle }}</div>
<video
v-show="currentURL"
diff --git a/resources/vue/components/courseware/block-folder-validator-mixin.js b/resources/vue/components/courseware/block-folder-validator-mixin.js
index 2cfb3a399a5..333b6b3e9f1 100644
--- a/resources/vue/components/courseware/block-folder-validator-mixin.js
+++ b/resources/vue/components/courseware/block-folder-validator-mixin.js
@@ -1,4 +1,5 @@
import { mapActions, mapGetters } from 'vuex';
+import CoursewareCompanionBox from './CoursewareCompanionBox.vue';
export const blockFolderValidatorMixin = {
computed: {
@@ -9,6 +10,9 @@ export const blockFolderValidatorMixin = {
return this.$gettext('Der Zugriff auf ausgewählte Datei(en) könnte gesperrt sein!')
}
},
+ components: {
+ CoursewareCompanionBox,
+ },
data() {
return {
showInvalidFolderMessage: false
--
GitLab