merged release/2.1.2 into master

cron-eu · Apr 8, 2019 · e707e48 · e707e48
2 parents be4fb7e + eaf9dac
commit e707e48
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 44 deletions.
diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml
@@ -78,6 +78,7 @@
           'CRON.FormBuilder:CheckBoxEnhanced': true
           'CRON.FormBuilder:TextArea': true
           'CRON.FormBuilder:FileUpload': true
+          'CRON.FormBuilder:Text': true
           '*': false
 
 'CRON.FormBuilder:FormElementLabelMixin':
@@ -255,7 +256,8 @@
         reloadIfChanged: true
         inspector:
           group: options
-
+    value:
+      defaultValue: 'Checked'
 
 'CRON.FormBuilder:CheckBoxEnhanced':
   superTypes:
@@ -264,9 +266,9 @@
   ui:
     label: CRON.FormBuilder:NodeTypes.Plugin:fields.checkbox.enhanced
   properties:
-    text:
-      type: string
+    label:
       ui:
+        inspector: []
         label: Text
         inlineEditable: true
         aloha:
@@ -275,17 +277,6 @@
             'p': true
           link:
             'a': true
-    mainText:
-      type: string
-      ui:
-        label: CRON.FormBuilder:NodeTypes.Plugin:fields.checkbox.enhanced.mainText
-        reloadIfChanged: true
-        inspector:
-          group: options
-          editor: 'Neos.Neos/Inspector/Editors/TextAreaEditor'
-          editorOptions:
-            rows: 10
-
 
 'CRON.FormBuilder:TextArea':
   superTypes:
@@ -318,3 +309,17 @@
     'CRON.FormBuilder:FormElementRequiredMixin': true
   ui:
     label: CRON.FormBuilder:NodeTypes.Plugin:fields.fileupload
+
+'CRON.FormBuilder:Text':
+  superTypes:
+    'Neos.Neos:Content': true
+  ui:
+    label: CRON.FormBuilder:NodeTypes.Plugin:fields.text
+    icon: 'icon-edit-sign'
+  properties:
+    text:
+      type: string
+      ui:
+        inlineEditable: true
+        aloha:
+          placeholder: CRON.FormBuilder:NodeTypes.Plugin:fields.text.placeholder
diff --git a/Resources/Private/Fusion/Root.fusion b/Resources/Private/Fusion/Root.fusion
@@ -44,8 +44,7 @@ prototype(CRON.FormBuilder:CheckBoxEnhanced) < prototype(CRON.FormBuilder:FormEl
 	layoutName = 'CheckboxWrapper'
 	attributes.class = ''
 	checked = ${this.value || q(node).property('checked')}
-	text = ${q(node).property('text')}
-	mainText = ${q(node).property('mainText')}
+	label = ${q(node).property('label')}
 }
 
 prototype(CRON.FormBuilder:CheckBoxGroup) < prototype(CRON.FormBuilder:FormElement) {
@@ -105,6 +104,9 @@ prototype(CRON.FormBuilder:FileUpload) < prototype(CRON.FormBuilder:FormElement)
 	allowedMimeTypes = ${Array.join(Configuration.setting('CRON.FormBuilder.Upload.allowedMimeTypes'), ',')}
 }
 
