overlib MDL-19735 Overlib is now included only where it is used

At the same time I have converted the calendar block to use YUI instead of overlib, this introduces one regression in that the panel is shown immediatly but should really have a minimal delay for usability.
This will be fixed once the theme changes for 2.0 have been commited
This commit is contained in:
samhemelryk
2009-09-17 07:46:20 +00:00
parent bb55642327
commit 458eb0d10c
16 changed files with 54 additions and 36 deletions
+3 -1
View File
@@ -51,7 +51,9 @@
$strmodulenameplural = get_string("modulenameplural", "hotpot");
$strmodulename = get_string("modulename", "hotpot");
// print header
$PAGE->requires->js('lib/overlib/overlib.js')->in_head();
$PAGE->requires->js('lib/overlib/overlib_cssstyle.js')->in_head();
$PAGE->set_title(format_string($course->shortname) . ": $hotpot->name");
$PAGE->set_heading($course->fullname);
$PAGE->set_button(update_module_button($cm->id, $course->id, $strmodulename));
+2
View File
@@ -85,6 +85,8 @@
$attemptobj->load_question_states($questionids);
/// Print the quiz page ////////////////////////////////////////////////////////
$PAGE->requires->js('lib/overlib/overlib.js')->in_head();
$PAGE->requires->js('lib/overlib/overlib_cssstyle.js')->in_head();
// Arrange for the navigation to be displayed.
$navbc = $attemptobj->get_navigation_panel('quiz_attempt_nav_panel', $page);
+4 -1
View File
@@ -28,7 +28,7 @@ class quiz_grading_report extends quiz_default_report {
* Displays the report.
*/
function display($quiz, $cm, $course) {
global $CFG, $QTYPES, $DB, $OUTPUT;
global $CFG, $QTYPES, $DB, $OUTPUT, $PAGE;
$viewoptions = array('mode'=>'grading', 'q'=>$quiz->id);
@@ -56,6 +56,9 @@ class quiz_grading_report extends quiz_default_report {
$this->cm = $cm;
echo $PAGE->requires->js('lib/overlib/overlib.js')->asap();
echo $PAGE->requires->js('lib/overlib/overlib_cssstyle.js')->asap();
$this->print_header_and_tabs($cm, $course, $quiz, $reportmode="grading");
// Check permissions
+3
View File
@@ -85,6 +85,9 @@
$firstregion = reset($PAGE->blocks->get_regions());
$PAGE->blocks->add_pretend_block($navbc, $firstregion);
$PAGE->requires->js('lib/overlib/overlib.js')->in_head();
$PAGE->requires->js('lib/overlib/overlib_cssstyle.js')->in_head();
/// Print the page header
$headtags = $attemptobj->get_html_head_contributions($page);
if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) {
+3
View File
@@ -61,6 +61,9 @@
($stateid ? '&state=' . $stateid : ''),
$attemptobj->get_quizid(), $attemptobj->get_cmid());
$PAGE->requires->js('lib/overlib/overlib.js')->in_head();
$PAGE->requires->js('lib/overlib/overlib_cssstyle.js')->in_head();
/// Print the page header
$attemptobj->get_question_html_head_contributions($questionid);