diff --git a/typo3/sysext/scheduler/Documentation/Administration/BackendModule/Index.rst b/typo3/sysext/scheduler/Documentation/Administration/BackendModule/Index.rst
index 4a7cedd8d5b840885d5fb8b129403b8872637b13..a54fbe2cf561c0b58e714db00ba2309fbfefb085 100644
--- a/typo3/sysext/scheduler/Documentation/Administration/BackendModule/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Administration/BackendModule/Index.rst
@@ -19,7 +19,6 @@ The setup check screen
This screen has already been mentioned in the :ref:`Installation chapter <setup-check>`.
It is mostly useful when setting up the Scheduler, as it indicates
-whether the necessary "\_cli\_scheduler" BE user exist or not and
whether the CLI script is executable or not. When everything is
running fine, it contains mostly one useful piece of information: when
the last run took place, when it ended and whether it was started
@@ -62,11 +61,11 @@ information.
Main screen of the Scheduler BE module
-Disabled tasks appear in grayed-out text. A disabled task is a
+Disabled tasks have a gray label sign near the task name. A disabled task is a
task that will not be run automatically by the command-line script,
but may still be executed from the BE module.
-A late task will appear this way:
+A late task will appear with an orange label sign near the task name:
.. figure:: ../../Images/LateTask.png
:alt: A late task in the Scheduler main screen
@@ -74,6 +73,9 @@ A late task will appear this way:
A late task in the main screen of the Scheduler BE module
+The task list can be sorted by clicking the column label. With every click it
+switches between ascending and descending order of the items of the associated column.
+
The table at the center of the above screenshot shows the
following:
@@ -84,39 +86,42 @@ following:
selected tasks" button. Read more in "Manually executing a task"
below.
-- The second column contains possible actions, mainly editing or
- deleting a task. The actions will be unavailable for a task that is
- currently running, as it is unwise to edit or delete it a task in such
- a case. Instead a running task will display a "stop" button (see
- "Stopping a task" below).
-
-- The third column simply displays the id of the task.
+- The second column simply displays the id of the task.
-- The fourth column contains the name of the task, the extension it is
+- The third column contains the name of the task, the extension it is
coming from and any additional information specific to the task (for
example, the e-mail to which the "test" task will send a message or
the sleep duration of the "sleep" task). It also show a summary of the
task's status with an icon.
-- The fifth column shows whether the task is recurring or will run only
+- The fourth column shows whether the task is recurring or will run only
a single time.
-- The sixth column shows the frequency.
+- The fifth column shows the frequency.
-- The seventh columns indicates whether parallel executions are allowed
+- The sixth columns indicates whether parallel executions are allowed
or not.
-- The eighth column shows the last execution time and indicates whether
+- The seventh column shows the last execution time and indicates whether
the task was launched manually or was run via the command-line script
(cron).
-- The last column shows the planned execution time. If the task is
+- The eighth column shows the planned execution time. If the task is
overdue, the time will show up in bold, red numbers. A task may have
no future execution date if it has reached its end date, if it was
meant to run a single time and that execution is done, or if the task
is disabled. The next execution time is also hidden for running tasks,
as this information makes no sense at that point in time.
+- The last column contains possible actions, mainly editing, disable or
+ deleting a task. There are also buttons for running the task on the
+ next cron job or run it directly.
+ The actions will be unavailable for a task that is currently running,
+ as it is unwise to edit or delete it a task in such a case. Instead a
+ running task will display a "stop" button (see "Stopping a task" below).
+
+
+
Note that all dates and times are displayed in the server's time zone.
The server time appears at the bottom of the screen.
diff --git a/typo3/sysext/scheduler/Documentation/Administration/EditTask/Index.rst b/typo3/sysext/scheduler/Documentation/Administration/EditTask/Index.rst
index c159fdba619698d78dab72c2fb66e38f2c05cab0..cae128754a6a108a13643c149b94c7314b3e6201 100644
--- a/typo3/sysext/scheduler/Documentation/Administration/EditTask/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Administration/EditTask/Index.rst
@@ -28,6 +28,12 @@ available by moving the mouse over the field labels):
- The class selector is available only when adding a new task. The class
cannot be changed when editing a task, since there's no sense in that.
+.. figure:: ../../Images/TaskConfigurationSelectClass.png
+ :alt: Select a class
+
+ Select the class of the scheduled task
+
+
- A task must have a start date. The end date is not mandatory, though.
A task without end date will run forever. Dates and times must be
entered in the server's time zone. The server's time appears at the
@@ -54,7 +60,13 @@ confirmation message.
.. figure:: ../../Images/InputValidation.png
:alt: Input validation
- Input validation when adding a new scheduled task or editing an existing one
+ Input validation failed when adding a new scheduled task or editing an existing one
+
+
+.. figure:: ../../Images/InputValidationOk.png
+ :alt: Input validation OK
+
+ Input validation succeeded when adding a new scheduled task or editing an existing one
If an error occurs when validating a cron definition, the
diff --git a/typo3/sysext/scheduler/Documentation/Administration/ExecuteNextCronjob/index.rst b/typo3/sysext/scheduler/Documentation/Administration/ExecuteNextCronjob/Index.rst
similarity index 100%
rename from typo3/sysext/scheduler/Documentation/Administration/ExecuteNextCronjob/index.rst
rename to typo3/sysext/scheduler/Documentation/Administration/ExecuteNextCronjob/Index.rst
diff --git a/typo3/sysext/scheduler/Documentation/Administration/GroupTask/Index.rst b/typo3/sysext/scheduler/Documentation/Administration/GroupTask/Index.rst
index 5edcecb11aa7f2a0530d132738e7a9f1722885c5..5a6435b605993da13860c22bf4b87242efcbbde0 100644
--- a/typo3/sysext/scheduler/Documentation/Administration/GroupTask/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Administration/GroupTask/Index.rst
@@ -19,6 +19,7 @@ In case of a high number of different tasks, it may be useful to visually group
Grouping related tasks together
+
Scheduler task groups are records stored on the root page (pid=0). They may be created, edited and sorted with Web > List:
.. figure:: ../../Images/GroupRecords.png
@@ -26,7 +27,12 @@ Scheduler task groups are records stored on the root page (pid=0). They may be c
Management of scheduler task groups
+
Individual tasks may then be edited as usual and associated to a given scheduler task group.
+The individual groups can be sorted independent of each other by clicking the column label.
+With every click it switches between ascending and descending order of the items of the associated column
+in the corresponding group.
+
.. note::
Tasks inside a hidden group are neither automatically executed nor displayed in the scheduler module.
diff --git a/typo3/sysext/scheduler/Documentation/Administration/ManualExecution/Index.rst b/typo3/sysext/scheduler/Documentation/Administration/ManualExecution/Index.rst
index ddc99806c2124aa7d78d1d88af44bfa89055b7ec..3fe79f7a6643236203d7d73e5dde3aa1b7e7017b 100644
--- a/typo3/sysext/scheduler/Documentation/Administration/ManualExecution/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Administration/ManualExecution/Index.rst
@@ -19,3 +19,11 @@ task's run. There's one important thing to note: if the task was
overdue, a new execution date will be calculated. If the task was
**not** overdue, the previously calculated next execution date stays.
+A single task can be started by pressing the appropriate button in
+the row of the task. Multiple tasks can be started by selecting the
+checkboxes on the left side of the task row and then pressing the
+appropriate button beneath the task list.
+
+There is one button for directly starting the task and another button
+for starting the task with the next cron job.
+
diff --git a/typo3/sysext/scheduler/Documentation/Images/AddingATask.png b/typo3/sysext/scheduler/Documentation/Images/AddingATask.png
index 18935811a3bf949789b9ef2462cf14c2b04af530..2b0148e2fbc5f5430b8e1ea61cd93a3b6add4392 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/AddingATask.png and b/typo3/sysext/scheduler/Documentation/Images/AddingATask.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/ExtensionConfiguration.png b/typo3/sysext/scheduler/Documentation/Images/ExtensionConfiguration.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee4e5209c32408f5be986c63ebd545336690650d
Binary files /dev/null and b/typo3/sysext/scheduler/Documentation/Images/ExtensionConfiguration.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/GroupRecords.png b/typo3/sysext/scheduler/Documentation/Images/GroupRecords.png
index 8b62dfc7a7d2cf0d8b1b15eedb84d11c46e9096c..34bc472b1207d3833e96616c12e43b7d21645667 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/GroupRecords.png and b/typo3/sysext/scheduler/Documentation/Images/GroupRecords.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/GroupedTasks.png b/typo3/sysext/scheduler/Documentation/Images/GroupedTasks.png
index a6678e062b02ab995674bedfb484d7ece5a334f3..87b3c4d5a38dce8cc665839aa91d326c34fe8255 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/GroupedTasks.png and b/typo3/sysext/scheduler/Documentation/Images/GroupedTasks.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/InformationScreen.png b/typo3/sysext/scheduler/Documentation/Images/InformationScreen.png
index d17fc09ac109bc4b0aa936bf6e904e2cf267ffcf..3842b3d30b3fc1ff1ad37e412e138737817012ba 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/InformationScreen.png and b/typo3/sysext/scheduler/Documentation/Images/InformationScreen.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/InputValidation.png b/typo3/sysext/scheduler/Documentation/Images/InputValidation.png
index d73c854f9ea587fc83628d7f234c05ea0ca41281..c51b557d53ea63fae045e38e2b4b9c14614a9651 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/InputValidation.png and b/typo3/sysext/scheduler/Documentation/Images/InputValidation.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/InputValidationOk.png b/typo3/sysext/scheduler/Documentation/Images/InputValidationOk.png
new file mode 100644
index 0000000000000000000000000000000000000000..1766f69b8042c173d3153ace8dc0430485c1c383
Binary files /dev/null and b/typo3/sysext/scheduler/Documentation/Images/InputValidationOk.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/LateTask.png b/typo3/sysext/scheduler/Documentation/Images/LateTask.png
index 182b4c08f0a6ed6a7e3fae0bf1617ee018622d31..dbccd775ba495a2d09c59ca8310c8a5b71f1345f 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/LateTask.png and b/typo3/sysext/scheduler/Documentation/Images/LateTask.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/MissingTaskClass.png b/typo3/sysext/scheduler/Documentation/Images/MissingTaskClass.png
index 424bbd01fcd1acde02f066cb66fe888b410ae580..47829e8eaaf0a088f4810c4f54b88cd9705a4210 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/MissingTaskClass.png and b/typo3/sysext/scheduler/Documentation/Images/MissingTaskClass.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/SetupCheck.png b/typo3/sysext/scheduler/Documentation/Images/SetupCheck.png
index 55f251d48ff1bcd8e16eed45cf8023fbae8f2bf7..33f6685e342946f4246a2f37bfe3d3c09ad36f59 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/SetupCheck.png and b/typo3/sysext/scheduler/Documentation/Images/SetupCheck.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/StoppingATask.png b/typo3/sysext/scheduler/Documentation/Images/StoppingATask.png
index 08cdad3ee31a3df72df08e0d96fe2d99941d6e4b..155ebabea473dade9f048a889a9d7629d948d27a 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/StoppingATask.png and b/typo3/sysext/scheduler/Documentation/Images/StoppingATask.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/TableGarbageCollectionTaskConfiguration.png b/typo3/sysext/scheduler/Documentation/Images/TableGarbageCollectionTaskConfiguration.png
index 65badb0dc58255486bd178b1041376a057320268..e153dc251eb716e5cc6c337a76943cbba1d935f3 100644
Binary files a/typo3/sysext/scheduler/Documentation/Images/TableGarbageCollectionTaskConfiguration.png and b/typo3/sysext/scheduler/Documentation/Images/TableGarbageCollectionTaskConfiguration.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Images/TaskConfigurationSelectClass.png b/typo3/sysext/scheduler/Documentation/Images/TaskConfigurationSelectClass.png
new file mode 100644
index 0000000000000000000000000000000000000000..8973e8bedc72a333a90a73a58690ba9c4d7e0419
Binary files /dev/null and b/typo3/sysext/scheduler/Documentation/Images/TaskConfigurationSelectClass.png differ
diff --git a/typo3/sysext/scheduler/Documentation/Installation/Index.rst b/typo3/sysext/scheduler/Documentation/Installation/Index.rst
index 08da373e5c19e7731352010ac3754dc4efed8727..3c7a64a4a5c1aebc744fefddc9661bca4b4d058a 100644
--- a/typo3/sysext/scheduler/Documentation/Installation/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Installation/Index.rst
@@ -20,7 +20,6 @@ Installation
Installing/Index
SetupCheck/Index
- SchedulerUser/Index
SchedulerShellScript/Index
CronJob/Index
BaseTasks/Index
diff --git a/typo3/sysext/scheduler/Documentation/Installation/Installing/Index.rst b/typo3/sysext/scheduler/Documentation/Installation/Installing/Index.rst
index 05fbd313d595a710b4309eaf2cc7f7330968ba11..c557a3b99b055d94241b1e1604e2a7ee6426ddf7 100644
--- a/typo3/sysext/scheduler/Documentation/Installation/Installing/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Installation/Installing/Index.rst
@@ -26,7 +26,7 @@ extension is installed, the following settings are available:
- **Enable logging** : by default, the Scheduler will write an entry in
the BE log every time it starts and ends, and also when it skips a
(denied) parallel execution. This is helpful when setting up a system,
- but it may end up cluttering the log in the log run. It's possible to
+ but it may end up cluttering the log in the long run. It's possible to
turn off all logging by unchecking this option.
- **Enable sample tasks** : the Scheduler provides two sample tasks
@@ -36,3 +36,10 @@ extension is installed, the following settings are available:
off. If disabled, they won't appear in the list of available tasks
anymore.
+.. figure:: ../../Images/ExtensionConfiguration.png
+ :alt: Extension configuration
+
+ Configuring the extension settings
+
+
+
diff --git a/typo3/sysext/scheduler/Documentation/Installation/SchedulerUser/Index.rst b/typo3/sysext/scheduler/Documentation/Installation/SchedulerUser/Index.rst
deleted file mode 100644
index 90d4964dd780d937816a63ebd280bdbe4fbc17f1..0000000000000000000000000000000000000000
--- a/typo3/sysext/scheduler/Documentation/Installation/SchedulerUser/Index.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. ==================================================
-.. FOR YOUR INFORMATION
-.. --------------------------------------------------
-.. -*- coding: utf-8 -*- with BOM.
-
-.. include:: ../../Includes.txt
-
-
-
-.. _scheduler-user:
-
-The Scheduler user
-^^^^^^^^^^^^^^^^^^
-
-When tasks are launched manually from the BE module, they are executed
-using the current BE user. When tasks are run from the command line,
-however, a specific command-line user, called "\_cli\_" with admin rights
-is created on-the-fly.
\ No newline at end of file
diff --git a/typo3/sysext/scheduler/Documentation/Installation/SetupCheck/Index.rst b/typo3/sysext/scheduler/Documentation/Installation/SetupCheck/Index.rst
index 35211af0466087cb38ea99e1cdfd08479768d739..1274b2e25f34be7173954b057fab3d6831010e4d 100644
--- a/typo3/sysext/scheduler/Documentation/Installation/SetupCheck/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Installation/SetupCheck/Index.rst
@@ -20,12 +20,12 @@ installation. It will probably look something like this:
Checking the setup of the Scheduler
-The first warning just means that the Scheduler has never run
-yet and can be safely ignored for now. The second message is an error
-and must be addressed. See next section.
+The first message shows a warning that the Scheduler has never run
+yet or an information about the last run.
-The third message should normally be okay. If there's an error
+The second message should normally be okay. If there's an error
instead, it means that permissions to execute TYPO3's command-line
dispatcher must be checked (this is not strictly related to the
Scheduler).
+The third message shows information about the current server time.
diff --git a/typo3/sysext/scheduler/Documentation/Overview/Index.rst b/typo3/sysext/scheduler/Documentation/Overview/Index.rst
index dfd5101e889288c311b8129280135a408df6beb6..c1708594204f09360f92e60c6c626444c52cc0f4 100644
--- a/typo3/sysext/scheduler/Documentation/Overview/Index.rst
+++ b/typo3/sysext/scheduler/Documentation/Overview/Index.rst
@@ -75,7 +75,7 @@ Follow-up
^^^^^^^^^
Whenever a task starts or ends a message is written to TYPO'3 system
-log (viewable in the Admin Tools > Log module). A message is also
+log (viewable in SYSTEM > Log). A message is also
written when a parallel execution has been blocked. This makes it
possible to follow what happens, since the main purpose of the
Scheduler is to run things when nobody is watching.
diff --git a/typo3/sysext/scheduler/Resources/Private/Language/locallang.xlf b/typo3/sysext/scheduler/Resources/Private/Language/locallang.xlf
index 9122e973616817c9feea2f70bc8aa9df29f9dc8e..ce81ec65807073c02ae04386ee933d1d22e0017f 100644
--- a/typo3/sysext/scheduler/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/scheduler/Resources/Private/Language/locallang.xlf
@@ -271,7 +271,7 @@
<source>Please select at least one cache backend.</source>
</trans-unit>
<trans-unit id="msg.invalidTaskClass">
- <source>Class %s of the registered task could not be found. You should re-install the extension that provided it or simply delete this task.</source>
+ <source>The class of a registered task could not be found. You should re-install the extension that provided it or simply delete this task.</source>
</trans-unit>
<trans-unit id="msg.invalidTaskClassEdit">
<source>The current class (%s) could not be found. Change it below or consider deleting this task altogether.</source>
diff --git a/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html b/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html
index 35ae06a91eab7cb238ba84b0d5a36199cd5a56aa..0a1ed7e8341d5495d28dc3fae9b2d839a96f6a69 100644
--- a/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html
+++ b/typo3/sysext/scheduler/Resources/Private/Partials/Backend/SchedulerModule/TaskList.html
@@ -79,7 +79,7 @@
<td><span class="t-span">{taskRecord.frequency}</span></td>
<td><span class="t-span">{taskRecord.multiple}</span></td>
<td><span class="t-span">{taskRecord.lastExecution}</span></td>
- <td><span class="t-span">{taskRecord.nextDate}</span></td>
+ <td><span class="t-span {taskRecord.labels.nextexecution.class}">{taskRecord.nextDate}</span></td>
<td class="nowrap"><span class="t-span">
<f:if condition="{taskRecord.isRunning}">
<f:then>
@@ -139,6 +139,12 @@
</f:for>
<f:if condition="{missingClasses}">
+ <table class="table table-striped table-hover" style="margin-bottom: -2px;">
+ <tr class="taskGroup" data-task-group-id="0">
+ <td><span><strong><f:translate key="msg.invalidTaskClass" /></strong></span>
+ </td>
+ </tr>
+ </table>
<table class="table table-striped table-hover">
<thead>
<th><span class="t-span"><f:translate key="label.id" /></span></th>
@@ -148,7 +154,7 @@
<f:for each="{missingClasses}" as="missingClass">
<tr>
<td class="right">{missingClass.uid}</td>
- <td><span class="label label-danger" style="white-space: normal"><f:translate key="msg.invalidTaskClass" arguments="{0: '{missingClass.class}'}" /></span></td>
+ <td><span class="label label-danger">{missingClass.class}</span></td>
<td class="nowrap">
<div class="btn-group" role="group">
<a data-toggle="tooltip" data-container="body" class="btn btn-default t3js-modal-trigger" href="{moduleUri}&CMD=delete&tx_scheduler[uid]={missingClass.uid}"