MDL-19797 Migrated calls to print_heading

diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
index 118f68bcb78eab29136bfd17b2b27fe2204ef0d3..34b41147af5e5cfdd505be0a8bcf5d792bbff37c 100644 (file)
--- 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 7be91b3714d7906460ad144f57aaa31b040f45de..fb5c0fe84293ff2d421ed26cf22a4c36986d7ecf 100644 (file)
--- 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 '<div class="buttons">';
 print_single_button('edit.php', array('courseid'=>$courseid), $srtcreatenewscale);

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 2a1e878771690cdb2bc48a549d58aff90f98a111..a49521a9b092955ff99cb9d6a4218677da3a6a4a 100644 (file)
--- 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 ca28eea30bbcf336977852bde2c55972da1850d7..452e5163be0a3de470539b479f1cef573ed56cc1 100755 (executable)
--- 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 '<table>';
         echo '<tr>';
@@ -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 '<div class="gradeexportlink">';
         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 b5ff5ef68a55b8bea9ef80074fc1966eed19730b..af2263a8749326f398c5d73947af2e7e8bd7cf8a 100755 (executable)
--- 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 b5f598062fb7c8849b2af0574b930955c79f570a..bf5d66e699e067110a74c1f0f2a82cb4027bb1de 100755 (executable)
--- 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 ba865f4a6f44ef437c257ac2c0f81fcfc8f45bcf..3de1a7f29de57ff1abe1a2115d563f5a213657cd 100755 (executable)
--- 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 758f7b5062780bd3371901cbfb0e6d856050c674..aada6d2bcb79da6e5f196fc8529b5a3f4ef85874 100755 (executable)
--- 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 e8327aadb175c92ec866420c1854b6ecfedbb1a0..027255abba5bb95572f8b24d8b528134f598752e 100755 (executable)
--- 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 '<table>';
     echo '<tr>';
     foreach ($header as $h) {

diff --git a/grade/lib.php b/grade/lib.php
index 0d1b87711e9f93ab4e018ec30bb757b8157b33dd..88a12b545cee3588e47cc4ca78e6d9f98c2b11b4 100644 (file)
--- 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 5bfdc5b56a13c1ac769e1375545822c593d34ec3..0475894fa3947c627c5da3dff73f98cfc0d3f208 100644 (file)
--- 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 85e2c6a85664343c2226c56876fb42a2f8575bea..e6c4293e83080c93b77c5960292dc5e39c781027 100644 (file)
--- 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 '<br />'.$report->print_table(true);

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index 6e57d8858be48805cd066580538d2d4a48870fb3..1119b4c4dc7e299a25ff9fe3a86f21af5505b766 100644 (file)
--- 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 '<div class="grade-report-user">'; // 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);