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

This commit is contained in:
Sam Hemelryk 2011-08-02 17:14:04 +08:00
commit 87573744e6
2 changed files with 13 additions and 15 deletions

View File

@ -534,23 +534,20 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete, $reordertool,
$reordercheckboxlabel = '<label for="s' . $question->id . '">';
$reordercheckboxlabelclose = '</label>';
}
if (!$quiz->shufflequestions) {
// Print and increment question number
$questioncountstring = '';
if ($questioncount>999 || ($reordertool && $questioncount>99)) {
$questioncountstring =
"$reordercheckboxlabel<small>$questioncount</small>" .
$reordercheckboxlabelclose . $reordercheckbox;
} else {
$questioncountstring = $reordercheckboxlabel . $questioncount .
$reordercheckboxlabelclose . $reordercheckbox;
}
echo $questioncountstring;
$qno += $question->length;
if ($question->length == 0) {
$qnodisplay = get_string('infoshort', 'quiz');
} else if ($quiz->shufflequestions) {
$qnodisplay = '?';
} else {
echo "$reordercheckboxlabel ? $reordercheckboxlabelclose" .
" $reordercheckbox";
if ($qno > 999 || ($reordertool && $qno > 99)) {
$qnodisplay = html_writer::tag('small', $qno);
} else {
$qnodisplay = $qno;
}
$qno += $question->length;
}
echo $reordercheckboxlabel . $qnodisplay . $reordercheckboxlabelclose .
$reordercheckbox;
?>
</div>

View File

@ -374,6 +374,7 @@ bank window's title is prominent enough*/
.ie6#page-mod-quiz-edit div.question div.content .questionname {width:20%;}
.ie6#page-mod-quiz-edit .editq div.question div.content .randomquestioncategory a{width:40%;}
.ie6#page-mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{width: 35%;}
.qnum label {padding-right: 0.25em;}
/** settings.php */
#adminquizreviewoptions {margin-bottom: 0.5em;}