Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: composer.json
obisconcept · Sep 14, 2016 · 1c61e7d · 1c61e7d
2 parents e0447e5 + d201638
commit 1c61e7d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@ A Neos CMS package for forms in Twitter Bootstrap style and some additional feat
 ## Installation
 Add the package in your site package composer.json
 
-`"require": {
-     "obisconcept/neos-bootstrap-form": "~1.0.0"
- }`
+```
+"require": {
+     "obisconcept/neos-bootstrap-form": "~1.0"
+ }
+ ```
diff --git a/Resources/Private/Templates/Form/Checkbox.html b/Resources/Private/Templates/Form/Checkbox.html
@@ -5,9 +5,17 @@
 		<div class="{element.properties.containerInnerClassAttribute}">
 			<div class="checkbox">
 				<label for="{element.uniqueIdentifier}">
-					<f:form.checkbox property="{element.identifier}" id="{element.uniqueIdentifier}" value="{element.properties.value}" errorClass="{element.properties.elementErrorClassAttribute}" additionalAttributes="{required: element.required}" /> {element.label -> f:format.nl2br()}
+					<f:if condition="{element.required}">
+						<f:then>
+							<f:form.checkbox property="{element.identifier}" id="{element.uniqueIdentifier}" value="{element.properties.value}" errorClass="{element.properties.elementErrorClassAttribute}" additionalAttributes="{required: element.required}" />
+						</f:then>
+						<f:else>
+							<f:form.checkbox property="{element.identifier}" id="{element.uniqueIdentifier}" value="{element.properties.value}" errorClass="{element.properties.elementErrorClassAttribute}" />
+						</f:else>
+					</f:if>
+					{element.label -> f:format.nl2br()}
 				</label>
 			</div>
 		</div>
 	</div>
-</f:form.validationResults>
+</f:form.validationResults>