merging changes from MOODLE_16_STABLE

This commit is contained in:
skodak 2006-07-31 18:10:02 +00:00
parent 889e6b46f4
commit a8ff58dd2c
7 changed files with 147 additions and 137 deletions

View file

@ -1306,6 +1306,12 @@
case LESSON_ENDOFBRANCH :
echo get_string("endofbranch", "lesson");
break;
case LESSON_CLUSTER :
echo get_string("clustertitle", "lesson");
break;
case LESSON_ENDOFCLUSTER :
echo get_string("endofclustertitle", "lesson");
break;
}
echo "</b></td></tr>\n";
$i = 1;
@ -1436,7 +1442,11 @@
echo "$jumptitle</td></tr>\n";
}
} else {
if ($lesson->custom && $page->qtype != LESSON_BRANCHTABLE && $page->qtype != LESSON_ENDOFBRANCH) {
if ($lesson->custom and
$page->qtype != LESSON_BRANCHTABLE and
$page->qtype != LESSON_ENDOFBRANCH and
$page->qtype != LESSON_CLUSTER and
$page->qtype != LESSON_ENDOFCLUSTER) {
echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("score", "lesson")." $i:";
echo "</b></td><td width=\"80%\">\n";
echo "$answer->score</td></tr>\n";