quiz MDL-19813 Updated print_header_simple and build_navigation to OUTPUT and PAGE...

diff --git a/mod/quiz/addrandom.php b/mod/quiz/addrandom.php
index 60ab5b9528bb40cf08d3d553b59123f3f9d426c0..bd8c25c454a1caf2d1eff54254f6bdb9117957e3 100644 (file)
--- a/mod/quiz/addrandom.php
+++ b/mod/quiz/addrandom.php
@@ -72,7 +72,9 @@ if (has_capability('moodle/course:manageactivities', $contexts->lowest())) {
     $strupdatemodule = update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'));
 }
 $PAGE->navbar->add($streditingquiz);
-print_header_simple($streditingquiz, '', $navigation, '', '', true, $strupdatemodule);
+$PAGE->set_title($streditingquiz);
+$PAGE->set_button($strupdatemodule);
+echo $OUTPUT->header();
 
 if (!$quizname = $DB->get_field($cm->modname, 'name', array('id' => $cm->instance))) {
             print_error('invalidcoursemodule');

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 35758a54c0a11091964fbb6a32e0103be370905b..5be89bd53ef4302d61577a632b4b7a75fc29eba2 100644 (file)
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -92,8 +92,9 @@
         $accessmanager->setup_secure_page($attemptobj->get_course()->shortname . ': ' .
                 format_string($attemptobj->get_quiz_name()), $headtags);
     } else {
-        print_header_simple(format_string($attemptobj->get_quiz_name()), '', $attemptobj->navigation($title),
-                '', $headtags, true, $attemptobj->update_module_button());
+        $PAGE->set_title(format_string($attemptobj->get_quiz_name()));
+        $PAGE->set_button($attemptobj->update_module_button());
+        echo $OUTPUT->header();
     }
     echo '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>'; // for overlib
 

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index fa371944f75937d87d018b1d53ac4b5ca969ddd4..f52bb095e06f772e9fd9b3d862339376fa5ed966 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -448,8 +448,9 @@ $PAGE->navbar->add($pagetitle);
 $PAGE->requires->skip_link_to('questionbank',  get_string('skipto', 'access', get_string('questionbank', 'question')));
 $PAGE->requires->skip_link_to('quizcontentsblock',  get_string('skipto', 'access', get_string('questionsinthisquiz', 'quiz')));
 
-print_header_simple($pagetitle, '', $navigation, '', '', true,
-        $questionbankmanagement.$strupdatemodule);
+$PAGE->set_title($pagetitle);
+$PAGE->set_button($questionbankmanagement.$strupdatemodule);
+echo $OUTPUT->header();
 
 // Initialise the JavaScript.
 $quizeditconfig = new stdClass;

diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index f34bc9f5b61c66e195c86dd6d45ba11b05cdfac2..4874bd24a471c206ac886cefde425e4f1dcca5fa 100644 (file)
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -31,8 +31,9 @@
                  </form>";
     }
     $PAGE->navbar->add($strquizzes);
-    print_header_simple($strquizzes, '', $navigation,
-                 '', '', true, $streditquestions, navmenu($course));
+    $PAGE->set_title($strquizzes);
+    $PAGE->set_button($streditquestions);
+    echo $OUTPUT->header();
 
 // Get all the appropriate data
     if (!$quizzes = get_all_instances_in_course("quiz", $course)) {

diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php
index 5a38a7e0f0d8426d084a43a4e801bcb22298355b..52d4c7cbf5f0f2f5565624859ba23cb2d7f1706d 100644 (file)
--- a/mod/quiz/report/default.php
+++ b/mod/quiz/report/default.php
@@ -27,9 +27,9 @@ class quiz_default_report {
         $strquizzes = get_string("modulenameplural", "quiz");
         $strquiz  = get_string("modulename", "quiz");
     /// Print the page header
-        
-        print_header_simple(format_string($quiz->name), "", $navigation,
-                     '', '', true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));
+        $PAGE->set_title(format_string($quiz->name));
+        $PAGE->set_button(update_module_button($cm->id, $course->id, $strquiz));
+        echo $OUTPUT->header();
     /// Print the tabs    
         $currenttab = 'reports';
         $mode = $reportmode;

diff --git a/mod/quiz/review.php b/mod/quiz/review.php
index f0bb4b858106af6f61d25b79fff697f9328fbbb5..4424791af6e92d912e566c13e6891eb0a58258c9 100644 (file)
--- a/mod/quiz/review.php
+++ b/mod/quiz/review.php
@@ -81,8 +81,10 @@
     if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) {
         $accessmanager->setup_secure_page($attemptobj->get_course()->shortname.': '.format_string($attemptobj->get_quiz_name()), $headtags);
     } else {
-        print_header_simple(format_string($attemptobj->get_quiz_name()), '', $attemptobj->navigation($strreviewtitle),
-                '', $headtags, true, $attemptobj->update_module_button());
+        $attemptobj->navigation($strreviewtitle);
+        $PAGE->set_title(format_string($attemptobj->get_quiz_name()));
+        $PAGE->set_button($attemptobj->update_module_button());
+        echo $OUTPUT->header();
     }
     echo '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>'; // for overlib
 

diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php
index 3c63566a4c6af4264a2c4e57b93933f6a2377227..9ae6eb82e9aa8e2b6d1149713b85796d8ae274f2 100644 (file)
--- a/mod/quiz/summary.php
+++ b/mod/quiz/summary.php
@@ -50,8 +50,10 @@ if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) {
     $accessmanager->setup_secure_page($attemptobj->get_course()->shortname . ': ' .
             format_string($attemptobj->get_quiz_name()), '');
 } else {
-    print_header_simple(format_string($attemptobj->get_quiz_name()), '',
-            $attemptobj->navigation($title), '', '', true, $attemptobj->update_module_button());
+    $attemptobj->navigation($title);
+    $PAGE->set_title(format_string($attemptobj->get_quiz_name()));
+    $PAGE->set_button($attemptobj->update_module_button());
+    echo $OUTPUT->header();
 }
 
 /// Print tabs if they should be there.