assignment MDL-19803 Upgraded print_header and build_navigation calls to OUTPUT/PAGE...

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 367bce7cb547b2cc1f94dc2e670540dc068a3e60..7f0a0949600f27cf5729ceaf733a3383f7fc5447 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -178,19 +178,17 @@ class assignment_base {
      * @param string $subpage Description of subpage to be used in navigation trail
      */
     function view_header($subpage='') {
-
-        global $CFG;
-
+        global $CFG, $PAGE, $OUTPUT;
 
         if ($subpage) {
-            $navigation = build_navigation($subpage, $this->cm);
-        } else {
-            $navigation = build_navigation('', $this->cm);
+            $PAGE->navbar->add($subpage);
         }
 
-        print_header($this->pagetitle, $this->course->fullname, $navigation, '', '',
-                     true, update_module_button($this->cm->id, $this->course->id, $this->strassignment),
-                     navmenu($this->course, $this->cm));
+        $PAGE->set_title($this->pagetitle);
+        $PAGE->set_heading($this->course->fullname);
+        $PAGE->set_button(update_module_button($this->cm->id, $this->course->id, $this->strassignment));
+
+        echo $OUTPUT->header();
 
         groups_print_activity_menu($this->cm, 'view.php?id=' . $this->cm->id);
 
@@ -574,7 +572,8 @@ class assignment_base {
             case 'grade':                         // We are in a popup window grading
                 if ($submission = $this->process_feedback()) {
                     //IE needs proper header with encoding
-                    print_header(get_string('feedback', 'assignment').':'.format_string($this->assignment->name));
+                    $PAGE->set_title(get_string('feedback', 'assignment').':'.format_string($this->assignment->name));
+                    echo $OUTPUT->header();
                     echo $OUTPUT->heading(get_string('changessaved'));
                     print $this->update_main_listing($submission);
                 }
@@ -926,7 +925,8 @@ class assignment_base {
             }
         }
 
-        print_header(get_string('feedback', 'assignment').':'.fullname($user, true).':'.format_string($this->assignment->name));
+        $PAGE->set_title(get_string('feedback', 'assignment').':'.fullname($user, true).':'.format_string($this->assignment->name));
+        echo $OUTPUT->header();
 
         /// Print any extra javascript needed for saveandnext
         echo $extra_javascript;
@@ -1121,9 +1121,10 @@ class assignment_base {
 
         $tabindex = 1; //tabindex for quick grading tabbing; Not working for dropdowns yet
         add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->cm->id, $this->assignment->id, $this->cm->id);
-        $navigation = build_navigation($this->strsubmissions, $this->cm);
-        print_header_simple(format_string($this->assignment->name,true), "", $navigation,
-                '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));
+        $PAGE->add($this->strsubmissions);
+        $PAGE->set_title(format_string($this->assignment->name,true));
+        $PAGE->set_button( update_module_button($cm->id, $course->id, $this->strassignment));
+        echo $OUTPUT->header();
 
         $course_context = get_context_instance(CONTEXT_COURSE, $course->id);
         if (has_capability('gradereport/grader:view', $course_context) && has_capability('moodle/grade:viewall', $course_context)) {

diff --git a/mod/assignment/type/online/file.php b/mod/assignment/type/online/file.php
index c439855f9f0272e02d4d62572df613ff0694876f..ca34f26f5eb91b9b34ea9dbcfd851318ec081214 100644 (file)
--- a/mod/assignment/type/online/file.php
+++ b/mod/assignment/type/online/file.php
@@ -36,8 +36,8 @@
     $assignmentinstance = new assignment_online($cm->id, $assignment, $cm, $course);
 
     if ($submission = $assignmentinstance->get_submission($user->id)) {
-        print_header(fullname($user,true).': '.$assignment->name);
-
+        $PAGE->set_title(fullname($user,true).': '.$assignment->name);
+        echo $OUTPUT->header();
         echo $OUTPUT->box_start('generalbox boxaligcenter', 'dates');
         echo '<table>';
         if ($assignment->timedue) {

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index cae9935781ec427d196da601de101d982ebd04e8..49072f8915ef5bd22f6ca9aab9cd3bdae1d24fc2 100644 (file)
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -525,7 +525,7 @@ class assignment_upload extends assignment_base {
     }
 
     function upload_responsefile() {
-        global $CFG, $USER, $OUTPUT;
+        global $CFG, $USER, $OUTPUT, $PAGE;
 
         $userid = required_param('userid', PARAM_INT);
         $mode   = required_param('mode', PARAM_ALPHA);
@@ -545,7 +545,8 @@ class assignment_upload extends assignment_base {
                 }
             }
         }
-        print_header(get_string('upload'));
+        $PAGE->set_title(get_string('upload'));
+        echo $OUTPUT->header();
         echo $OUTPUT->notification(get_string('uploaderror', 'assignment'));
         echo $OUTPUT->continue_button($returnurl);
         echo $OUTPUT->footer();
@@ -751,7 +752,7 @@ class assignment_upload extends assignment_base {
 
 
     function delete_responsefile() {
-        global $CFG, $OUTPUT;
+        global $CFG, $OUTPUT,$PAGE;
 
         $file     = required_param('file', PARAM_FILE);
         $userid   = required_param('userid', PARAM_INT);
@@ -770,7 +771,8 @@ class assignment_upload extends assignment_base {
 
         if (!data_submitted() or !$confirm) {
             $optionsyes = array ('id'=>$this->cm->id, 'file'=>$file, 'userid'=>$userid, 'confirm'=>1, 'action'=>'response', 'mode'=>$mode, 'offset'=>$offset);
-            print_header(get_string('delete'));
+            $PAGE->set_title(get_string('delete'));
+            echo $OUTPUT->header();
             echo $OUTPUT->heading(get_string('delete'));
             echo $OUTPUT->confirm(get_string('confirmdeletefile', 'assignment', $file), new moodle_url('delete.php', $optionsyes), new moodle_url($urlreturn, $optionsreturn));
             echo $OUTPUT->footer();
@@ -785,7 +787,8 @@ class assignment_upload extends assignment_base {
         }
 
         // print delete error
-        print_header(get_string('delete'));
+        $PAGE->set_title(get_string('delete'));
+        echo $OUTPUT->header();
         echo $OUTPUT->notification(get_string('deletefilefailed', 'assignment'));
         echo $OUTPUT->continue_button($returnurl);
         echo $OUTPUT->footer();

diff --git a/mod/assignment/type/upload/notes.php b/mod/assignment/type/upload/notes.php
index 9b9b08cf975024742bc9b1b7bbe845429dbf5516..9bd3b29368781843dc15596cad614358046c15c7 100644 (file)
--- a/mod/assignment/type/upload/notes.php
+++ b/mod/assignment/type/upload/notes.php
@@ -41,7 +41,8 @@
 
     if ($submission = $assignmentinstance->get_submission($user->id)
       and !empty($submission->data1)) {
-        print_header(fullname($user,true).': '.$assignment->name);
+        $PAGE->set_title(fullname($user,true).': '.$assignment->name);
+        echo $OUTPUT->header();
         echo $OUTPUT->heading(get_string('notes', 'assignment').' - '.fullname($user,true));
         echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML), 'generalbox boxaligncenter boxwidthwide');
         if ($mode != 'single') {
@@ -51,7 +52,8 @@
         }
         echo $OUTPUT->footer();
     } else {
-        print_header(fullname($user,true).': '.$assignment->name);
+        $PAGE->set_title(fullname($user,true).': '.$assignment->name);
+        echo $OUTPUT->header();
         echo $OUTPUT->heading(get_string('notes', 'assignment').' - '.fullname($user,true));
         echo $OUTPUT->box(get_string('notesempty', 'assignment'), 'generalbox boxaligncenter boxwidthwide');
         if ($mode != 'single') {