moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-35858-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-10-12 02:18:03 +02:00
commit f2c33d0b69
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
question/type/multianswer/module.js
View file

@ -27,7 +27,7 @@ M.qtype_multianswer = M.qtype_multianswer || {};
M.qtype_multianswer.init = function (Y, questiondiv) { M.qtype_multianswer.init = function (Y, questiondiv) {
Y.one(questiondiv).all('label.subq').each(function(subqspan, i) { Y.one(questiondiv).all('span.subquestion').each(function(subqspan, i) {
var feedbackspan = subqspan.one('.feedbackspan'); var feedbackspan = subqspan.one('.feedbackspan');
if (!feedbackspan) { if (!feedbackspan) {
return; return;

6
question/type/multianswer/renderer.php
View file

@ -227,12 +227,13 @@ class qtype_multianswer_textfield_renderer extends qtype_multianswer_subq_render
$qa, 'question', 'answerfeedback', $matchinganswer->id), $qa, 'question', 'answerfeedback', $matchinganswer->id),
s($correctanswer->answer), $options); s($correctanswer->answer), $options);
$output = ''; $output = html_writer::start_tag('span', array('class' => 'subquestion'));
$output .= html_writer::tag('label', get_string('answer'), $output .= html_writer::tag('label', get_string('answer'),
array('class' => 'subq accesshide', 'for' => $inputattributes['id'])); array('class' => 'subq accesshide', 'for' => $inputattributes['id']));
$output .= html_writer::empty_tag('input', $inputattributes); $output .= html_writer::empty_tag('input', $inputattributes);
$output .= $feedbackimg; $output .= $feedbackimg;
$output .= $feedbackpopup; $output .= $feedbackpopup;
$output .= html_writer::end_tag('span');
return $output; return $output;
} }
@ -294,12 +295,13 @@ class qtype_multianswer_multichoice_inline_renderer
$subq->format_text($rightanswer->answer, $rightanswer->answerformat, $subq->format_text($rightanswer->answer, $rightanswer->answerformat,
$qa, 'question', 'answer', $rightanswer->id), $options); $qa, 'question', 'answer', $rightanswer->id), $options);
$output = ''; $output = html_writer::start_tag('span', array('class' => 'subquestion'));
$output .= html_writer::tag('label', get_string('answer'), $output .= html_writer::tag('label', get_string('answer'),
array('class' => 'subq accesshide', 'for' => $inputattributes['id'])); array('class' => 'subq accesshide', 'for' => $inputattributes['id']));
$output .= $select; $output .= $select;
$output .= $feedbackimg; $output .= $feedbackimg;
$output .= $feedbackpopup; $output .= $feedbackpopup;
$output .= html_writer::end_tag('span');
return $output; return $output;
} }