mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
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:
parent
308214e87e
commit
7613890851
49 changed files with 175 additions and 198 deletions
|
@ -60,11 +60,25 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr valign=top>
|
||||
<td align=right><p><b><?php print_string("introduction", "quiz") ?>:</b></p></td>
|
||||
<td align=right><p><b><?php print_string("introduction", "quiz") ?>:</b></p>
|
||||
<br />
|
||||
<font size="1">
|
||||
<?php
|
||||
if ($usehtmleditor) {
|
||||
helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
|
||||
} else {
|
||||
helpbutton("text", get_string("helptext"), "moodle", true, true);
|
||||
echo '<br />';
|
||||
emoticonhelpbutton("form", "description");
|
||||
echo '<br />';
|
||||
}
|
||||
?>
|
||||
<br />
|
||||
</font>
|
||||
</td>
|
||||
<td>
|
||||
<textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
|
||||
<?php
|
||||
helpbutton("text", get_string("helptext"));
|
||||
print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro);
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -91,7 +91,7 @@ class quiz_report extends quiz_default_report {
|
|||
$user_resps = qr_quiz_responses($thisquizid);
|
||||
// //print_object($user_resps);
|
||||
foreach($user_resps as $thiskey => $thisresp){
|
||||
$userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=$thisresp->answer;
|
||||
$userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=s($thisresp->answer);
|
||||
$userdata[$thisresp->userid][$thisresp->attemptno]['grade']=$thisresp->sumgrades;
|
||||
$userdata[$thisresp->userid][$thisresp->attemptno]['name']=fullname($thisresp);
|
||||
$userdata[$thisresp->userid][$thisresp->attemptno]['attemptid']=$thisresp->aid;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
$module->version = 2004060200; // The (date) version of this module
|
||||
$module->requires = 2004013101; // Requires this Moodle version
|
||||
$module->requires = 2004052501; // Requires this Moodle version
|
||||
$module->cron = 0; // How often should cron check this module (seconds)?
|
||||
|
||||
?>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue