[BUGFIX] EXT:form - typos in the partials 37/43537/2
authorRalf Zimmermann <ralf.zimmermann@tritum.de>
Thu, 24 Sep 2015 19:13:24 +0000 (21:13 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Fri, 25 Sep 2015 14:04:55 +0000 (16:04 +0200)
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>
17 files changed:
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Radio.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Radio.html

index 3e3114c..d52bbbf 100644 (file)
@@ -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>
index 97849bb..6f23c5e 100644 (file)
@@ -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}"
                        />
index 1bd7a96..560a977 100644 (file)
@@ -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
index e92fe90..022eb93 100644 (file)
                                </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
index 7f2e2b0..2e3fbe7 100644 (file)
                                </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
index e92fe90..022eb93 100644 (file)
                                </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
index 605618b..62ece06 100644 (file)
@@ -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>
index 7667630..53327c2 100644 (file)
@@ -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
index 884dc66..051749e 100644 (file)
@@ -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
index e92fe90..022eb93 100644 (file)
                                </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
index 7f2e2b0..2e3fbe7 100644 (file)
                                </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
index e92fe90..022eb93 100644 (file)
                                </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
index 605618b..62ece06 100644 (file)
@@ -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>
index 6018125..716bcb7 100644 (file)
@@ -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
index 7667630..6667a15 100644 (file)
@@ -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>
index 884dc66..051749e 100644 (file)
@@ -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