From 6b4bfb5ec535a9d4fb25e3455268d03a0659ac27 Mon Sep 17 00:00:00 2001 From: Petar Popovic Date: Tue, 5 Mar 2019 08:25:20 +0100 Subject: [PATCH 1/6] Remove static text from template, also remove translations --- Resources/Private/Templates/FormBuilder/Index.html | 3 --- Resources/Private/Translations/de/Main.xlf | 4 ---- Resources/Private/Translations/en/Main.xlf | 3 --- 3 files changed, 10 deletions(-) diff --git a/Resources/Private/Templates/FormBuilder/Index.html b/Resources/Private/Templates/FormBuilder/Index.html index 342f7df..f255656 100644 --- a/Resources/Private/Templates/FormBuilder/Index.html +++ b/Resources/Private/Templates/FormBuilder/Index.html @@ -9,9 +9,6 @@ -
-

*

-
diff --git a/Resources/Private/Translations/de/Main.xlf b/Resources/Private/Translations/de/Main.xlf index 53fe350..36a8a25 100644 --- a/Resources/Private/Translations/de/Main.xlf +++ b/Resources/Private/Translations/de/Main.xlf @@ -22,10 +22,6 @@ Following errors occurred: Folgende Fehler sind aufgetreten: - - This field is required - Dies ist ein Pflichtfeld - diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf index 4f92180..8285d77 100644 --- a/Resources/Private/Translations/en/Main.xlf +++ b/Resources/Private/Translations/en/Main.xlf @@ -17,9 +17,6 @@ Following errors occurred: - - This field is required - From 3c4f575b1196143f03ccdb4cf084119ae9ec0989 Mon Sep 17 00:00:00 2001 From: Petar Popovic Date: Tue, 5 Mar 2019 08:49:29 +0100 Subject: [PATCH 2/6] Create simple text node type --- Configuration/NodeTypes.yaml | 15 +++++++++++++++ Resources/Private/Fusion/Root.fusion | 3 +++ Resources/Private/Templates/NodeTypes/Text.html | 12 ++++++++++++ .../Private/Translations/de/NodeTypes/Plugin.xlf | 8 ++++++++ .../Private/Translations/en/NodeTypes/Plugin.xlf | 6 ++++++ 5 files changed, 44 insertions(+) create mode 100644 Resources/Private/Templates/NodeTypes/Text.html diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml index 55904dd..6c27e49 100644 --- 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': @@ -318,3 +319,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 \ No newline at end of file diff --git a/Resources/Private/Fusion/Root.fusion b/Resources/Private/Fusion/Root.fusion index d2f5744..322bf5c 100644 --- a/Resources/Private/Fusion/Root.fusion +++ b/Resources/Private/Fusion/Root.fusion @@ -105,6 +105,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/NodeTypes/Text.html b/Resources/Private/Templates/NodeTypes/Text.html new file mode 100644 index 0000000..c469e63 --- /dev/null +++ b/Resources/Private/Templates/NodeTypes/Text.html @@ -0,0 +1,12 @@ +{namespace neos=Neos\Neos\ViewHelpers} + + + + +

{neos:contentElement.editable(property: 'text')}

+ + +

{text -> f:format.raw()}

