Commit f35d7e18 authored by Alexandru Catalin Dinis's avatar Alexandru Catalin Dinis Committed by Christian Kuhn
Browse files

[TASK] Add scheduler task description

Shows the task description below the task name in list.

Releases: master
Resolves: #67332
Resolves: #67830
Change-Id: I986a1df5c578e9d3160603a3b9c3d8e8fb8ce6ab
Reviewed-on: http://review.typo3.org/40921


Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Markus Klein's avatarMarkus Klein <markus.klein@typo3.org>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 51f46536
......@@ -1011,7 +1011,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
$name .= $this->renderTaskProgressBar($progress);
}
if (!empty($additionalInformation)) {
$name .= '<div class="additional-information"><span title="' . htmlspecialchars($additionalInformation) . '">[' . GeneralUtility::fixed_lgd_cs(htmlspecialchars($additionalInformation), (int)$this->getBackendUser()->uc['titleLen']) . ']</span></div>';
$name .= '<div class="additional-information">' . nl2br(htmlspecialchars($additionalInformation)) . '</div>';
}
// Check if task currently has a running execution
if (!empty($schedulerRecord['serialized_executions'])) {
......@@ -1098,17 +1098,17 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
}
// Format the execution status,
// including failure feedback, if any
$taskDesc = '';
if ($schedulerRecord['description'] !== '') {
$taskName = '<span title="' . htmlspecialchars($schedulerRecord['description']) . '">' . $name . '</span>';
} else {
$taskName = $name;
$taskDesc = '<span class="description">' . nl2br(htmlspecialchars($schedulerRecord['description'])) . '</span>';
}
$taskName = '<span class="name">' . $name . '</span>';
$table[] =
'<tr class="' . ($showAsDisabled ? 'disabled' : '') . '">'
. '<td>' . $startExecutionElement . '</td>'
. '<td class="right">' . $schedulerRecord['uid'] . '</td>'
. '<td>' . $taskName . ' ' . $this->makeStatusLabel($labels) . '</td>'
. '<td>' . $this->makeStatusLabel($labels) . $taskName . $taskDesc . '</td>'
. '<td>' . $execType . '</td>'
. '<td>' . $frequency . '</td>'
. '<td>' . $multiple . '</td>'
......@@ -1139,7 +1139,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
}
$this->getDatabaseConnection()->sql_free_result($res);
$this->view->assign('table', '<div class="table-fit"><table class="table table-striped table-hover">' . implode(LF, $table) . '</table></div>');
$this->view->assign('table', '<table class="table table-striped table-hover">' . implode(LF, $table) . '</table>');
// Server date time
$dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'] . ' T (e';
......@@ -1161,7 +1161,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
if (empty($label['text'])) {
continue;
}
$htmlLabels[] = '<span class="label label-' . $label['class'] . '" title="' . htmlspecialchars($label['description']) . '">' . $label['text'] . '</span>';
$htmlLabels[] = '<span class="label label-' . htmlspecialchars($label['class']) . ' pull-right" title="' . htmlspecialchars($label['description']) . '">' . htmlspecialchars($label['text']) . '</span>';
}
return implode('&nbsp;', $htmlLabels);
......
//
// Scheduler module
//
.tx_scheduler_mod1 {
.table {
td {
vertical-align: top;
}
span.name {
display: block;
}
span.description {
font-style: italic;
white-space: normal;
color: @gray;
}
}
}
......@@ -139,6 +139,7 @@
@import "TYPO3/_main_scaffolding.less";
@import "TYPO3/_module_menu.less";
@import "TYPO3/_module_database.less";
@import "TYPO3/_module_scheduler.less";
@import "TYPO3/_module_web_page.less";
@import "TYPO3/_topbar.less";
@import "TYPO3/_debugconsole.less";
......
......@@ -12346,6 +12346,17 @@ iframe {
.query-builder .indent {
padding-left: 20px;
}
.tx_scheduler_mod1 .table td {
vertical-align: top;
}
.tx_scheduler_mod1 .table span.name {
display: block;
}
.tx_scheduler_mod1 .table span.description {
font-style: italic;
white-space: normal;
color: #737373;
}
.t3-grid-table {
border-collapse: separate;
border-spacing: 10px 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment