Merge branch 'develop'

Resources/Private/Templates/NodeTypes/Layouts/CheckboxWrapper.html

@@ -1,8 +1,6 @@
-<f:validation.results for="data.{node.identifier}">
-	<div>
-		<div>
-			<f:render section="Content"/>
-		</div>
+<div {layoutAttributes -> f:format.raw()}>
+	<f:validation.results for="data.{node.identifier}">
+		<f:render section="Content"/>
 		<f:render partial="FlattenedErrors" arguments="{_all}" />
-	</div>
-</f:validation.results>
+	</f:validation.results>
+</div>

Resources/Private/Templates/NodeTypes/Layouts/Wrapper.html

@@ -1,9 +1,9 @@
-<f:validation.results for="data.{node.identifier}">
-	<div class="form-group{f:if(condition: validationResults.flattenedErrors, then: ' has-error')}{f:if(condition: node.properties.required, then: ' required')}">
-		<label for="{node.identifier}">{node.properties.label}</label>
-		<div>
-			<f:render section="Content"/>
-		</div>
-			<f:render partial="FlattenedErrors" arguments="{_all}" />
-	</div>
-</f:validation.results>
+<div {layoutAttributes -> f:format.raw()}>
+	<f:validation.results for="data.{node.identifier}">
+		<div class="{f:if(condition: validationResults.flattenedErrors, then: 'has-error')}">
+      <label for="{node.identifier}">{node.properties.label}</label>
+      <f:render section="Content"/>
+      <f:render partial="FlattenedErrors" arguments="{_all}" />
+    </div>
+		</f:validation.results>
+</div>

Resources/Private/TypoScript/Root.ts2

@@ -7,7 +7,7 @@ prototype(CRON.FormBuilder:FormElement) < prototype(TYPO3.Neos:Content) {
 	layoutName = 'Wrapper'
 
 	layoutAttributes = TYPO3.TypoScript:Attributes
-	layoutAttributes.class = ''
+	layoutAttributes.class = ${'form-group' + (q(node).property('required') ? ' required' : '')}
 	[email protected] = TYPO3.TypoScript:Case {
 		@context.nodeTypeClassName = ${String.toLowerCase(String.pregReplace(q(node).property('_nodeType.name'), '/[[:^alnum:]]/', '-')) + '-layout'}
 
@@ -52,6 +52,7 @@ prototype(CRON.FormBuilder:CheckBoxGroup) < prototype(CRON.FormBuilder:FormEleme
 		nodePath = 'elements'
 
 		prototype(CRON.FormBuilder:CheckBox) {
+			layoutAttributes.class = ''
 			attributes.name = ${groupName}
 			checked = ${groupValue ? Array.indexOf(groupValue, q(node).property('value')) > -1 : q(node).property('checked')}
 		}