mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

MDL-72667 lesson: improve colour contrast of correct text

Browse Source
This commit is contained in:
Simey Lameze 2021-10-06 12:37:12 +08:00
parent 217d5c4183
commit 91f5136363
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mod/lesson/pagetypes/multichoice.php
View File

@ -343,6 +343,8 @@ class lesson_page_type_multichoice extends lesson_page {
$formattextdefoptions->context = $answerpage->context;
foreach ($answers as $answer) {
$answertext = format_text($answer->answer,$answer->answerformat,$formattextdefoptions);
$correctresponsetext = html_writer::div(get_string('correctresponse', 'lesson'), 'badge badge-success');
if ($this->properties->qoption) {
if ($useranswer == null) {
$userresponse = array();
@ -376,12 +378,11 @@ class lesson_page_type_multichoice extends lesson_page {
// unchecked
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
$answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
$data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
} else {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
$data = $answercontent;
}
} else {
if ($useranswer != null and $answer->id == $useranswer->answerid) {
@ -407,12 +408,11 @@ class lesson_page_type_multichoice extends lesson_page {
// unchecked
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
$answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$answertext = $checkboxelement . format_text($answer->answer, FORMAT_MOODLE, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
$data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
} else {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
$data = $answercontent;
}
}
if (isset($pagestats[$this->properties->id][$answer->id])) {

16
mod/lesson/pagetypes/truefalse.php
View File

@ -259,6 +259,8 @@ class lesson_page_type_truefalse extends lesson_page {
foreach ($answers as $answer) {
$answer = parent::rewrite_answers_urls($answer);
$answertext = format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$correctresponsetext = html_writer::div(get_string('correctresponse', 'lesson'), 'badge badge-success');
if ($this->properties->qoption) {
if ($useranswer == null) {
$userresponse = array();
@ -292,12 +294,11 @@ class lesson_page_type_truefalse extends lesson_page {
// unchecked
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
$answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
$data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
} else {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
$data = $answercontent;
}
} else {
if ($useranswer != null and $answer->id == $useranswer->answerid) {
@ -323,12 +324,11 @@ class lesson_page_type_truefalse extends lesson_page {
// unchecked
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
$answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
$data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
} else {
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
$data = $answercontent;
}
}
if (isset($pagestats[$this->properties->id][$answer->id])) {

4
mod/lesson/report.php
View File

@ -291,7 +291,7 @@ if ($action === 'delete') {
$table->head = array();
$table->align = array('right', 'left');
$table->attributes['class'] = 'generaltable';
$table->attributes['class'] = 'table table-striped';
if (empty($userstats->gradeinfo)) {
$table->align = array("center");
@ -317,7 +317,7 @@ if ($action === 'delete') {
foreach ($answerpages as $page) {
$table->align = array('left', 'left');
$table->size = array('70%', null);
$table->attributes['class'] = 'generaltable';
$table->attributes['class'] = 'table table-striped';
unset($table->data);
if ($page->grayout) { // set the color of text
$fontstart = html_writer::start_tag('span', array('class' => 'dimmed_text'));