From 45c4a5c770223b251bedd4db0c2828a2feea14dc Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Mon, 5 Jul 2010 16:55:39 +0000 Subject: [PATCH] quiz MDL-21533 remove all mention of overlib from the quiz, by moving necessary code to qtype_multianswer, which is the only place it is used. --- mod/quiz/attempt.php | 5 ----- mod/quiz/report/grading/report.php | 6 ------ mod/quiz/review.php | 4 ---- mod/quiz/reviewquestion.php | 4 ---- question/type/multianswer/questiontype.php | 18 +++++++++++++----- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index c7f95d87d73..80e8dac47cb 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -87,10 +87,6 @@ $attemptobj->load_question_states($questionids); /// Print the quiz page //////////////////////////////////////////////////////// - $PAGE->requires->js('/lib/overlib/overlib.js', true); - $PAGE->requires->js('/lib/overlib/overlib_cssstyle.js', true); - - // Arrange for the navigation to be displayed. $navbc = $attemptobj->get_navigation_panel('quiz_attempt_nav_panel', $page); @@ -112,7 +108,6 @@ $PAGE->set_title(format_string($attemptobj->get_quiz_name())); echo $OUTPUT->header(); } - echo ''; // for overlib if ($attemptobj->is_preview_user()) { diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php index 3fccd575b1e..af1905918ca 100644 --- a/mod/quiz/report/grading/report.php +++ b/mod/quiz/report/grading/report.php @@ -53,12 +53,8 @@ class quiz_grading_report extends quiz_default_report { $viewoptions += array('gradenextungraded'=> $gradenextungraded); } - $this->cm = $cm; - echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib.js'); - echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib_cssstyle.js'); - $this->print_header_and_tabs($cm, $course, $quiz, $reportmode="grading"); // Check permissions @@ -110,8 +106,6 @@ class quiz_grading_report extends quiz_default_report { add_to_log($course->id, "quiz", "manualgrading", "report.php?mode=grading&q=$quiz->id", "$quiz->id", "$cm->id"); - echo ''; // for overlib - if ($data = data_submitted()) { // post data submitted, process it if (confirm_sesskey() && $this->users){ diff --git a/mod/quiz/review.php b/mod/quiz/review.php index cd2a17613fe..15901714519 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -90,9 +90,6 @@ $firstregion = reset($PAGE->blocks->get_regions()); $PAGE->blocks->add_pretend_block($navbc, $firstregion); - $PAGE->requires->js('/lib/overlib/overlib.js', true); - $PAGE->requires->js('/lib/overlib/overlib_cssstyle.js', true); - /// Print the page header $headtags = $attemptobj->get_html_head_contributions($page); if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) { @@ -108,7 +105,6 @@ $PAGE->set_heading($attemptobj->get_course()->fullname); echo $OUTPUT->header(); } - echo ''; // for overlib /// Print heading. if ($attemptobj->is_preview_user() && $attemptobj->is_own_attempt()) { diff --git a/mod/quiz/reviewquestion.php b/mod/quiz/reviewquestion.php index 4156f5fd89d..ec13e04d41a 100644 --- a/mod/quiz/reviewquestion.php +++ b/mod/quiz/reviewquestion.php @@ -67,15 +67,11 @@ ($stateid ? '&state=' . $stateid : ''), $attemptobj->get_quizid(), $attemptobj->get_cmid()); - $PAGE->requires->js('/lib/overlib/overlib.js', true); - $PAGE->requires->js('/lib/overlib/overlib_cssstyle.js', true); - /// Print the page header $attemptobj->get_question_html_head_contributions($questionid); $PAGE->set_title($attemptobj->get_course()->shortname . ': '.format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($COURSE->fullname); echo $OUTPUT->header(); - echo ''; // for overlib /// Print infobox $rows = array(); diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php index 06b48a6db34..e2786b4f39f 100644 --- a/question/type/multianswer/questiontype.php +++ b/question/type/multianswer/questiontype.php @@ -276,9 +276,22 @@ class embedded_cloze_qtype extends default_questiontype { return $details; } + function get_html_head_contributions(&$question, &$state) { + global $PAGE; + parent::get_html_head_contributions($question, $state); + $PAGE->requires->js('/lib/overlib/overlib.js', true); + $PAGE->requires->js('/lib/overlib/overlib_cssstyle.js', true); + } + function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) { global $QTYPES, $CFG, $USER, $OUTPUT, $PAGE; + static $overlibdivoutput = false; + if (!$overlibdivoutput) { + echo ''; // for overlib + $overlibdivoutput = true; + } + $readonly = empty($options->readonly) ? '' : 'readonly="readonly"'; $disabled = empty($options->readonly) ? '' : 'disabled="disabled"'; $formatoptions = new stdClass; @@ -306,11 +319,6 @@ class embedded_cloze_qtype extends default_questiontype { // The regex will recognize text snippets of type {#X} // where the X can be any text not containg } or white-space characters. - - // TODO: stop using overlib, use YUI instead - echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib.js'); - echo html_writer::script('', $CFG->wwwroot.'/lib/overlib/overlib_cssstyle.js'); - while (preg_match('~\{#([^[:space:]}]*)}~', $qtextremaining, $regs)) { $qtextsplits = explode($regs[0], $qtextremaining, 2); echo $qtextsplits[0];