L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Damyon Wiese
2013-04-29 11:47:02 +08:00
parent 2a6c9c1536 50590afe38
commit 018e8a9ad4
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/multichoice/renderer.php
+4 -4
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) ==
question_state::$gradedright) {
return get_string('correctansweris', 'qtype_multichoice',
$question->format_text($ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid));
$question->make_html_inline($question->format_text($ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid)));
}
}
@@ -278,8 +278,8 @@ class qtype_multichoice_multi_renderer extends qtype_multichoice_renderer_base {
$right = array();
foreach ($question->answers as $ansid => $ans) {
if ($ans->fraction > 0) {
$right[] = $question->format_text($ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid);
$right[] = $question->make_html_inline($question->format_text($ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid));
}
}
question/type/multichoice/styles.css
+1 -10
View File
@@ -1,18 +1,9 @@
.que.multichoice .answer .specificfeedback {
display: inline;
padding: 0 0.7em;
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.r1 {
padding: 0.3em;
}
.que.multichoice .feedback .rightanswer * {
display: inline;
}