From 4ee2b8de76be9943a08a842f076c35039de6818c Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 26 Jun 2023 13:09:02 +0000
Subject: [PATCH] fix #2114
Closes #2114
Merge request studip/studip!1876
---
.../assets/stylesheets/scss/courseware.scss | 11 ++++------
.../courseware/CoursewareConfirmBlock.vue | 22 +++++++++----------
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/resources/assets/stylesheets/scss/courseware.scss b/resources/assets/stylesheets/scss/courseware.scss
index bcde924de3f..08e8811d604 100644
--- a/resources/assets/stylesheets/scss/courseware.scss
+++ b/resources/assets/stylesheets/scss/courseware.scss
@@ -3173,14 +3173,11 @@ c o n f i r m b l o c k
.cw-block-confirm-content{
border: solid thin $content-color-40;
padding: 1em;
- display: flex;
- .cw-block-confirm-checkbox img{
+ margin: 0;
+
+ input[type=checkbox] {
margin-right: 2em;
- vertical-align: middle;
- height: 100%;
- }
- .cw-block-confirm-text {
- margin: 0;
+ vertical-align: bottom;
}
}
}
diff --git a/resources/vue/components/courseware/CoursewareConfirmBlock.vue b/resources/vue/components/courseware/CoursewareConfirmBlock.vue
index d3d04dd0076..58dbc685025 100644
--- a/resources/vue/components/courseware/CoursewareConfirmBlock.vue
+++ b/resources/vue/components/courseware/CoursewareConfirmBlock.vue
@@ -14,15 +14,12 @@
<div class="cw-block-title">
{{ $gettext('Bestätigung') }}
</div>
- <div class="cw-block-confirm-content">
- <div class="cw-block-confirm-checkbox">
- <studip-icon v-if="!confirm" shape="checkbox-unchecked" role="info" @click="setConfirm" />
- <studip-icon v-if="confirm" shape="checkbox-checked" role="info" />
- </div>
- <p class="cw-block-confirm-text">
- {{ currentText }}
- </p>
- </div>
+ <form class="default cw-block-confirm-content" prevent.default="">
+ <label>
+ <input type="checkbox" :disabled="confirm" :checked="confirm" @click="setConfirm"/>
+ <span>{{ currentText }}</span>
+ </label>
+ </form>
</template>
<template v-if="canEdit" #edit>
<form class="default" @submit.prevent="">
@@ -41,14 +38,12 @@
import CoursewareDefaultBlock from './CoursewareDefaultBlock.vue';
import { mapActions, mapGetters } from 'vuex';
import { blockMixin } from './block-mixin.js';
-import StudipIcon from '../StudipIcon.vue';
export default {
name: 'courseware-confirm-block',
mixins: [blockMixin],
components: {
- CoursewareDefaultBlock,
- StudipIcon,
+ CoursewareDefaultBlock
},
props: {
block: Object,
@@ -88,6 +83,9 @@ export default {
}
},
async setConfirm() {
+ if (this.confirm) {
+ return;
+ }
let data = {};
data.type = 'courseware-user-data-fields';
data.id = this.block.relationships['user-data-field'].data.id;
--
GitLab