Merge branch 'MDL-69841-master' of https://github.com/HuongNV13/moodle

This commit is contained in:
Jake Dallimore 2020-11-10 09:32:34 +08:00
commit 5365057493
4 changed files with 21 additions and 6 deletions

View file

@ -378,11 +378,13 @@ class mod_quiz_mod_form extends moodleform_mod {
list($identifier, $component) = $string; list($identifier, $component) = $string;
$label = get_string($identifier, $component); $label = get_string($identifier, $component);
$group[] = $mform->createElement('html', html_writer::start_div('review_option_item'));
$el = $mform->createElement('checkbox', $field . $whenname, '', $label);
if ($withhelp) { if ($withhelp) {
$label .= ' ' . $OUTPUT->help_icon($identifier, $component); $el->_helpbutton = $OUTPUT->render(new help_icon($identifier, $component));
} }
$group[] = $el;
$group[] = $mform->createElement('checkbox', $field . $whenname, '', $label); $group[] = $mform->createElement('html', html_writer::end_div());
} }
$mform->addGroup($group, $whenname . 'optionsgrp', $mform->addGroup($group, $whenname . 'optionsgrp',
get_string('review' . $whenname, 'quiz'), null, false); get_string('review' . $whenname, 'quiz'), null, false);

View file

@ -1159,11 +1159,16 @@ div#dock {
clear: left; clear: left;
} }
#page-mod-quiz-mod #id_reviewoptionshdr .form-check { #page-mod-quiz-mod #id_reviewoptionshdr .form-check {
width: 90%; width: auto;
height: 22px; height: 22px;
justify-content: flex-start; justify-content: flex-start;
} }
#page-mod-quiz-mod #id_reviewoptionshdr .review_option_item {
width: 90%;
height: 22px;
}
// Question navigation block. // Question navigation block.
.path-mod-quiz #mod_quiz_navblock { .path-mod-quiz #mod_quiz_navblock {
.qnbutton { .qnbutton {

View file

@ -17478,10 +17478,14 @@ div#dock {
clear: left; } clear: left; }
#page-mod-quiz-mod #id_reviewoptionshdr .form-check { #page-mod-quiz-mod #id_reviewoptionshdr .form-check {
width: 90%; width: auto;
height: 22px; height: 22px;
justify-content: flex-start; } justify-content: flex-start; }
#page-mod-quiz-mod #id_reviewoptionshdr .review_option_item {
width: 90%;
height: 22px; }
.path-mod-quiz #mod_quiz_navblock .qnbutton { .path-mod-quiz #mod_quiz_navblock .qnbutton {
text-decoration: none; text-decoration: none;
font-size: 14px; font-size: 14px;

View file

@ -17705,10 +17705,14 @@ div#dock {
clear: left; } clear: left; }
#page-mod-quiz-mod #id_reviewoptionshdr .form-check { #page-mod-quiz-mod #id_reviewoptionshdr .form-check {
width: 90%; width: auto;
height: 22px; height: 22px;
justify-content: flex-start; } justify-content: flex-start; }
#page-mod-quiz-mod #id_reviewoptionshdr .review_option_item {
width: 90%;
height: 22px; }
.path-mod-quiz #mod_quiz_navblock .qnbutton { .path-mod-quiz #mod_quiz_navblock .qnbutton {
text-decoration: none; text-decoration: none;
font-size: 14px; font-size: 14px;