From 42bc31d41562a54baadf4ce42400ecff1067ed33 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 2 Mar 2022 16:51:25 +0000
Subject: [PATCH] fixes biest #740 - merge related courseware issues
---
.../assets/stylesheets/scss/courseware.scss | 2 +-
.../courseware/CoursewareExportWidget.vue | 15 ---------------
.../courseware/CoursewareStructuralElement.vue | 17 +++++++----------
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/resources/assets/stylesheets/scss/courseware.scss b/resources/assets/stylesheets/scss/courseware.scss
index 4aee207bbef..f9194ec4c9f 100755
--- a/resources/assets/stylesheets/scss/courseware.scss
+++ b/resources/assets/stylesheets/scss/courseware.scss
@@ -1699,7 +1699,7 @@ v i e w w i d g e t
.cw-export-widget-export{
@include background-icon(export, clickable);
}
- .cw-action-widget-oer{
+ .cw-export-widget-oer{
@include background-icon(oer-campus, clickable);
}
}
diff --git a/resources/vue/components/courseware/CoursewareExportWidget.vue b/resources/vue/components/courseware/CoursewareExportWidget.vue
index e9c54dcda42..8a08f4bc910 100644
--- a/resources/vue/components/courseware/CoursewareExportWidget.vue
+++ b/resources/vue/components/courseware/CoursewareExportWidget.vue
@@ -5,11 +5,6 @@
<translate>Seite exportieren</translate>
</a>
</li>
- <li v-if="canVisit" class="cw-export-widget-export-pdf">
- <a :href="pdfExportURL">
- <translate>Seite als pdf-Dokument exportieren</translate>
- </a>
- </li>
<li v-if="oerEnabled" class="cw-export-widget-oer">
<a href="#" @click="oerElement">
<translate>Seite auf %{oerTitle} veröffentlichen</translate>
@@ -32,16 +27,6 @@ export default {
oerEnabled: 'oerEnabled',
oerTitle: 'oerTitle',
}),
- pdfExportURL() {
- if (this.context.type === 'users') {
- return STUDIP.URLHelper.getURL('dispatch.php/contents/courseware/pdf_export/' + this.structuralElement.id);
- }
- if (this.context.type === 'courses') {
- return STUDIP.URLHelper.getURL('dispatch.php/course/courseware/pdf_export/' + this.structuralElement.id);
- }
-
- return '';
- },
},
methods: {
...mapActions({
diff --git a/resources/vue/components/courseware/CoursewareStructuralElement.vue b/resources/vue/components/courseware/CoursewareStructuralElement.vue
index 68f58ea812f..d1a77964e9a 100755
--- a/resources/vue/components/courseware/CoursewareStructuralElement.vue
+++ b/resources/vue/components/courseware/CoursewareStructuralElement.vue
@@ -7,7 +7,7 @@
v-if="validContext"
>
<div class="cw-structural-element-content" v-if="structuralElement">
- <courseware-ribbon :canEdit="canEdit && canAddElements">
+ <courseware-ribbon :canEdit="canEdit">
<template #buttons>
<router-link v-if="prevElement" :to="'/structural_element/' + prevElement.id">
<div class="cw-ribbon-button cw-ribbon-button-prev" :title="textRibbon.perv" />
@@ -66,30 +66,27 @@
v-if="canVisit"
class="cw-container-wrapper"
:class="{
- 'cw-container-wrapper-consume': consumeMode,
- 'cw-container-wrapper-discuss': discussView,
+ 'cw-container-wrapper-consume': consumeMode
}"
>
<div v-if="structuralElementLoaded" class="cw-companion-box-wrapper">
<courseware-empty-element-box
- v-if="showEmptyElementBox"
+ v-if="
+ (empty && !isRoot && canEdit) ||
+ (empty && !canEdit) ||
+ (!noContainers && empty && isRoot && canEdit)
+ "
:canEdit="canEdit"
:noContainers="noContainers"
/>
<courseware-wellcome-screen v-if="noContainers && isRoot && canEdit" />
</div>
- <courseware-structural-element-discussion
- v-if="!noContainers && discussView"
- :structuralElement="structuralElement"
- :canEdit="canEdit"
- />
<component
v-for="container in containers"
:key="container.id"
:is="containerComponent(container)"
:container="container"
:canEdit="canEdit"
- :canAddElements="canAddElements"
:isTeacher="userIsTeacher"
class="cw-container-item"
/>
--
GitLab