Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)
mod/feedback/lib.php
mod/feedback/show_nonrespondents.php

index ea98a20..a81a54a 100644 (file)
@@ -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)));
+        }
     }
 }
 
index 1ed0250..ec1b8ac 100644 (file)
@@ -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');