From e382b5e2cb8933df14bff5dc86d85efb343229a2 Mon Sep 17 00:00:00 2001
From: ghermens <47635467+ghermens@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:34:28 +0200
Subject: [PATCH] [BUGFIX] Correctly format section header on summary page

See upstream changes in EXT:form
---
 .../Frontend/Partials/SummaryPage.html        | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/Resources/Private/Frontend/Partials/SummaryPage.html b/Resources/Private/Frontend/Partials/SummaryPage.html
index cb31738..3ce7dee 100644
--- a/Resources/Private/Frontend/Partials/SummaryPage.html
+++ b/Resources/Private/Frontend/Partials/SummaryPage.html
@@ -8,35 +8,42 @@
             <table class="table">
                 <formvh:renderAllFormValues renderable="{page.rootForm}" as="formValue">
                     <tr>
-                        <td class="summary-table-first-col">{formvh:translateElementProperty(element: formValue.element, property: 'label') -> f:format.stripTags(allowedTags: '<a>')}</td>
-                        <td>
-                            <f:if condition="{formValue.value}">
-                                <f:then>
-                                    <f:if condition="{0: formValue.element.type} == {0: 'ImageUpload'}">
+                        <f:if condition="{formValue.isSection}">
+                            <f:then>
+                                <td colspan="2"><b>{formvh:translateElementProperty(element: formValue.element, property: 'label')}</b></td>
+                            </f:then>
+                            <f:else>
+                                <td class="summary-table-first-col">{formvh:translateElementProperty(element: formValue.element, property: 'label') -> f:format.stripTags(allowedTags: '<a>')}</td>
+                                <td>
+                                    <f:if condition="{formValue.value}">
                                         <f:then>
-                                            <f:image image="{formValue.value}" maxWidth="{formValue.element.properties.imageMaxWidth}" maxHeight="{formValue.element.properties.imageMaxHeight}" alt="{formvh:translateElementProperty(element: formValue.element, property: 'altText')}" />
-                                        </f:then>
-                                        <f:else>
-                                            <f:if condition="{formValue.isMultiValue}">
+                                            <f:if condition="{0: formValue.element.type} == {0: 'ImageUpload'}">
                                                 <f:then>
-                                                    <ul>
-                                                        <f:for each="{formValue.processedValue}" as="value">
-                                                            <li>{value}</li>
-                                                        </f:for>
-                                                    </ul>
+                                                    <f:image image="{formValue.value}" maxWidth="{formValue.element.properties.imageMaxWidth}" maxHeight="{formValue.element.properties.imageMaxHeight}" alt="{formvh:translateElementProperty(element: formValue.element, property: 'altText')}" />
                                                 </f:then>
                                                 <f:else>
-                                                    <f:format.nl2br>{formValue.processedValue}</f:format.nl2br>
+                                                    <f:if condition="{formValue.isMultiValue}">
+                                                        <f:then>
+                                                            <ul>
+                                                                <f:for each="{formValue.processedValue}" as="value">
+                                                                    <li>{value}</li>
+                                                                </f:for>
+                                                            </ul>
+                                                        </f:then>
+                                                        <f:else>
+                                                            <f:format.nl2br>{formValue.processedValue}</f:format.nl2br>
+                                                        </f:else>
+                                                    </f:if>
                                                 </f:else>
                                             </f:if>
+                                        </f:then>
+                                        <f:else>
+                                            -
                                         </f:else>
                                     </f:if>
-                                </f:then>
-                                <f:else>
-                                    -
-                                </f:else>
-                            </f:if>
-                        </td>
+                                </td>
+                            </f:else>
+                        </f:if>
                     </tr>
                 </formvh:renderAllFormValues>
             </table>