mod-resource MDL-19814 Updated print_header_simple and build_navigation to OUTPUT...

diff --git a/mod/resource/index.php b/mod/resource/index.php
index a81b0d1a65c44869c9af114cc8651c71a66b2190..9e597c22e89bc685567a9bab7678461f298f6939 100644 (file)
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -44,8 +44,8 @@ $strlastmodified = get_string('lastmodified');
 $PAGE->set_url('mod/resource/index.php', array('id' => $course->id));
 $PAGE->set_title($course->shortname.': '.$strresources);
 $PAGE->set_heading($course->fullname);
-$navlinks = array(array('name' => $strresources, 'link' => '', 'type' => 'activityinstance'));
-echo $OUTPUT->header(build_navigation($navlinks), navmenu($course));
+$PAGE->navbar->add($strresources);
+echo $OUTPUT->header();
 
 if (!$resources = get_all_instances_in_course('resource', $course)) {
     notice(get_string('thereareno', 'moodle', $strresources), "$CFG->wwwroot/course/view.php?id=$course->id");

diff --git a/mod/resource/locallib.php b/mod/resource/locallib.php
index 39a72ec18c740eb3fdae9d3d1c7084b02cd12f2c..8075b01591bdbe186d9a10795384295cde8bea8a 100644 (file)
--- a/mod/resource/locallib.php
+++ b/mod/resource/locallib.php
@@ -264,7 +264,7 @@ function resource_print_header($resource, $cm, $course) {
     $PAGE->set_heading($course->fullname);
     $PAGE->set_activity_record($resource);
     $PAGE->set_button(update_module_button($cm->id, '', get_string('modulename', 'resource')));
-    echo $OUTPUT->header(build_navigation('', $cm), navmenu($course, $cm));
+    echo $OUTPUT->header();
 }
 
 /**