From 855c75eb4f208b0fd4425b41a87c827808986f6a Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 4 Jan 2023 11:44:39 +0000
Subject: [PATCH] fix #1919
Closes #1919
Merge request studip/studip!1277
---
.../assets/stylesheets/scss/courseware.scss | 5 +-
.../CoursewareStructuralElement.vue | 56 +++++++++----------
2 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/resources/assets/stylesheets/scss/courseware.scss b/resources/assets/stylesheets/scss/courseware.scss
index d006d6cc513..f7d2e6e4f31 100644
--- a/resources/assets/stylesheets/scss/courseware.scss
+++ b/resources/assets/stylesheets/scss/courseware.scss
@@ -2025,10 +2025,9 @@ c o m p a n i o n o v e r l a y
}
}
-.cw-container-wrapper {
- .cw-companion-box-wrapper {
+.cw-companion-box-wrapper {
width: 100%;
- }
+ max-width: 1095px;
}
/* * * * * * * * * * * * * * * * * *
diff --git a/resources/vue/components/courseware/CoursewareStructuralElement.vue b/resources/vue/components/courseware/CoursewareStructuralElement.vue
index c45e8532b92..148b4f58a60 100644
--- a/resources/vue/components/courseware/CoursewareStructuralElement.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElement.vue
@@ -66,6 +66,31 @@
/>
</template>
</courseware-ribbon>
+
+ <div v-if="structuralElementLoaded && !isLink" class="cw-companion-box-wrapper">
+ <courseware-companion-box
+ v-if="!canVisit"
+ mood="sad"
+ :msgCompanion="$gettext('Diese Seite steht Ihnen leider nicht zur Verfügung.')"
+ />
+ <courseware-companion-box
+ v-if="blockedByAnotherUser"
+ :msgCompanion="$gettextInterpolate($gettext('Die Einstellungen dieser Seite werden im Moment von %{blockingUserName} bearbeitet'), {blockingUserName: blockingUserName})"
+ mood="pointing"
+ >
+ <template #companionActions>
+ <button v-if="userIsTeacher" class="button" @click="menuAction('removeLock')">
+ {{ textRemoveLock.title }}
+ </button>
+ </template>
+ </courseware-companion-box>
+ <courseware-empty-element-box
+ v-if="showEmptyElementBox"
+ :canEdit="canEdit"
+ :noContainers="noContainers"
+ />
+ <courseware-wellcome-screen v-if="noContainers && isRoot && canEdit" />
+ </div>
<div
v-if="canVisit && !editView && !isLink"
@@ -75,25 +100,6 @@
'cw-container-wrapper-discuss': discussView,
}"
>
- <div v-if="structuralElementLoaded" class="cw-companion-box-wrapper">
- <courseware-companion-box
- v-if="blockedByAnotherUser"
- :msgCompanion="$gettextInterpolate($gettext('Die Einstellungen dieser Seite werden im Moment von %{blockingUserName} bearbeitet'), {blockingUserName: blockingUserName})"
- mood="pointing"
- >
- <template #companionActions>
- <button v-if="userIsTeacher" class="button" @click="menuAction('removeLock')">
- {{ textRemoveLock.title }}
- </button>
- </template>
- </courseware-companion-box>
- <courseware-empty-element-box
- v-if="showEmptyElementBox"
- :canEdit="canEdit"
- :noContainers="noContainers"
- />
- <courseware-wellcome-screen v-if="noContainers && isRoot && canEdit" />
- </div>
<courseware-structural-element-discussion
v-if="!noContainers && discussView"
:structuralElement="structuralElement"
@@ -184,18 +190,6 @@
</template>
<studip-progress-indicator v-if="processing" :description="$gettext('Vorgang wird bearbeitet...')" />
</div>
- <div
- v-if="!canVisit"
- class="cw-container-wrapper"
- :class="{ 'cw-container-wrapper-consume': consumeMode }"
- >
- <div v-if="structuralElementLoaded" class="cw-companion-box-wrapper">
- <courseware-companion-box
- mood="sad"
- :msgCompanion="$gettext('Diese Seite steht Ihnen leider nicht zur Verfügung.')"
- />
- </div>
- </div>
</div>
<studip-dialog
--
GitLab