+prototype(CRON.FormBuilder:Text) < prototype(CRON.FormBuilder:FormElement) {
+	text = ${q(node).property('text')}
+}
 
 prototype(CRON.FormBuilder:Plugin) < prototype(Neos.Neos:Plugin) {
 	package = 'CRON.FormBuilder'

diff --git a/Resources/Private/Templates/Email/Form.txt b/Resources/Private/Templates/Email/Form.txt
@@ -7,12 +7,16 @@
 {field.node.properties.label}
 =============================
 <f:for each="{field.values}" as="subField">
-{subField.node.properties.label}: {subField.value}
+<f:if condition="{subField.node.properties.label} != ''">
+{subField.node.properties.label -> f:format.stripTags()}: {subField.value}
+</f:if>
 </f:for>
 </f:then>
 <f:else>
-{field.node.properties.label}: {field.value}
+<f:if condition="{field.node.properties.label} != ''">
+{field.node.properties.label -> f:format.stripTags()}: {field.value}
+</f:if>
 </f:else>
 </f:if>
 </f:for>
-</f:section>
+</f:section>
diff --git a/Resources/Private/Templates/FormBuilder/Index.html b/Resources/Private/Templates/FormBuilder/Index.html
@@ -9,9 +9,6 @@
 		</f:if>
 		<ts:render path="elements" typoScriptPackageKey="{tsPackageKey}" context="{node: elements}"/>
 		<f:form.hidden name="__formId" value="{node.identifier}"></f:form.hidden>
-		<div>
-			<p><span>* </span><f:translate id="formBuilder.requiredField" package="CRON.FormBuilder"/></p>
-		</div>
 		<button type="submit" class="btn btn-default">{submitButtonLabel}</button>
 	</f:form>
 	<f:if condition="{neos:rendering.inBackend(node: documentNode)}">

diff --git a/Resources/Private/Templates/NodeTypes/CheckBoxEnhanced.html b/Resources/Private/Templates/NodeTypes/CheckBoxEnhanced.html
@@ -1,29 +1,20 @@
 {namespace neos=Neos\Neos\ViewHelpers}
 <f:layout name="{layoutName}" />
 <f:section name="Content">
-    <div class="checkbox-enhanced {f:if(condition: validationResults.flattenedErrors, then: 'has-error')}">
+    <div class=" checkbox-enhanced {f:if(condition: validationResults.flattenedErrors, then: 'has-error')}">
         <f:if condition="{neos:rendering.inBackend()}">
             <f:then>
-                <f:if condition="{mainText}">
-                    <div>
-                        {mainText -> f:format.raw()}
-                    </div>
-                </f:if>
-                <label>
-                    <input {attributes -> f:format.raw()} type="checkbox" onclick="return false;"/> {neos:contentElement.editable(property: 'text', tag: 'p')}
-                </label>
+                <div class="checkbox-enhanced-label">
+                    <input style="margin-right: 10px;" {attributes -> f:format.raw()} type="checkbox" onclick="return false;"/>
+                    {neos:contentElement.editable(property: 'label', tag: 'p')}
+                </div>
             </f:then>
             <f:else>
-                <f:if condition="{mainText}">
-                    <div>
-                        {mainText -> f:format.raw()}
-                    </div>
-                </f:if>
                 <div class="checkbox-enhanced-label">
                     <input {attributes -> f:format.raw()} type="hidden" value="">
                     <input {attributes -> f:format.raw()} type="checkbox" value="{node.properties.value}" {f:if(condition: checked, then: 'checked')}/>
                     <label>
-                        {text -> f:format.raw()}
+                        {label -> f:format.raw()}
                     </label>
                 </div>
             </f:else>

diff --git a/Resources/Private/Templates/NodeTypes/Text.html b/Resources/Private/Templates/NodeTypes/Text.html
@@ -0,0 +1,12 @@
+{namespace neos=Neos\Neos\ViewHelpers}
+<f:layout name="{layoutName}" />
+<f:section name="Content">
+	<f:if condition="{neos:rendering.inBackend()}">
+		<f:then>
+			<p>{neos:contentElement.editable(property: 'text')}</p>
+		</f:then>
+		<f:else>
+			<p>{text -> f:format.raw()}</p>
+		</f:else>
+	</f:if>
+</f:section>
diff --git a/Resources/Private/Translations/de/Main.xlf b/Resources/Private/Translations/de/Main.xlf
@@ -22,10 +22,6 @@
         <source>Following errors occurred:</source>
         <target xml:lang="de" state="translated">Folgende Fehler sind aufgetreten:</target>
       </trans-unit>
-      <trans-unit id="formBuilder.requiredField" xml:space="preserve">
-        <source>This field is required</source>
-        <target xml:lang="de" state="translated">Dies ist ein Pflichtfeld</target>
-      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/Private/Translations/de/NodeTypes/Plugin.xlf b/Resources/Private/Translations/de/NodeTypes/Plugin.xlf
@@ -158,6 +158,14 @@
         <source>File-Upload</source>
         <target xml:lang="de" state="translated">Datei-Upload</target>
       </trans-unit>
+      <trans-unit id="fields.text" xml:space="preserve">
+        <source>Text</source>
+        <target xml:lang="de" state="translated">Text</target>
+      </trans-unit>
+      <trans-unit id="fields.text.placeholder" xml:space="preserve">
+        <source>Enter text here</source>
+        <target xml:lang="de" state="translated">Text hier eingeben</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf
@@ -17,9 +17,6 @@
       <trans-unit id="formBuilder.index.errors.title" xml:space="preserve">
         <source>Following errors occurred:</source>
       </trans-unit>
-      <trans-unit id="formBuilder.requiredField" xml:space="preserve">
-        <source>This field is required</source>
-      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/Private/Translations/en/NodeTypes/Plugin.xlf b/Resources/Private/Translations/en/NodeTypes/Plugin.xlf
@@ -119,6 +119,12 @@
       <trans-unit id="fields.fileupload" xml:space="preserve">
         <source>File-Upload</source>
       </trans-unit>
+      <trans-unit id="fields.text" xml:space="preserve">
+        <source>Text</source>
+      </trans-unit>
+      <trans-unit id="fields.text.placeholder" xml:space="preserve">
+        <source>Enter text here</source>
+      </trans-unit>
     </body>
   </file>
 </xliff>