From 87427a3b83f3c23836216cbee3998759b7cf6188 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Wed, 20 Jun 2018 17:02:23 +0200
Subject: [PATCH] [TASK] Improve wording of upgrade wizards in Install Tool
Change the misleading headling "Available wizards" and
switch color of progress bar to success if 100% reached.
Resolves: #85299
Releases: master, 8.7
Change-Id: I6e08da59313fe9efc51f3e4e061a4d3068cadc80
Reviewed-on: https://review.typo3.org/57272
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: David Bruchmann <davidbruchmann@gmail.com>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
---
.../Resources/Private/Templates/Upgrade/UpgradeWizards.html | 3 ++-
.../Resources/Public/JavaScript/Modules/UpgradeWizards.js | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
index 5dffac5059e9..bf136e695787 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Upgrade/UpgradeWizards.html
@@ -101,7 +101,8 @@
<hr>
-<h4>Available wizards</h4>
+<h4>Upgrade status</h4>
+<p>Progress of upgrade wizards:</p>
<div class="upgradeWizards-wizards-output t3js-upgradeWizards-wizards-output"></div>
<hr>
diff --git a/typo3/sysext/install/Resources/Public/JavaScript/Modules/UpgradeWizards.js b/typo3/sysext/install/Resources/Public/JavaScript/Modules/UpgradeWizards.js
index f29199663f7b..aa426e246ee7 100644
--- a/typo3/sysext/install/Resources/Public/JavaScript/Modules/UpgradeWizards.js
+++ b/typo3/sysext/install/Resources/Public/JavaScript/Modules/UpgradeWizards.js
@@ -296,6 +296,10 @@ define([
var percent = 100;
if (numberOfWizardsTodo > 0) {
percent = ((numberOfWizards - numberOfWizardsTodo) / data.wizards.length) * 100;
+ } else {
+ list.find('.progress-bar')
+ .removeClass('progress-bar-info')
+ .addClass('progress-bar-success');
}
list.find('.progress-bar')
.css('width', percent + '%')
--
GitLab