BRANCH MERGE

These are the changes from MOODLE_13_STABLE, merged into trunk

The tag MOODLE_13_MERGED on the MOODLE_13_STABLE branch now refers to this point

The biggest changes here are the fixes for HTML editor in all standard modules
This commit is contained in:
moodler 2004-06-04 06:17:30 +00:00
parent 308214e87e
commit 7613890851
49 changed files with 175 additions and 198 deletions

View file

@ -22,6 +22,8 @@
if (empty($form->deadline)) {
$form->deadline = "";
}
$nohtmleditorneeded = true;
?>
<form name="form" method="post" action="mod.php">
@ -49,7 +51,7 @@
$grades[$i] = $i;
}
choose_from_menu($grades, "grade", "$form->grade", "");
helpbutton("grade", get_string("maximumgrade", "exercise"), "exercise");
helpbutton("grade", get_string("maximumgrade", "exercise"), "exercise");
?>
</td>
</tr>
@ -83,7 +85,7 @@
$numbers[$i] = $i;
}
choose_from_menu($numbers, "nelements", "$form->nelements", "");
helpbutton("nelements", get_string("numberofassessmentelements", "exercise"), "exercise");
helpbutton("nelements", get_string("numberofassessmentelements", "exercise"), "exercise");
?>
</td>
</tr>

View file

@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004013101;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 60;
?>