From 7cc378fdc2a58b6d80652cb22685225f038dccaf Mon Sep 17 00:00:00 2001 From: samhemelryk Date: Tue, 8 Sep 2009 01:48:37 +0000 Subject: [PATCH] question MDL-19797 Updated print_header_simple and build_navigation to OUTPUT and PAGE equivalents --- grade/edit/tree/calculation.php | 7 ++++--- grade/edit/tree/grade.php | 8 ++++---- grade/edit/tree/index.php | 6 ++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php index 760ef499c0..937535f9ab 100644 --- 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 47be2b48e0..7d6a1af8f1 100644 --- 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 62121da7fc..6eac4a8979 100644 --- 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); -- 2.39.5