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

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

Browse Source
This commit is contained in:
Sam Hemelryk
2011-06-20 15:51:59 +08:00
parent fe70d8814b 2d6829727d
commit 8a322fc19b
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/behaviour/rendererbase.php
+31 -7
View File
@@ -69,16 +69,40 @@ abstract class qbehaviour_renderer extends plugin_renderer_base {
}
public function manual_comment_fields(question_attempt $qa, question_display_options $options) {
$commentfield = $qa->get_behaviour_field_name('comment');
$inputname = $qa->get_behaviour_field_name('comment');
$id = $inputname . '_id';
list($commenttext, $commentformat) = $qa->get_manual_comment();
$comment = print_textarea(can_use_html_editor(), 10, 80, null, null,
$commentfield, $commenttext, 0, true);
$editor = editors_get_preferred_editor($commentformat);
$strformats = format_text_menu();
$formats = $editor->get_supported_formats();
foreach ($formats as $fid) {
$formats[$fid] = $strformats[$fid];
}
$commenttext = format_text($commenttext, $commentformat, array('para' => false));
$editor->use_editor($id, array('context' => $options->context));
$commenteditor = html_writer::tag('div', html_writer::tag('textarea', s($commenttext),
array('id' => $id, 'name' => $inputname, 'rows' => 10, 'cols' => 60)));
$commenteditor .= html_writer::start_tag('div');
if (count($formats == 1)) {
reset($formats);
$commenteditor .= html_writer::empty_tag('input', array('type' => 'hidden',
'name' => $inputname . 'format', 'value' => key($formats)));
} else {
$commenteditor .= html_writer::select(
$formats, $inputname . 'format', $commentformat, '');
}
$commenteditor .= html_writer::end_tag('div');
$comment = html_writer::tag('div', html_writer::tag('div',
html_writer::tag('label', get_string('comment', 'question'),
array('for' => $commentfield)), array('class' => 'fitemtitle')) .
html_writer::tag('div', $comment, array('class' => 'felement fhtmleditor')),
array('for' => $id)), array('class' => 'fitemtitle')) .
html_writer::tag('div', $commenteditor, array('class' => 'felement fhtmleditor')),
array('class' => 'fitem'));
$mark = '';
question/type/essay/renderer.php
+2 -2
View File
@@ -189,8 +189,8 @@ class qtype_essay_format_editor_renderer extends plugin_renderer_base {
}
public function response_area_input($name, $qa, $step, $lines, $context) {
global $CFG, $PAGE;
require_once($CFG->dirroot.'/repository/lib.php');
global $CFG;
require_once($CFG->dirroot . '/repository/lib.php');
$inputname = $qa->get_qt_field_name($name);
$responseformat = $step->get_qt_var($name . 'format');