+ + + \ No newline at end of file diff --git a/Resources/Private/Translations/de/NodeTypes/Plugin.xlf b/Resources/Private/Translations/de/NodeTypes/Plugin.xlf index 959982e..89093ca 100644 --- a/Resources/Private/Translations/de/NodeTypes/Plugin.xlf +++ b/Resources/Private/Translations/de/NodeTypes/Plugin.xlf @@ -158,6 +158,14 @@ File-Upload Datei-Upload + + Text + Text + + + Enter text here + Text hier eingeben + diff --git a/Resources/Private/Translations/en/NodeTypes/Plugin.xlf b/Resources/Private/Translations/en/NodeTypes/Plugin.xlf index 23938c2..151ce19 100644 --- a/Resources/Private/Translations/en/NodeTypes/Plugin.xlf +++ b/Resources/Private/Translations/en/NodeTypes/Plugin.xlf @@ -119,6 +119,12 @@ File-Upload + + Text + + + Enter text here + From adcc6b6a6f94a30dec0a29891da1aa9148b21b1f Mon Sep 17 00:00:00 2001 From: Andre Etienne Date: Wed, 3 Apr 2019 14:58:22 +0200 Subject: [PATCH 3/6] Add defaultValue and change CheckBoxEnhanced --- Configuration/NodeTypes.yaml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml index 6c27e49..d01e27a 100644 --- a/Configuration/NodeTypes.yaml +++ b/Configuration/NodeTypes.yaml @@ -256,7 +256,8 @@ reloadIfChanged: true inspector: group: options - + value: + defaultValue: 'Checked' 'CRON.FormBuilder:CheckBoxEnhanced': superTypes: @@ -265,9 +266,9 @@ ui: label: CRON.FormBuilder:NodeTypes.Plugin:fields.checkbox.enhanced properties: - text: - type: string + label: ui: + inspector: [] label: Text inlineEditable: true aloha: @@ -276,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: From e60129fe257c432cb3d37aac77782f983783a9be Mon Sep 17 00:00:00 2001 From: Andre Etienne Date: Wed, 3 Apr 2019 15:10:55 +0200 Subject: [PATCH 4/6] Change Template, add property label and stripTags --- Resources/Private/Fusion/Root.fusion | 3 +-- Resources/Private/Templates/Email/Form.txt | 6 +++--- .../Templates/NodeTypes/CheckBoxEnhanced.html | 21 ++++++------------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Resources/Private/Fusion/Root.fusion b/Resources/Private/Fusion/Root.fusion index 322bf5c..681953d 100644 --- 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) { diff --git a/Resources/Private/Templates/Email/Form.txt b/Resources/Private/Templates/Email/Form.txt index 0b75649..f10ddfa 100644 --- a/Resources/Private/Templates/Email/Form.txt +++ b/Resources/Private/Templates/Email/Form.txt @@ -7,12 +7,12 @@ {field.node.properties.label} ============================= -{subField.node.properties.label}: {subField.value} +{subField.node.properties.label -> f:format.stripTags()}: {subField.value} -{field.node.properties.label}: {field.value} +{field.node.properties.label -> f:format.stripTags()}: {field.value} - + \ No newline at end of file diff --git a/Resources/Private/Templates/NodeTypes/CheckBoxEnhanced.html b/Resources/Private/Templates/NodeTypes/CheckBoxEnhanced.html index 8fadc1f..6da21dd 100644 --- a/Resources/Private/Templates/NodeTypes/CheckBoxEnhanced.html +++ b/Resources/Private/Templates/NodeTypes/CheckBoxEnhanced.html @@ -1,29 +1,20 @@ {namespace neos=Neos\Neos\ViewHelpers} -
+
- -
- {mainText -> f:format.raw()} -
- - +
+ f:format.raw()} type="checkbox" onclick="return false;"/> + {neos:contentElement.editable(property: 'label', tag: 'p')} +
- -
- {mainText -> f:format.raw()} -
-
f:format.raw()} type="hidden" value=""> f:format.raw()} type="checkbox" value="{node.properties.value}" {f:if(condition: checked, then: 'checked')}/>
From 63eeff9055b01a84c63049f9b6539f97fbdf0d54 Mon Sep 17 00:00:00 2001 From: Andre Etienne Date: Wed, 3 Apr 2019 19:19:00 +0200 Subject: [PATCH 5/6] Add condition for text node because no label and value --- Resources/Private/Templates/Email/Form.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Private/Templates/Email/Form.txt b/Resources/Private/Templates/Email/Form.txt index f10ddfa..761657b 100644 --- a/Resources/Private/Templates/Email/Form.txt +++ b/Resources/Private/Templates/Email/Form.txt @@ -7,12 +7,24 @@ {field.node.properties.label} ============================= + + + + {subField.node.properties.label -> f:format.stripTags()}: {subField.value} + + + + + + {field.node.properties.label -> f:format.stripTags()}: {field.value} + + \ No newline at end of file From 7010a9582cb9a57848e2feb198222e0a5746b0ee Mon Sep 17 00:00:00 2001 From: Andre Etienne Date: Thu, 4 Apr 2019 11:13:02 +0200 Subject: [PATCH 6/6] Change condition --- Resources/Private/Templates/Email/Form.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Resources/Private/Templates/Email/Form.txt b/Resources/Private/Templates/Email/Form.txt index 761657b..266c1b2 100644 --- a/Resources/Private/Templates/Email/Form.txt +++ b/Resources/Private/Templates/Email/Form.txt @@ -7,22 +7,14 @@ {field.node.properties.label} ============================= - - - - + {subField.node.properties.label -> f:format.stripTags()}: {subField.value} - - - - - + {field.node.properties.label -> f:format.stripTags()}: {field.value} -