From 3f02811b2e806b136d2f1a575de27455117e671f Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Tue, 16 Nov 2021 12:51:41 +0100
Subject: [PATCH] [BUGFIX] Add missing class to form wizard items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In #94688, the table layout of form fields
had been replaced by a grid layout. However,
some places did not receive the new classes,
leading to display error.

This is fixed by adding the corresponding
classes to those places.

Resolves: #95994
Relates: #94688
Releases: master
Change-Id: Iba3ea2d3f665d055864edd9c8329dac939aa2642
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72191
Tested-by: Nikita Hovratov <nikita.h@live.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
---
 .../backend/Resources/Private/Layouts/ImageManipulation.html    | 2 +-
 .../rte_ckeditor/Classes/Form/Element/RichTextElement.php       | 2 +-
 .../Private/Templates/Backend/SchedulerModule/EditTask.html     | 2 +-
 typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html b/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
index 40d1311457b7..9e38f53f14d6 100644
--- a/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
+++ b/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
@@ -4,7 +4,7 @@
         <div class="form-wizards-element">
             <f:render section="Main" />
         </div>
-        <div class="form-wizards-items-aside">
+        <div class="form-wizards-items-aside form-wizards-items-aside--field-control">
             <div class="btn-group">
                 {fieldControl -> f:format.raw()}
             </div>
diff --git a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
index ba99c8d4a760..0c649737ccc5 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
@@ -144,7 +144,7 @@ class RichTextElement extends AbstractFormElement
         $html[] =               '</textarea>';
         $html[] =           '</div>';
         if (!empty($fieldControlHtml)) {
-            $html[] =           '<div class="form-wizards-items-aside">';
+            $html[] =           '<div class="form-wizards-items-aside form-wizards-items-aside--field-control">';
             $html[] =               '<div class="btn-group">';
             $html[] =                   $fieldControlHtml;
             $html[] =               '</div>';
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
index 8d09193187df..1404c619769a 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
@@ -106,7 +106,7 @@
                     <input type="text" name="tx_scheduler[frequency]" class="form-control" id="task_frequency" value="{frequency}">
                 </div>
                 <f:if condition="{frequencyOptions}">
-                    <div class="form-wizards-items-aside">
+                    <div class="form-wizards-items-aside form-wizards-items-aside--field-control">
                         <div class="btn-group">
                             <select
                                 data-update-task-frequency
diff --git a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
index eea3b955ba3d..bef2225a1075 100644
--- a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
+++ b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
@@ -152,7 +152,7 @@ class T3editorElement extends AbstractFormElement
         $html[] =               $editorHtml;
         $html[] =           '</div>';
         if (!empty($fieldControlHtml)) {
-            $html[] =           '<div class="form-wizards-items-aside">';
+            $html[] =           '<div class="form-wizards-items-aside form-wizards-items-aside--field-control">';
             $html[] =               '<div class="btn-group">';
             $html[] =                   $fieldControlHtml;
             $html[] =               '</div>';
-- 
GitLab