Skip to content

Commit c500802

Browse files
committed
Miscelaneous fixes
Align padding-bottom of question card with designs. Fix lack of imageProcessor prop for TipTapEditor components. Added a bit of padding to validation errors
1 parent 7d576d1 commit c500802

2 files changed

Lines changed: 19 additions & 5 deletions

File tree

contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,13 @@
230230
231231
.question-card-body {
232232
min-width: 0;
233-
padding: 10px var(--question-card-horizontal-padding);
233+
padding: 10px var(--question-card-horizontal-padding) 16px;
234234
}
235235
236236
.question-card-footer {
237237
display: flex;
238238
justify-content: flex-end;
239-
padding: 0 var(--question-card-horizontal-padding) 20px;
239+
padding: 0 var(--question-card-horizontal-padding) 16px;
240240
}
241241
242242
</style>

contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionEditor.vue

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
format="html"
2929
:minHeight="'80px'"
3030
:autofocus="mode === 'edit' && isQuestionOpen"
31+
:imageProcessor="EditorImageProcessor"
3132
class="editor"
3233
@update="setPrompt"
3334
@minimize="closeQuestion"
@@ -104,7 +105,7 @@
104105
<template v-else>
105106
<KRadioButton
106107
v-if="isSingleSelect"
107-
:currentValue="correctChoiceId"
108+
:currentValue="correctChoiceId || ''"
108109
:buttonValue="choice.id"
109110
:label="markCorrectLabel$()"
110111
:showLabel="false"
@@ -133,6 +134,7 @@
133134
format="html"
134135
:minHeight="'80px'"
135136
:autofocus="isChoiceOpen(choice.id)"
137+
:imageProcessor="EditorImageProcessor"
136138
class="editor"
137139
@update="html => setChoiceContent(choice.id, html)"
138140
@minimize="closeChoice"
@@ -150,10 +152,16 @@
150152
</div>
151153
</div>
152154
<!-- Per-choice validation messages sit INSIDE the bordered card -->
153-
<ValidationMessage v-if="emptyChoiceIds.has(choice.id)">
155+
<ValidationMessage
156+
v-if="emptyChoiceIds.has(choice.id)"
157+
class="choice-validation-message"
158+
>
154159
{{ errorEmptyChoiceContent$() }}
155160
</ValidationMessage>
156-
<ValidationMessage v-if="duplicateChoiceIds.has(choice.id)">
161+
<ValidationMessage
162+
v-if="duplicateChoiceIds.has(choice.id)"
163+
class="choice-validation-message"
164+
>
157165
{{ errorDuplicateChoiceContent$() }}
158166
</ValidationMessage>
159167
</div>
@@ -194,6 +202,7 @@
194202
import CollapsibleToolbar from '../../components/CollapsibleToolbar/index.vue';
195203
import ValidationMessage from '../../components/ValidationMessage/index.vue';
196204
import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor';
205+
import EditorImageProcessor from 'shared/views/TipTapEditor/TipTapEditor/services/imageService';
197206
198207
export default {
199208
name: 'ChoiceInteractionEditor',
@@ -465,6 +474,7 @@
465474
}
466475
467476
return {
477+
EditorImageProcessor,
468478
promptWrapperClass,
469479
promptWrapperStyle,
470480
state,
@@ -597,6 +607,10 @@
597607
}
598608
}
599609
610+
.choice-validation-message {
611+
padding: 7.5px;
612+
}
613+
600614
/* Flex row: [selection] [content] [actions] */
601615
.choice-layout {
602616
display: flex;

0 commit comments

Comments
 (0)