MDL-48931 navigation: Implement the user subheader.

Part of MDL-45774
This commit is contained in:
Adrian Greeve
2015-04-10 17:17:07 +08:00
parent e026cc9253
commit 283ea788bf
8 changed files with 44 additions and 10 deletions
+2 -1
View File
@@ -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) {
+5 -1
View File
@@ -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;
+3 -1
View File
@@ -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) {
+5 -1
View File
@@ -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);
+10 -1
View File
@@ -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);
+8
View File
@@ -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') {
+8
View File
@@ -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();
+3 -5
View File
@@ -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">';