From c9beebec291153c88aa4c7084bd50a210d278dc4 Mon Sep 17 00:00:00 2001
From: Ralf Zimmermann <ralf.zimmermann@tritum.de>
Date: Thu, 24 Sep 2015 21:13:24 +0200
Subject: [PATCH] [BUGFIX] EXT:form - typos in the partials
Resolves: #70091
Releases: master
Change-Id: I2a4cfde8ca80cdb57955646eccf071f32e0785f2
Reviewed-on: http://review.typo3.org/43537
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Jan Helke <typo3@helke.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../Confirmation/ContainerElements/Fieldset.html | 2 +-
.../Compatibility/Confirmation/FlatElements/Checkbox.html | 8 +++++---
.../Compatibility/Confirmation/FlatElements/Radio.html | 8 +++++---
.../Mail/Html/ContainerElements/Checkboxgroup.html | 2 +-
.../Mail/Html/ContainerElements/Fieldset.html | 2 +-
.../Mail/Html/ContainerElements/Radiogroup.html | 2 +-
.../PostProcessor/Mail/Html/FlatElements/Checkbox.html | 7 ++++---
.../PostProcessor/Mail/Html/FlatElements/Radio.html | 1 -
.../PostProcessor/Mail/Plain/FlatElements/Checkbox.html | 2 +-
.../PostProcessor/Mail/Plain/FlatElements/Radio.html | 2 +-
.../Mail/Html/ContainerElements/Checkboxgroup.html | 2 +-
.../Mail/Html/ContainerElements/Fieldset.html | 2 +-
.../Mail/Html/ContainerElements/Radiogroup.html | 2 +-
.../PostProcessor/Mail/Html/FlatElements/Checkbox.html | 7 ++++---
.../PostProcessor/Mail/Html/FlatElements/Radio.html | 5 ++---
.../PostProcessor/Mail/Plain/FlatElements/Checkbox.html | 2 +-
.../PostProcessor/Mail/Plain/FlatElements/Radio.html | 2 +-
17 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html
index 3e3114c58c8e..d52bbbfc0177 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html
@@ -21,7 +21,7 @@
</f:then>
<f:else>
<f:for each="{model.childElements}" as="element">
- <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
+ <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
</f:for>
</f:else>
</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html
index 97849bb1cbc7..6f23c5e34ad6 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html
@@ -1,10 +1,12 @@
-<f:if condition="{model.additionalArguments.checked} == 'checked'">
- <f:if condition="{model.showElement}">
+<f:if condition="{model.showElement}">
+ <f:if condition="{model.additionalArguments.checked} == 'checked'">
<f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
<f:format.raw>{model.layout.label}</f:format.raw>
<f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
</f:if>
+</f:if>
+<f:if condition="{model.additionalArguments.checked} == 'checked'">
<f:if condition="{model.additionalArguments.multiple}">
<f:then>
<f:form.hidden
@@ -37,7 +39,7 @@
onclick="{model.additionalArguments.onclick}"
name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
- value="{model.additionalArguments.value}"
+ value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
additionalAttributes="{model.htmlAttributes}"
/>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html
index 1bd7a96ab059..560a9771768e 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html
@@ -1,10 +1,12 @@
-<f:if condition="{model.additionalArguments.checked} == 'checked'">
- <f:if condition="{model.showElement}">
+<f:if condition="{model.showElement}">
+ <f:if condition="{model.additionalArguments.checked} == 'checked'">
<f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
<f:format.raw>{model.layout.label}</f:format.raw>
<f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
</f:if>
+</f:if>
+<f:if condition="{model.additionalArguments.checked} == 'checked'">
<f:form.hidden
class="{model.additionalArguments.class}"
dir="{model.additionalArguments.dir}"
@@ -21,4 +23,4 @@
additionalAttributes="{model.htmlAttributes}"
/>
-</f:if>
+</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
index e92fe90ec26a..022eb930b7c2 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
@@ -22,10 +22,10 @@
</td>
</tr>
</f:then>
+ <f:else>
<f:for each="{model.childElements}" as="element">
<f:render partial="{element.partialPath}" arguments="{model: element}" />
</f:for>
- <f:else>
</f:else>
</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
index 7f2e2b0a0f26..2e3fbe73801d 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
@@ -22,10 +22,10 @@
</td>
</tr>
</f:then>
+ <f:else>
<f:for each="{model.childElements}" as="element">
<f:render partial="{element.partialPath}" arguments="{model: element}" />
</f:for>
- <f:else>
</f:else>
</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
index e92fe90ec26a..022eb930b7c2 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
@@ -22,10 +22,10 @@
</td>
</tr>
</f:then>
+ <f:else>
<f:for each="{model.childElements}" as="element">
<f:render partial="{element.partialPath}" arguments="{model: element}" />
</f:for>
- <f:else>
</f:else>
</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html
index 605618bcc5ea..62ece06af8fa 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html
@@ -1,8 +1,9 @@
-<tr class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
+<f:if condition="{model.showElement}">
<f:if condition="{model.additionalArguments.checked} == 'checked'">
+<tr class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
<td style="width: 200px;">
<em>{model.additionalArguments.label}</em>
</td>
- <td>{model.additionalArguments.value}</td>
-</f:if>
</tr>
+</f:if>
+</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html
index 60181251f8bc..1df5f74cc34b 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html
@@ -4,7 +4,6 @@
<td style="width: 200px;">
<em>{model.additionalArguments.label}</em>
</td>
- <td>{model.additionalArguments.value}</td>
</f:if>
</tr>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
index 76676300102b..53327c289d2a 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
@@ -1 +1 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" content="{model}" /></f:if>
+{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" newLineAfterLabel="1" /></f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html
index 884dc66c6aef..051749e68f84 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html
@@ -1,2 +1,2 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" content="{model}" />
+{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" />
</f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
index e92fe90ec26a..022eb930b7c2 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
@@ -22,10 +22,10 @@
</td>
</tr>
</f:then>
+ <f:else>
<f:for each="{model.childElements}" as="element">
<f:render partial="{element.partialPath}" arguments="{model: element}" />
</f:for>
- <f:else>
</f:else>
</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
index 7f2e2b0a0f26..2e3fbe73801d 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
@@ -22,10 +22,10 @@
</td>
</tr>
</f:then>
+ <f:else>
<f:for each="{model.childElements}" as="element">
<f:render partial="{element.partialPath}" arguments="{model: element}" />
</f:for>
- <f:else>
</f:else>
</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
index e92fe90ec26a..022eb930b7c2 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
@@ -22,10 +22,10 @@
</td>
</tr>
</f:then>
+ <f:else>
<f:for each="{model.childElements}" as="element">
<f:render partial="{element.partialPath}" arguments="{model: element}" />
</f:for>
- <f:else>
</f:else>
</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Checkbox.html
index 605618bcc5ea..62ece06af8fa 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Checkbox.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Checkbox.html
@@ -1,8 +1,9 @@
-<tr class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
+<f:if condition="{model.showElement}">
<f:if condition="{model.additionalArguments.checked} == 'checked'">
+<tr class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
<td style="width: 200px;">
<em>{model.additionalArguments.label}</em>
</td>
- <td>{model.additionalArguments.value}</td>
-</f:if>
</tr>
+</f:if>
+</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Radio.html
index 60181251f8bc..716bcb700d3d 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Radio.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Radio.html
@@ -1,10 +1,9 @@
<f:if condition="{model.showElement}">
-<tr class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
<f:if condition="{model.additionalArguments.checked} == 'checked'">
+<tr class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
<td style="width: 200px;">
<em>{model.additionalArguments.label}</em>
</td>
- <td>{model.additionalArguments.value}</td>
-</f:if>
</tr>
+</f:if>
</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
index 76676300102b..6667a153ec3c 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
@@ -1 +1 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" content="{model}" /></f:if>
+{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" /></f:if></f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Radio.html
index 884dc66c6aef..051749e68f84 100644
--- a/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Radio.html
+++ b/typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Radio.html
@@ -1,2 +1,2 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" content="{model}" />
+{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" />
</f:if></f:if>
\ No newline at end of file
--
GitLab