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

MDL-25899 Lesson: fixed page content rendering

Browse Source 
Form element 'header' used to be used for rendering the page contents.
This led to layout problems in non-gecko browsers. This patch fixes the
issue by using raw 'html' element to render the page contents.
This commit is contained in:
David Mudrak
2011-02-18 11:43:24 +01:00
parent c76cd2ede1
commit ffdf7f8a24
6 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/pagetypes/essay.php
+4 -2
View File
@@ -252,7 +252,9 @@ class lesson_display_answer_form_essay extends moodleform {
$mform = $this->_form;
$contents = $this->_customdata['contents'];
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass;
$options->para = false;
@@ -270,4 +272,4 @@ class lesson_display_answer_form_essay extends moodleform {
$this->add_action_buttons(null, get_string("pleaseenteryouranswerinthebox", "lesson"));
}
}
}
mod/lesson/pagetypes/matching.php
+4 -2
View File
@@ -483,7 +483,9 @@ class lesson_display_answer_form_matching extends moodleform {
$lessonid = $this->_customdata['lessonid'];
$contents = $this->_customdata['contents'];
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass;
$options->para = false;
@@ -514,4 +516,4 @@ class lesson_display_answer_form_matching extends moodleform {
$this->add_action_buttons(null, get_string("pleasematchtheabovepairs", "lesson"));
}
}
}
mod/lesson/pagetypes/multichoice.php
+7 -2
View File
@@ -485,7 +485,10 @@ class lesson_display_answer_form_multichoice_singleanswer extends moodleform {
$attempt = new stdClass();
$attempt->answerid = null;
}
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass;
$options->para = false;
@@ -524,7 +527,9 @@ class lesson_display_answer_form_multichoice_multianswer extends moodleform {
$lessonid = $this->_customdata['lessonid'];
$contents = $this->_customdata['contents'];
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass;
$options->para = false;
mod/lesson/pagetypes/numerical.php
+4 -2
View File
@@ -264,7 +264,9 @@ class lesson_display_answer_form_numerical extends moodleform {
$mform = $this->_form;
$contents = $this->_customdata['contents'];
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass;
$options->para = false;
@@ -282,4 +284,4 @@ class lesson_display_answer_form_numerical extends moodleform {
$this->add_action_buttons(null, get_string("pleaseenteryouranswerinthebox", "lesson"));
}
}
}
mod/lesson/pagetypes/shortanswer.php
+3 -1
View File
@@ -331,7 +331,9 @@ class lesson_display_answer_form_shortanswer extends moodleform {
$mform = $this->_form;
$contents = $this->_customdata['contents'];
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass;
$options->para = false;
mod/lesson/pagetypes/truefalse.php
+4 -2
View File
@@ -299,7 +299,9 @@ class lesson_display_answer_form_truefalse extends moodleform {
$attempt->answerid = null;
}
$mform->addElement('header', 'pageheader', $OUTPUT->box($contents, 'contents'));
$mform->addElement('header', 'pageheader');
$mform->addElement('html', $OUTPUT->container($contents, 'contents'));
$options = new stdClass();
$options->para = false;
@@ -326,4 +328,4 @@ class lesson_display_answer_form_truefalse extends moodleform {
$this->add_action_buttons(null, get_string("pleasecheckoneanswer", "lesson"));
}
}
}