mod-folder MDL-19799 Updated print_header_simple and build_navigation to OUTPUT and...

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

diff --git a/mod/folder/view.php b/mod/folder/view.php
index e316cb6bf169975891408c3a3a0ef9583d98e13e..7ce6685b13909bc06cb52b35efc5c742c00fd5bc 100644 (file)
--- a/mod/folder/view.php
+++ b/mod/folder/view.php
@@ -54,7 +54,7 @@ $PAGE->set_title($course->shortname.': '.$folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);
 $PAGE->set_button(update_module_button($cm->id, '', get_string('modulename', 'folder')));
-echo $OUTPUT->header(build_navigation('', $cm), navmenu($course, $cm));
+echo $OUTPUT->header();
 
 echo $OUTPUT->heading(format_string($folder->name), 2);