From 51a752fae27c8b4d65f74d1fa5ca1a63e747dbf5 Mon Sep 17 00:00:00 2001
From: Brendan Heywood <brendan@catalyst-au.net>
Date: Thu, 8 Feb 2024 12:27:57 +1100
Subject: [PATCH] MDL-80290 task: Refactor styles to be consistent
---
admin/tool/task/run_adhoctasks.php | 9 +++++----
admin/tool/task/schedule_task.php | 3 +--
admin/tool/task/styles.css | 11 +++++++++++
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/admin/tool/task/run_adhoctasks.php b/admin/tool/task/run_adhoctasks.php
index b1b831c3368..7912f4b1beb 100644
--- a/admin/tool/task/run_adhoctasks.php
+++ b/admin/tool/task/run_adhoctasks.php
@@ -115,6 +115,8 @@ if (!$confirmed) {
require_sesskey();
\core\session\manager::write_close();
+echo $OUTPUT->footer();
+echo $OUTPUT->select_element_for_append();
// Prepare to handle output via mtrace.
require_once("{$CFG->dirroot}/{$CFG->admin}/tool/task/lib.php");
@@ -124,7 +126,7 @@ $CFG->mtrace_wrapper = 'tool_task_mtrace_wrapper';
if ($taskid) {
$repeat = $DB->get_record('task_adhoc', ['id' => $taskid]);
- echo html_writer::start_tag('pre');
+ echo html_writer::start_tag('pre', ['class' => 'task-output']);
\core\task\manager::run_adhoc_from_cli($taskid);
echo html_writer::end_tag('pre');
} else {
@@ -133,13 +135,13 @@ if ($taskid) {
// Run failed first (if any). We have to run them separately anyway,
// because faildelay is observed if failed flag is not true.
echo html_writer::tag('p', get_string('runningfailedtasks', 'tool_task'), ['class' => 'lead']);
- echo html_writer::start_tag('pre');
+ echo html_writer::start_tag('pre', ['class' => 'task-output']);
\core\task\manager::run_all_adhoc_from_cli(true, $classname);
echo html_writer::end_tag('pre');
if (!$failedonly) {
echo html_writer::tag('p', get_string('runningalltasks', 'tool_task'), ['class' => 'lead']);
- echo html_writer::start_tag('pre');
+ echo html_writer::start_tag('pre', ['class' => 'task-output']);
\core\task\manager::run_all_adhoc_from_cli(false, $classname);
echo html_writer::end_tag('pre');
}
@@ -161,4 +163,3 @@ echo html_writer::div(
)
);
-echo $OUTPUT->footer();
diff --git a/admin/tool/task/schedule_task.php b/admin/tool/task/schedule_task.php
index 654a411f5a0..e753c145f09 100644
--- a/admin/tool/task/schedule_task.php
+++ b/admin/tool/task/schedule_task.php
@@ -88,9 +88,8 @@ echo $OUTPUT->footer();
echo $OUTPUT->select_element_for_append();
// Prepare to handle output via mtrace.
-echo html_writer::start_tag('pre', ['style' => 'color: #fff; background: #333; padding: 1em; min-height: 24lh']);
-
require_once("{$CFG->dirroot}/{$CFG->admin}/tool/task/lib.php");
+echo html_writer::start_tag('pre', ['class' => 'task-output', 'style' => 'min-height: 24lh']);
$CFG->mtrace_wrapper = 'tool_task_mtrace_wrapper';
// Run the specified task (this will output an error if it doesn't exist).
diff --git a/admin/tool/task/styles.css b/admin/tool/task/styles.css
index f297fd6afaf..6b118e831dd 100644
--- a/admin/tool/task/styles.css
+++ b/admin/tool/task/styles.css
@@ -15,3 +15,14 @@
#page-admin-tool-task-scheduledtasks .task-clearfaildelay {
font-size: 0.75em;
}
+
+.path-admin-tool-task .task-output {
+ color: #fff;
+ background: #333;
+ padding: 1em;
+
+ a {
+ color: #fff;
+ text-decoration: underline;
+ }
+}