feedback MDL-19807 Updated print_header and build_navigation to OUTPUT and PAGE equiv...

diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index 2368e66a8b08f3a9e50e6ea17d4b8455069ac6b8..c0037a35e281837b81ba8c621ece2afda98061f2 100644 (file)
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -58,14 +58,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index e69b9ad49c9711e5111951f54109219b66e563db..7e8047cc11e3b38b2337d26c0934e7cc515606a0 100644 (file)
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -52,14 +52,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index eaa0b0be82983b78287440db99207408c57993bf..1b6ee3680a42e1d8f648306fb26f117e303b5e50 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -123,14 +123,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     //ishidden check.
     //feedback in courses

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 9feb60f69e0c4d1d365a0c947fe25403d5e1a9c9..0d196d049213a5048bb523c9bc0a36b5b3c6e814 100644 (file)
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -102,14 +102,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     //ishidden check. hidden feedbacks except feedbacks on mainsite are only accessible with related capabilities
     if ((empty($cm->visible) and !$capabilities->viewhiddenactivities) AND $course->id != SITEID) {

diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index 79b9807c2c3dd7f62d7c4c81d8693d8e36a4350f..ac733923207e332eb528eca28617d0de46d20068 100644 (file)
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -65,14 +65,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////

diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
index dcf8e45b9da86918fe75c0f7b6d0fc8c19bc7f8a..c8727beb19311bc8e4df430ad0a006f9f3d7236b 100644 (file)
--- a/mod/feedback/delete_item.php
+++ b/mod/feedback/delete_item.php
@@ -58,14 +58,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////

diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index 0e889059aa54cc4fbda71bed60d8d6ddf29f1039..c7e03f3ae6d1347333f4d02d220d54655d406ce2 100644 (file)
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -72,14 +72,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 2476a6386f92ad6187393e83c803c139ca8dfa0b..29719c2a113f31aef7f12b76f635c2e4dc0c0156 100644 (file)
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -144,14 +144,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');

diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 5a9d481b218d84e68239cba56494d5536d52f932..70a76a33804c8b742858ba8abf159b1e07342799 100644 (file)
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -115,14 +115,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');

diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index 3267b2b0f88013918208b78ce7c34824aad2610b..d6b3e0e00d5c767eceb4ad979f50557db53a03a0 100644 (file)
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -76,15 +76,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////

diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index dcef4b584446c182e21cd0627f1736caf3028ee8..2c6ce0d33bc2695523215d1c94623aa14908aaa8 100644 (file)
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -26,14 +26,10 @@
     /// Print the page header
     $strfeedbacks = get_string("modulenameplural", "feedback");
     $strfeedback  = get_string("modulename", "feedback");
-    
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "", 'type' => 'activity');
-    
-    $navigation = build_navigation($navlinks);
-    
-    print_header_simple(get_string('modulename', 'feedback').' '.get_string('activities'), "",
-                 $navigation, "", "", true, null, navmenu($course));
+
+    $PAGE->navbar->add($strfeedbacks);
+    $PAGE->set_title(get_string('modulename', 'feedback').' '.get_string('activities'));
+    echo $OUTPUT->header();
 
     /// Get all the appropriate data
 

diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 199a08579d676961b068e8af9a794f3be158d4cc..dfe9e3d12e7d3e06c4bb82d3f9262ee03872e3f4 100644 (file)
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -57,36 +57,17 @@
         }
     }
 
-    /// Print the page header
-    // $strfeedbacks = get_string("modulenameplural", "feedback");
-    // $strfeedback = get_string("modulename", "feedback");
-    // $navigation = '';
-
-    // $feedbackindex = '<a href="'.htmlspecialchars('index.php?id='.$course->id).'">'.$strfeedbacks.'</a> ->';
-    // if ($course->category) {
-        // $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$course->id).'">'.$course->shortname.'</a> ->';
-    // }else if ($courseid > 0 AND $courseid != SITEID) {
-        // $usercourse = $DB->get_record('course', array('id'=>$courseid));
-        // $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$usercourse->id).'">'.$usercourse->shortname.'</a> ->';
-        // $feedbackindex = '';
-    // }
-
-    // print_header($course->shortname.': '.$feedback->name, $course->fullname,
-                // $navigation.' '.$feedbackindex.' <a href="'.htmlspecialchars('view.php?id='.$id).'">'.$feedback->name.'</a> -> '.get_string('mapcourses', 'feedback'),
-                // '', '', true, update_module_button($cm->id, $course->id, $strfeedback), navmenu($course, $cm));
     /// Print the page header
     $strfeedbacks = get_string("modulenameplural", "feedback");
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     include('tabs.php');
 

diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index a6f14384a5b1815ef6eb9001ac1770fb289a7509..6c8823b27a29f80a662b3b4a76a7f2a095a1702f 100644 (file)
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -41,15 +41,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 62eed2f5289bef85d6e7f3538f4c2c913dab409d..1306bf82865684eb79dbae437ea700b74b712e48 100644 (file)
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -68,14 +68,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     include('tabs.php');
 

diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index b43f38ca00fac66bf28096f38c6ceb1cc50b13cc..6f3de3f904eadf8102bebd1983e74038f31b825e 100644 (file)
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -63,14 +63,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////

diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index d3c478d16b4a4a340cf3d3bf6fba2e312f562e25..f648c913672629dcce769489ef0020afa0d7175d 100644 (file)
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -64,14 +64,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index b9bc3b67d6e5730a5fdbd23d60bac4974cb5f994..7abc102d41bc44ac00824877814901a05b6af86c 100644 (file)
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -80,15 +80,13 @@
     $strfeedbacks = get_string("modulenameplural", "feedback");
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
+    
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     //ishidden check.
     //feedback in courses