Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle

2016-03-22 00:45:48 +01:00
parent ab89d2aebc 5e9b2eda3c
commit 675c6d4b54
2 changed files with 7 additions and 1 deletions
@@ -3170,6 +3170,12 @@ function feedback_extend_settings_navigation(settings_navigation $settings,
                    new moodle_url('/mod/feedback/show_entries.php',
                                    array('id' => $PAGE->cm->id,
                                          'do_show' => 'showentries')));
+
+        if ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO AND $feedback->course != SITEID) {
+            $feedbacknode->add(get_string('show_nonrespondents', 'feedback'),
+                        new moodle_url('/mod/feedback/show_nonrespondents.php',
+                                        array('id' => $PAGE->cm->id)));
+        }
    }
 }

@@ -124,10 +124,10 @@ if ($action == 'sendmessage' AND has_capability('moodle/course:bulkmessaging', $
 ////////////////////////////////////////////////////////

 /// Print the page header
-$PAGE->navbar->add(get_string('show_nonrespondents', 'feedback'));
 $PAGE->set_heading($course->fullname);
 $PAGE->set_title($feedback->name);
 echo $OUTPUT->header();
+echo $OUTPUT->heading(format_string($feedback->name));

 require('tabs.php');