question MDL-19797 Updated print_header_simple and build_navigation to OUTPUT and...

diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php
index 760ef499c04846b8b5e65c72e0fd96208d5e772d..937535f9ab67b1aeebd643890b1795073103080e 100644 (file)
--- a/grade/edit/tree/calculation.php
+++ b/grade/edit/tree/calculation.php
@@ -96,9 +96,10 @@ $strgrades          = get_string('grades');
 $strgraderreport    = get_string('graderreport', 'grades');
 $strcalculationedit = get_string('editcalculation', 'grades');
 
-$navigation = grade_build_nav(__FILE__, $strcalculationedit, array('courseid' => $courseid));
-
-print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $strcalculationedit, $navigation, '', '', true, '', navmenu($course));
+grade_build_nav(__FILE__, $strcalculationedit, array('courseid' => $courseid));
+$PAGE->set_title($strgrades . ': ' . $strgraderreport);
+$PAGE->set_heading(': ' . $strcalculationedit);
+echo $OUTPUT->header();
 
 $mform->display();
 // Now show the gradetree with the idnumbers add/edit form

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 47be2b48e0ffdb548863dd2362f3aac7acafc567..7d6a1af8f11260cc2737e85b5c9253b36875e1e5 100644 (file)
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -248,13 +248,13 @@ $strgraderreport = get_string('graderreport', 'grades');
 $strgradeedit    = get_string('editgrade', 'grades');
 $struser         = get_string('user');
 
-$navigation = grade_build_nav(__FILE__, $strgradeedit, array('courseid' => $courseid));
+grade_build_nav(__FILE__, $strgradeedit, array('courseid' => $courseid));
 
 /*********** BEGIN OUTPUT *************/
+$PAGE->set_title($strgrades . ': ' . $strgraderreport . ': ' . $strgradeedit);
+$PAGE->set_heading(': ' . $strgradeedit);
 
-print_header_simple($strgrades . ': ' . $strgraderreport . ': ' . $strgradeedit,
-    ': ' . $strgradeedit , $navigation, '', '', true, '', navmenu($course));
-
+echo $OUTPUT->header();
 echo $OUTPUT->heading($strgradeedit);
 
 echo $OUTPUT->box_start();

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 62121da7fc18d0d05f93a284d65482ccaf13f9ef..6eac4a8979b9aa7bb4317029c9e99be7fa49b9d3 100644 (file)
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -131,7 +131,7 @@ $strgraderreport       = get_string('graderreport', 'grades');
 $strcategoriesedit     = get_string('categoriesedit', 'grades');
 $strcategoriesanditems = get_string('categoriesanditems', 'grades');
 
-$navigation = grade_build_nav(__FILE__, $strcategoriesanditems, array('courseid' => $courseid));
+grade_build_nav(__FILE__, $strcategoriesanditems, array('courseid' => $courseid));
 $moving = false;
 $movingeid = false;
 
@@ -159,7 +159,9 @@ switch ($action) {
                 redirect($returnurl);
 
             } else {
-                print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $strcategoriesedit, $navigation, '', '', true, null, navmenu($course));
+                $PAGE->set_title($strgrades . ': ' . $strgraderreport);
+                $PAGE->set_heading(': ' . $strcategoriesedit);
+                echo $OUTPUT->header();
                 $strdeletecheckfull = get_string('deletecheck', '', $object->get_name());
                 $optionsyes = array('eid'=>$eid, 'confirm'=>1, 'sesskey'=>sesskey(), 'id'=>$course->id, 'action'=>'delete');
                 $optionsno  = array('id'=>$course->id);