Permalink
Browse files

Merge branch 'MDL-35858-22' of git://github.com/FMCorz/moodle into MO…

…ODLE_22_STABLE
  • Loading branch information...
2 parents 61560ab + 2f0b51b commit f06b2de39ed21d5c1b14945ed3e981717661cf9a @stronk7 stronk7 committed Oct 12, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 question/type/multianswer/module.js
  2. +4 −2 question/type/multianswer/renderer.php
@@ -27,7 +27,7 @@ M.qtype_multianswer = M.qtype_multianswer || {};
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');
if (!feedbackspan) {
return;
@@ -227,12 +227,13 @@ public function subquestion(question_attempt $qa, question_display_options $opti
$qa, 'question', 'answerfeedback', $matchinganswer->id),
s($correctanswer->answer), $options);
- $output = '';
+ $output = html_writer::start_tag('span', array('class' => 'subquestion'));
$output .= html_writer::tag('label', get_string('answer'),
array('class' => 'subq accesshide', 'for' => $inputattributes['id']));
$output .= html_writer::empty_tag('input', $inputattributes);
$output .= $feedbackimg;
$output .= $feedbackpopup;
+ $output .= html_writer::end_tag('span');
return $output;
}
@@ -293,12 +294,13 @@ public function subquestion(question_attempt $qa, question_display_options $opti
$subq->format_text($rightanswer->answer, $rightanswer->answerformat,
$qa, 'question', 'answer', $rightanswer->id), $options);
- $output = '';
+ $output = html_writer::start_tag('span', array('class' => 'subquestion'));
$output .= html_writer::tag('label', get_string('answer'),
array('class' => 'subq accesshide', 'for' => $inputattributes['id']));
$output .= $select;
$output .= $feedbackimg;
$output .= $feedbackpopup;
+ $output .= html_writer::end_tag('span');
return $output;
}

0 comments on commit f06b2de

Please sign in to comment.