MDL-48931 navigation: Implement the user subheader.

Part of MDL-45774

diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php
index 0721d28..513ec54 100644 (file)
--- a/grade/report/overview/index.php
+++ b/grade/report/overview/index.php
@@ -134,7 +134,8 @@ if (has_capability('moodle/grade:viewall', $context) && $courseid != SITEID) {
 
     } else { // Only show one user's report
         $report = new grade_report_overview($userid, $gpr, $context);
-        print_grade_page_head($courseid, 'report', 'overview', get_string('pluginname', 'gradereport_overview'). ' - '.fullname($report->user));
+        print_grade_page_head($courseid, 'report', 'overview', get_string('pluginname', 'gradereport_overview') .
+                ' - ' . fullname($report->user), false, false, true, null, null, $report->user);
         groups_print_course_menu($course, $gpr->get_return_url('index.php?id='.$courseid, array('userid'=>0)));
 
         if ($user_selector) {

diff --git a/grade/report/singleview/index.php b/grade/report/singleview/index.php
index b1f5f7b..47b4578 100644 (file)
--- a/grade/report/singleview/index.php
+++ b/grade/report/singleview/index.php
@@ -115,7 +115,11 @@ if ($data = data_submitted()) {
 }
 
 $PAGE->set_pagelayout('report');
-print_grade_page_head($course->id, 'report', 'singleview', $reportname);
+if ($itemtype == 'user') {
+    print_grade_page_head($course->id, 'report', 'singleview', $reportname, false, false, true, null, null, $report->screen->item);
+} else {
+    print_grade_page_head($course->id, 'report', 'singleview', $reportname);
+}
 
 $graderrightnav = $graderleftnav = null;
 

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index c5255a9..3136c56 100644 (file)
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -134,7 +134,9 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
         $report = new grade_report_user($courseid, $gpr, $context, $userid);
 
         $studentnamelink = html_writer::link(new moodle_url('/user/view.php', array('id' => $report->user->id, 'course' => $courseid)), fullname($report->user));
-        print_grade_page_head($courseid, 'report', 'user', get_string('pluginname', 'gradereport_user') . ' - ' . $studentnamelink);
+        print_grade_page_head($courseid, 'report', 'user', get_string('pluginname', 'gradereport_user') . ' - ' . $studentnamelink,
+                false, false, true, null, null, $report->user);
+
         groups_print_course_menu($course, $gpr->get_return_url('index.php?id='.$courseid, array('userid'=>0)));
 
         if ($user_selector) {

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index 29b0bee..d858d28 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -1164,7 +1164,11 @@ function grade_report_user_profilereport($course, $user, $viewasuser = false) {
 
         // print the page
         echo '<div class="grade-report-user">'; // css fix to share styles with real report page
-        echo $OUTPUT->heading(get_string('pluginname', 'gradereport_user'). ' - '.fullname($report->user));
+        echo $OUTPUT->context_header(array(
+                'heading' => fullname($report->user),
+                'user' => $user,
+                'usercontext' => context_user::instance($user->id)
+            ));
 
         if ($report->fill_table()) {
             echo $report->print_table(true);

diff --git a/mod/forum/user.php b/mod/forum/user.php
index 67ec8ca..b52f807 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -207,7 +207,16 @@ if (empty($result->posts)) {
         $PAGE->set_heading(fullname($user));
     }
     echo $OUTPUT->header();
-    echo $OUTPUT->heading($pagetitle);
+    if (!$isspecificcourse) {
+        echo $OUTPUT->heading($pagetitle);
+    } else {
+        $userheading = array(
+                'heading' => fullname($user),
+                'user' => $user,
+                'usercontext' => $usercontext
+            );
+        echo $OUTPUT->context_header($userheading, 2);
+    }
     echo $OUTPUT->notification($notification);
     if (!$url->compare($PAGE->url)) {
         echo $OUTPUT->continue_button($url);

diff --git a/report/log/user.php b/report/log/user.php
index 7e94953..b493f4e 100644 (file)
--- a/report/log/user.php
+++ b/report/log/user.php
@@ -75,6 +75,7 @@ $PAGE->set_url('/report/log/user.php', array('id' => $user->id, 'course' => $cou
 $PAGE->navigation->extend_for_user($user);
 $PAGE->navigation->set_userid_for_parent_checks($user->id); // see MDL-25805 for reasons and for full commit reference for reversal when fixed.
 $PAGE->set_title("$course->shortname: $stractivityreport");
+
 if ($courseid == SITEID) {
     $PAGE->set_heading(fullname($user));
 } else {
@@ -87,6 +88,13 @@ $event = \report_log\event\user_report_viewed::create(array('context' => $course
 $event->trigger();
 
 echo $OUTPUT->header();
+if ($courseid != SITEID) {
+    $userheading = array(
+            'user' => $user,
+            'usercontext' => $personalcontext,
+        );
+    echo $OUTPUT->context_header($userheading, 2);
+}
 
 // Time to filter records from.
 if ($mode === 'today') {

diff --git a/report/outline/user.php b/report/outline/user.php
index 227ab97..b9685bf 100644 (file)
--- a/report/outline/user.php
+++ b/report/outline/user.php
@@ -78,6 +78,14 @@ $event = \report_outline\event\report_viewed::create(array('context' => context_
 $event->trigger();
 
 echo $OUTPUT->header();
+if ($courseid != SITEID) {
+    echo $OUTPUT->context_header(
+            array(
+            'heading' => fullname($user),
+            'user' => $user,
+            'usercontext' => $personalcontext
+        ), 2);
+}
 
 $modinfo = get_fast_modinfo($course);
 $sections = $modinfo->get_section_info_all();

diff --git a/user/view.php b/user/view.php
index af93cf6..12a98b3 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -196,8 +196,8 @@ if ($node = $PAGE->settingsnav->get('courseadmin')) {
 echo $OUTPUT->header();
 
 echo '<div class="userprofile">';
-
-echo $OUTPUT->heading(fullname($user).' ('.format_string($course->shortname, true, array('context' => $coursecontext)).')');
+$headerinfo = array('heading' => fullname($user) ,'user' => $user, 'usercontext' => $usercontext);
+echo $OUTPUT->context_header($headerinfo, 2);
 
 if ($user->deleted) {
     echo $OUTPUT->heading(get_string('userdeleted'));
@@ -233,9 +233,7 @@ if (is_mnet_remote_user($user)) {
     echo $OUTPUT->box(get_string('remoteuserinfo', 'mnet', $a), 'remoteuserinfo');
 }
 
-echo '<div class="userprofilebox clearfix"><div class="profilepicture">';
-echo $OUTPUT->user_picture($user, array('size' => 100));
-echo '</div>';
+echo '<div class="userprofilebox clearfix">';
 
 // Print the description.
 echo '<div class="descriptionbox"><div class="description">';