Merge branch 'MDL-37845' of git://github.com/timhunt/moodle

This commit is contained in:
Damyon Wiese 2013-04-29 11:45:05 +08:00
commit dd1ab4ae9a
2 changed files with 5 additions and 14 deletions

View file

@ -227,8 +227,8 @@ class qtype_multichoice_single_renderer extends qtype_multichoice_renderer_base
if (question_state::graded_state_for_fraction($ans->fraction) == if (question_state::graded_state_for_fraction($ans->fraction) ==
question_state::$gradedright) { question_state::$gradedright) {
return get_string('correctansweris', 'qtype_multichoice', return get_string('correctansweris', 'qtype_multichoice',
$question->format_text($ans->answer, $ans->answerformat, $question->make_html_inline($question->format_text($ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid)); $qa, 'question', 'answer', $ansid)));
} }
} }
@ -278,8 +278,8 @@ class qtype_multichoice_multi_renderer extends qtype_multichoice_renderer_base {
$right = array(); $right = array();
foreach ($question->answers as $ansid => $ans) { foreach ($question->answers as $ansid => $ans) {
if ($ans->fraction > 0) { if ($ans->fraction > 0) {
$right[] = $question->format_text($ans->answer, $ans->answerformat, $right[] = $question->make_html_inline($question->format_text($ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid); $qa, 'question', 'answer', $ansid));
} }
} }

View file

@ -1,21 +1,12 @@
.que.multichoice .answer .specificfeedback { .que.multichoice .answer .specificfeedback {
display: inline;
padding: 0 0.7em; padding: 0 0.7em;
background: #FFF3BF; background: #FFF3BF;
} }
.que.multichoice .answer .specificfeedback * {
display: inline;
background: #FFF3BF;
}
.que.multichoice .answer .specificfeedback script {
display: none;
}
.que.multichoice .answer div.r0, .que.multichoice .answer div.r0,
.que.multichoice .answer div.r1 { .que.multichoice .answer div.r1 {
padding: 0.3em; padding: 0.3em;
} }
.que.multichoice .feedback .rightanswer * {
display: inline;
}
/* Editing form. */ /* Editing form. */
body#page-question-type-multichoice div[id^=fitem_id_][id*=answer_] { body#page-question-type-multichoice div[id^=fitem_id_][id*=answer_] {