[BUGFIX] Minor issues with scheduler progress bars

The progress bars introduced in the scheduler have two small issues:

 * an empty line between the progress bar and additional information
 * if progress is not far enough the percentage value breaks to a new
   line, becoming invisible to the user

Change-Id: I4fbd5d5318aa248826fab8918e931533a4c0a852
Fixes: #38673
Releases: 6.0
Reviewed-on: http://review.typo3.org/12625
Reviewed-by: Ingo Renner
Tested-by: Ingo Renner

diff --git a/typo3/sysext/scheduler/class.tx_scheduler_module.php b/typo3/sysext/scheduler/class.tx_scheduler_module.php
index 78f18c5..bc9eb2d 100644 (file)
--- a/typo3/sysext/scheduler/class.tx_scheduler_module.php
+++ b/typo3/sysext/scheduler/class.tx_scheduler_module.php
@@ -527,10 +527,10 @@ class tx_scheduler_Module extends t3lib_SCbase {
         */
        protected function renderTaskProgressBar($progress) {
                $progressText .= $GLOBALS['LANG']->getLL('status.progress')
-                       . ': ' . $progress . '%';
+                       . ': ' . $progress . '%';
 
                $progressBar = '<div class="progress"> <div class="bar" style="width: '
-                       . round($progress)
+                       . $progress
                        . '%;">'
                        . $progressText
                        . '</div> </div>';
@@ -1096,6 +1096,7 @@ class tx_scheduler_Module extends t3lib_SCbase {
                                        // The task object is valid
 
                                        $name = htmlspecialchars($registeredClasses[$schedulerRecord['classname']]['title']. ' (' . $registeredClasses[$schedulerRecord['classname']]['extension'] . ')');
+                                       $name .= '<br /> ';
                                        $additionalInformation = $task->getAdditionalInformation();
 
                                        if ($task instanceof tx_scheduler_ProgressProvider) {
@@ -1104,7 +1105,7 @@ class tx_scheduler_Module extends t3lib_SCbase {
                                        }
 
                                        if (!empty($additionalInformation)) {
-                                               $name .= '<br />[' . htmlspecialchars($additionalInformation) . ']';
+                                               $name .= '[' . htmlspecialchars($additionalInformation) . ']';
                                        }
 
                                                // Check if task currently has a running execution
@@ -1648,4 +1649,4 @@ class tx_scheduler_Module extends t3lib_SCbase {
                return $result;
        }
 }
-?>
\ No newline at end of file
+?>