From c018f973289df1ee09a7a165614522cc37c6e521 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Thu, 6 Aug 2009 08:16:46 +0000 Subject: [PATCH] MDL-19797 Migrated calls to print_heading --- grade/edit/outcome/index.php | 4 ++-- grade/edit/scale/index.php | 4 ++-- grade/edit/tree/grade.php | 2 +- grade/export/lib.php | 8 ++++---- grade/export/ods/index.php | 2 +- grade/export/txt/index.php | 2 +- grade/export/xls/index.php | 2 +- grade/export/xml/index.php | 2 +- grade/import/csv/index.php | 2 +- grade/lib.php | 4 ++-- grade/report/grader/index.php | 4 +++- grade/report/user/index.php | 2 +- grade/report/user/lib.php | 2 +- 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php index 118f68bcb7..34b41147af 100644 --- a/grade/edit/outcome/index.php +++ b/grade/edit/outcome/index.php @@ -129,7 +129,7 @@ $outcomes_tables = array(); $heading = get_string('outcomes', 'grades'); if ($courseid and $outcomes = grade_outcome::fetch_all_local($courseid)) { - $return = print_heading($strcustomoutcomes, '', 3, 'main', true); + $return = $OUTPUT->heading($strcustomoutcomes, 3, 'main'); $data = array(); foreach($outcomes as $outcome) { $line = array(); @@ -182,7 +182,7 @@ if ($courseid and $outcomes = grade_outcome::fetch_all_local($courseid)) { if ($outcomes = grade_outcome::fetch_all_global()) { - $return = print_heading($strstandardoutcome, '', 3, 'main', true); + $return = $OUTPUT->heading($strstandardoutcome, 3, 'main'); $data = array(); foreach($outcomes as $outcome) { $line = array(); diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php index 7be91b3714..fb5c0fe842 100644 --- a/grade/edit/scale/index.php +++ b/grade/edit/scale/index.php @@ -144,9 +144,9 @@ if ($courseid) { print_grade_page_head($courseid, 'scale', null, get_string('coursescales', 'grades')); } -print_heading($strcustomscales, '', 3, 'main'); +echo $OUTPUT->heading($strcustomscales, 3, 'main'); print_table($table); -print_heading($strstandardscale, '', 3, 'main'); +echo $OUTPUT->heading($strstandardscale, 3, 'main'); print_table($table2); echo '
'; print_single_button('edit.php', array('courseid'=>$courseid), $srtcreatenewscale); diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php index 2a1e878771..a49521a9b0 100644 --- a/grade/edit/tree/grade.php +++ b/grade/edit/tree/grade.php @@ -255,7 +255,7 @@ $navigation = grade_build_nav(__FILE__, $strgradeedit, array('courseid' => $cour print_header_simple($strgrades . ': ' . $strgraderreport . ': ' . $strgradeedit, ': ' . $strgradeedit , $navigation, '', '', true, '', navmenu($course)); -print_heading($strgradeedit); +echo $OUTPUT->heading($strgradeedit); print_simple_box_start("center"); diff --git a/grade/export/lib.php b/grade/export/lib.php index ca28eea30b..452e5163be 100755 --- a/grade/export/lib.php +++ b/grade/export/lib.php @@ -187,8 +187,8 @@ abstract class grade_export { * @param bool $require_user_idnumber true means skip users without idnumber */ public function display_preview($require_user_idnumber=false) { - - print_heading(get_string('previewrows', 'grades')); + global $OUTPUT; + echo $OUTPUT->heading(get_string('previewrows', 'grades')); echo ''; echo ''; @@ -286,12 +286,12 @@ abstract class grade_export { * @return void */ public function print_continue() { - global $CFG; + global $CFG, $OUTPUT; $params = $this->get_export_params(); - print_heading(get_string('export', 'grades')); + echo $OUTPUT->heading(get_string('export', 'grades')); echo '
'; if (!$this->userkey) { // this button should trigger a download prompt diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php index b5ff5ef68a..af2263a874 100755 --- a/grade/export/ods/index.php +++ b/grade/export/ods/index.php @@ -42,7 +42,7 @@ $mform = new grade_export_form(null, array('publishing' => true)); $groupmode = groups_get_course_groupmode($course); // Groups are being used $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { - print_heading(get_string("notingroup")); + echo $OUTPUT->heading(get_string("notingroup")); print_footer($course); die; } diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php index b5f598062f..bf5d66e699 100755 --- a/grade/export/txt/index.php +++ b/grade/export/txt/index.php @@ -42,7 +42,7 @@ $mform = new grade_export_form(null, array('includeseparator'=>true, 'publishing $groupmode = groups_get_course_groupmode($course); // Groups are being used $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { - print_heading(get_string("notingroup")); + echo $OUTPUT->heading(get_string("notingroup")); print_footer($course); die; } diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php index ba865f4a6f..3de1a7f29d 100755 --- a/grade/export/xls/index.php +++ b/grade/export/xls/index.php @@ -42,7 +42,7 @@ $mform = new grade_export_form(null, array('publishing' => true)); $groupmode = groups_get_course_groupmode($course); // Groups are being used $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { - print_heading(get_string("notingroup")); + echo $OUTPUT->heading(get_string("notingroup")); print_footer($course); die; } diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php index 758f7b5062..aada6d2bcb 100755 --- a/grade/export/xml/index.php +++ b/grade/export/xml/index.php @@ -42,7 +42,7 @@ $mform = new grade_export_form(null, array('idnumberrequired'=>true, 'publishing $groupmode = groups_get_course_groupmode($course); // Groups are being used $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { - print_heading(get_string("notingroup")); + echo $OUTPUT->heading(get_string("notingroup")); print_footer($course); die; } diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index e8327aadb1..027255abba 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -126,7 +126,7 @@ if ($formdata = $mform->get_data()) { // print some preview $numlines = 0; // 0 preview lines displayed - print_heading(get_string('importpreview', 'grades')); + echo $OUTPUT->heading(get_string('importpreview', 'grades')); echo '
'; echo ''; foreach ($header as $h) { diff --git a/grade/lib.php b/grade/lib.php index 0d1b87711e..88a12b545c 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -812,7 +812,7 @@ class grade_plugin_info { function print_grade_page_head($courseid, $active_type, $active_plugin=null, $heading = false, $return=false, $buttons=false, $extracss=array()) { - global $CFG, $COURSE; + global $CFG, $COURSE, $OUTPUT; $strgrades = get_string('grades'); $plugin_info = grade_get_plugin_info($courseid, $active_type, $active_plugin); @@ -876,7 +876,7 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null, if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_DROPDOWN) { $returnval .= print_grade_plugin_selector($plugin_info, $return); } - $returnval .= print_heading($heading); + $returnval .= $OUTPUT->heading($heading); if ($CFG->grade_navmethod == GRADE_NAVMETHOD_COMBO || $CFG->grade_navmethod == GRADE_NAVMETHOD_TABS) { $returnval .= grade_print_tabs($active_type, $active_plugin, $plugin_info, $return); diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index 5bfdc5b56a..0475894fa3 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -34,6 +34,8 @@ $target = optional_param('target', 0, PARAM_ALPHANUM); $toggle = optional_param('toggle', NULL, PARAM_INT); $toggle_type = optional_param('toggle_type', 0, PARAM_ALPHANUM); +$PAGE->set_url('grade/report/grader/index.php', compact('courseid', 'page', 'perpageurl', 'edit', 'sortitemid')); + /// basic access checks if (!$course = $DB->get_record('course', array('id' => $courseid))) { print_error('nocourseid'); @@ -123,7 +125,7 @@ if ($report->get_pref('enableajax')) { // make sure separate group does not prevent view if ($report->currentgroup == -2) { print_grade_page_head($COURSE->id, 'report', 'grader', $reportname, false, $buttons); - print_heading(get_string("notingroup")); + echo $OUTPUT->heading(get_string("notingroup")); print_footer($course); exit; } diff --git a/grade/report/user/index.php b/grade/report/user/index.php index 85e2c6a856..e6c4293e83 100644 --- a/grade/report/user/index.php +++ b/grade/report/user/index.php @@ -106,7 +106,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all while ($userdata = $gui->next_user()) { $user = $userdata->user; $report = new grade_report_user($courseid, $gpr, $context, $user->id); - print_heading(get_string('modulename', 'gradereport_user'). ' - '.fullname($report->user)); + echo $OUTPUT->heading(get_string('modulename', 'gradereport_user'). ' - '.fullname($report->user)); if ($report->fill_table()) { echo '
'.$report->print_table(true); diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index 6e57d8858b..1119b4c4dc 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -475,7 +475,7 @@ function grade_report_user_profilereport($course, $user) { // print the page echo '
'; // css fix to share styles with real report page - print_heading(get_string('modulename', 'gradereport_user'). ' - '.fullname($report->user)); + echo $OUTPUT->heading(get_string('modulename', 'gradereport_user'). ' - '.fullname($report->user)); if ($report->fill_table()) { echo $report->print_table(true); -- 2.39.5