Merge branch 'MDL-69122-master' of git://github.com/bmbrands/moodle

This commit is contained in:
Jake Dallimore 2020-07-02 11:49:02 +08:00
commit e96987d89e

View File

@ -76,7 +76,7 @@ $output = $PAGE->get_renderer('report_competency');
echo $output->header();
$baseurl = new moodle_url('/report/competency/index.php');
$nav = new \report_competency\output\user_course_navigation($currentuser, $course->id, $baseurl, $currentmodule);
echo $output->render($nav);
$top = $output->render($nav);
if ($currentuser > 0) {
$user = core_user::get_user($currentuser);
$usercontext = context_user::instance($currentuser);
@ -88,9 +88,9 @@ if ($currentuser > 0) {
if ($currentmodule > 0) {
$title = get_string('filtermodule', 'report_competency', format_string($cm->name));
}
echo $output->context_header($userheading, 3);
$top .= $output->context_header($userheading, 3);
}
echo $output->container('', 'clearfix');
echo $output->container($top, 'clearfix');
echo $output->heading($title, 3);
if ($currentuser > 0) {