Merge branch 'MDL-73358-master' of https://github.com/junpataleta/moodle

admin/tool/monitor/managerules.php

@@ -117,7 +117,6 @@ if (!empty($action) && $ruleid) {
 $managerules = get_string('managerules', 'tool_monitor');
 report_helper::print_report_selector($managerules);
 
-echo $OUTPUT->heading(get_string('managerules', 'tool_monitor'));
 $status = get_config('tool_monitor', 'enablemonitor');
 $help = new help_icon('enablehelp', 'tool_monitor');
 

lib/classes/report_helper.php

@@ -78,9 +78,10 @@ class report_helper {
 
             $select = new url_select($menuarray, $activeurl, null, 'choosecoursereport');
             $select->set_label(get_string('reporttype'), ['class' => 'accesshide']);
-            $select->class .= " mb-3";
+            $select->class .= " mb-1";
             echo $OUTPUT->render($select);
         }
+        echo $OUTPUT->heading($pluginname, 2, 'mb-3');
     }
 
     /**

report/competency/index.php

@@ -96,7 +96,6 @@ if ($currentuser > 0) {
     $top .= $output->context_header($userheading, 3);
 }
 echo $output->container($top, 'clearfix');
-echo $output->heading($title, 3);
 
 if ($currentuser > 0) {
     $page = new \report_competency\output\report($course->id, $currentuser, $currentmodule);

report/insights/insights.php

@@ -118,7 +118,9 @@ if (!$model->get_target()->link_insights_report()) {
 }
 
 $insightinfo = new stdClass();
-$insightinfo->contextname = $context->get_context_name();
+// Don't show prefix for course-level context.
+$withprefix = $context->contextlevel <> CONTEXT_COURSE;
+$insightinfo->contextname = $context->get_context_name($withprefix);
 $insightinfo->insightname = $model->get_target()->get_name();
 
 if (!$model->is_enabled()) {

report/insights/templates/insights_list.mustache

@@ -106,7 +106,7 @@
 
 <div class="insight-container" data-context-id="{{contextid}}" data-model-id="{{modelid}}">
 
-    <h2 class="mb-2">{{insightname}}</h2>
+    <h3 class="mb-2">{{insightname}}</h3>
 
     {{{insightdescription}}}
 

report/log/index.php

@@ -191,7 +191,7 @@ if (empty($readers)) {
         // Print selector dropdown.
         $pluginname = get_string('pluginname', 'report_log');
         report_helper::print_report_selector($pluginname);
-        echo $output->heading(get_string('chooselogs') .':');
+        echo $output->heading(get_string('chooselogs') .':', 3);
         echo $output->render($reportlog);
     }
 }

report/loglive/index.php

@@ -80,8 +80,8 @@ $strupdatesevery = get_string('updatesevery', 'moodle', $refresh);
 
 $PAGE->set_url($url);
 $PAGE->set_context($context);
-$PAGE->set_title("$coursename: $strlivelogs ($strupdatesevery)");
-$PAGE->set_heading("$coursename: $strlivelogs ($strupdatesevery)");
+$PAGE->set_title("$coursename: $strlivelogs");
+$PAGE->set_heading($coursename);
 
 $output = $PAGE->get_renderer('report_loglive');
 echo $output->header();
@@ -89,6 +89,7 @@ echo $output->header();
 // Print selector dropdown.
 $pluginname = get_string('pluginname', 'report_loglive');
 report_helper::print_report_selector($pluginname);
+echo html_writer::div(get_string('livelogswithupdate', 'report_loglive', $strupdatesevery), 'mb-3');
 echo $output->reader_selector($renderable);
 echo $output->toggle_liveupdate_button($renderable);
 echo $output->render($renderable);

report/loglive/lang/en/report_loglive.php

@@ -31,6 +31,7 @@ $string['eventloggedas'] = '{$a->realusername} as {$a->asusername}';
 $string['eventorigin'] = 'Origin';
 $string['eventrelatedfullnameuser'] = 'Affected user';
 $string['livelogs'] = 'Live logs from the past hour';
+$string['livelogswithupdate'] = 'Live logs from the past hour ({$a})';
 $string['loglive:view'] = 'View live logs';
 $string['nologreaderenabled'] = 'No log reader enabled';
 $string['pause'] = 'Pause live updates';

report/outline/index.php

@@ -93,7 +93,6 @@ echo $OUTPUT->header();
 // Print selector drop down.
 $pluginname = get_string('pluginname', 'report_outline');
 report_helper::print_report_selector($pluginname);
-echo $OUTPUT->heading(format_string($course->fullname));
 
 list($uselegacyreader, $useinternalreader, $minloginternalreader, $logtable) = report_outline_get_common_log_variables();
 

report/stats/locallib.php

@@ -236,7 +236,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
                 ' - ' .
                 get_string('statsreport' . $report) .
                 $rolename .
-                $userdisplayname
+                $userdisplayname, 3
             );
 
             if ($mode == STATS_MODE_DETAILED) {