Merge branch 'MDL-39262' of git://github.com/jmvedrine/moodle

This commit is contained in:
David Monllao 2015-03-10 10:12:44 +08:00
commit 660ca679f7
6 changed files with 21 additions and 0 deletions

View File

@ -318,6 +318,9 @@ class lesson_display_answer_form_essay extends moodleform {
}
}
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));

View File

@ -533,6 +533,9 @@ class lesson_display_answer_form_matching extends moodleform {
$lessonid = $this->_customdata['lessonid'];
$contents = $this->_customdata['contents'];
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));

View File

@ -488,6 +488,9 @@ class lesson_display_answer_form_multichoice_singleanswer extends moodleform {
$attempt->answerid = null;
}
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
@ -541,6 +544,9 @@ class lesson_display_answer_form_multichoice_multianswer extends moodleform {
$lessonid = $this->_customdata['lessonid'];
$contents = $this->_customdata['contents'];
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));

View File

@ -276,6 +276,9 @@ class lesson_display_answer_form_numerical extends moodleform {
$mform = $this->_form;
$contents = $this->_customdata['contents'];
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));

View File

@ -369,6 +369,9 @@ class lesson_display_answer_form_shortanswer extends moodleform {
$attrs['size'] = round(strlen($placeholder) * 1.1);
}
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);

View File

@ -382,6 +382,9 @@ class lesson_display_answer_form_truefalse extends moodleform {
$attempt->answerid = null;
}
// Disable shortforms.
$mform->setDisableShortforms();
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));