Merge branch 'forms'

composer.json

@@ -13,12 +13,10 @@
     "typo3/cms-backend": "^8.7",
     "typo3/cms-belog": "^8.7",
     "typo3/cms-beuser": "^8.7",
-    "typo3/cms-context-help": "^8.7",
     "typo3/cms-core": "^8.7",
     "typo3/cms-rte-ckeditor": "^8.7",
     "typo3/cms-extbase": "^8.7",
     "typo3/cms-extensionmanager": "^8.7",
-    "typo3/cms-felogin": "^8.7",
     "typo3/cms-filelist": "^8.7",
     "typo3/cms-filemetadata": "^8.7",
     "typo3/cms-fluid": "^8.7",
@@ -67,8 +65,7 @@
     "fluidtypo3/vhs": "^4.3",
     "webdevops/metaseo": "3.0.0",
     "helhum/typo3-console": "^4.9",
-    "gridelementsteam/gridelements": "^8.2",
+    "gridelementsteam/gridelements": "^8.2"
-    "friendsoftypo3/form-legacy": "^8.7"
   },
   "scripts": {
     "typo3-cms-scripts": [

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "40ae079267d366554fc334aff3dd5506",
+    "content-hash": "bf966b3d9286731a2aa6030d0010afed",
     "packages": [
         {
             "name": "christophlehmann/imageoptimizer",
@@ -747,40 +747,6 @@
             ],
             "time": "2018-03-11T08:26:39+00:00"
         },
-        {
-            "name": "friendsoftypo3/form-legacy",
-            "version": "8.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfTYPO3/form_legacy.git",
-                "reference": "765fc2ee941860de83e6fdf8cff6ac4d1bc7e31d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfTYPO3/form_legacy/zipball/765fc2ee941860de83e6fdf8cff6ac4d1bc7e31d",
-                "reference": "765fc2ee941860de83e6fdf8cff6ac4d1bc7e31d",
-                "shasum": ""
-            },
-            "require": {
-                "typo3/cms-core": "~8"
-            },
-            "replace": {
-                "form_legacy": "*"
-            },
-            "type": "typo3-cms-extension",
-            "autoload": {
-                "psr-4": {
-                    "TYPO3\\CMS\\Form\\": "Classes/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "description": "Legacy version 7 of ext:form",
-            "homepage": "https://typo3.org",
-            "time": "2017-03-29T12:26:24+00:00"
-        },
         {
             "name": "georgringer/news",
             "version": "7.0.5",

web/typo3conf/ext/ep_theme/Configuration/Forms/FormSetup.yaml

@@ -0,0 +1,30 @@
+TYPO3:
+  CMS:
+    Form:
+      persistenceManager:
+        allowedFileMounts:
+          10: '1:/user_upload/Formulare/'
+        allowedExtensionPaths:
+          10: EXT:ep_theme/Resources/Private/Forms/
+        allowSaveToExtensionPaths: false
+        allowDeleteFromExtensionPaths: false
+
+      prototypes:
+        standard:
+          formElementsDefinition:
+            Form:
+              renderingOptions:
+                templateRootPaths:
+                  100: 'EXT:ep_theme/Resources/Private/Templates/Form/'
+                partialRootPaths:
+                  100: 'EXT:ep_theme/Resources/Private/Partials/Form/'
+                layoutRootPaths:
+                  100: 'EXT:ep_theme/Resources/Private/Layouts/Form/'
+
+        contactform:
+          __inheritances:
+            10: 'TYPO3.CMS.Form.prototypes.standard'
+
+        applicationform:
+          __inheritances:
+            10: 'TYPO3.CMS.Form.prototypes.standard'

web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig

@@ -3,7 +3,7 @@ mod {
         common.show := removeFromList(table,bullets,uploads)
         menu.show := removeFromList(menu_abstract,menu_categorized_content,menu_categorized_pages,menu_recently_updated,menu_related_pages,menu_section_pages,menu_sitemap,menu_sitemap_pages)
         special.show = div,shortcut,html
-        forms.show =
+        forms.show = formframework
         teaser {
             header = Teaser
             elements {

web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.typoscript

@@ -1,8 +1,14 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form_legacy/Configuration/TypoScript/setup.txt">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/TypoScript/setup.txt">
 
-plugin.tx_form {
+plugin.tx_form.view {
-    view {
+    templateRootPaths.10 = EXT:ep_theme/Resources/Private/Templates/Form/
-        templateRootPaths.100 = EXT:ep_theme/Resources/Private/Templates/Form/
-        partialRootPaths.100 = EXT:ep_theme/Resources/Private/Partials/Form/
-    }
 }
+
+plugin.tx_form.settings.yamlConfigurations {
+    100 = EXT:ep_theme/Configuration/Forms/FormSetup.yaml
+}
+
+module.tx_form.settings.yamlConfigurations {
+    100 = EXT:ep_theme/Configuration/Forms/FormSetup.yaml
+}
+

web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt

@@ -149,4 +149,3 @@ plugin.tx_eptheme {
 <INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_products/Configuration/TypoScript/constants.txt">
 <INCLUDE_TYPOSCRIPT: source="FILE:EXT:gridelements/Configuration/TypoScript/constants.ts">
 <INCLUDE_TYPOSCRIPT: source="FILE:EXT:pb_social/Configuration/TypoScript/constants.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form_legacy/Configuration/TypoScript/constants.txt">

web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_input.scss

@@ -1,170 +1,135 @@
-form{
+.form-wrapper {
-    input,
+  .form-group, fieldset {
-    input.form-control,
+    margin-bottom: 17px;
-    textarea,
+  }
-    textarea.form-control,
-    .ep-has-error-bar{
-        padding: 11px 24px;
-        font-size: 16px;
-        text-align: left;
-        border: none;
-        border-radius:1px;
-        height:100%;
-        @include inputPlaceholderColor($color-grey);
-        &.btn-warning{
-            background-color:$button;
-            border:none;
-            &:hover,&:active{
-                background-color:$buttonActiveHover;
-            }
-        }
-        &:focus {
-            -webkit-box-shadow: none;
-            box-shadow: none;
-        }
-    }
 
-    textarea {
+  .checkbox label, .radio label {
-        resize: vertical;
+    padding-left: 0;
-    }
+  }
+}
 
+.form-control {
+  padding: 11px 24px;
+  font-size: 16px;
+  text-align: left;
+  border: none;
+  border-radius:1px;
+  height:100%;
+  @include inputPlaceholderColor($color-grey);
+  &.btn-warning{
+    background-color:$button;
+    border:none;
+    &:hover,&:active{
+      background-color:$buttonActiveHover;
+    }
+  }
+  &:focus {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+}
+
+textarea {
+  resize: vertical;
+}
+
+label{
+  font-weight: $font-weight-regular;
+}
+
+.form--border {
+  input,
+  textarea,
+  select{
+    border: 1px solid $color-grey;
+    &:focus{
+      border-color: $colorBlack;
+    }
+    &:active{
+      border-color: $colorBlack;
+    }
+  }
+  .disabled{
     label{
-        font-weight: $font-weight-regular;
+      color:$lightGrey;
     }
-
+    input{
-    &.border{
+      background-color:initial;
-        input,
+      border: 1px solid $lightGrey;
-        textarea{
+      @include inputPlaceholderColor($lightGrey);
-            border: 1px solid $color-grey;
+      cursor: not-allowed;
-            &:focus{
-                border-color: $colorBlack;
-            }
-            &:active{
-                border-color: $colorBlack;
-            }
-        }
-        .disabled{
-            label{
-                color:$lightGrey;
-            }
-            input{
-                background-color:initial;
-                border: 1px solid $lightGrey;
-                @include inputPlaceholderColor($lightGrey);
-                cursor: not-allowed;
-            }
-        }
-    }
-    .ep-has-error-bar{
-        margin-top:10px;
-        background-color:$link;
-        color:$typoWhite;
-        i{
-            margin-right:10px;
-        }
     }
+  }
 }
 
-//colors
-
-/*
-.has-error{
-    .control-label{
-        color:$link;
-    }
-    .form-control{
-        border-color:$link;
-        @include inputPlaceholderColor($link);
-
-        &:focus {
-            border-color: $link;
-            -webkit-box-shadow: none;
-            box-shadow: none;
-        }
-
-    }
-}
-*/
 
 .checkbox,
 .radio{
-    label{
+  label{
-        &:after {
+    &:after {
-            content: '';
+      content: '';
-            display: table;
+      display: table;
-            clear: both;
+      clear: both;
-        }
-        input[type="checkbox"],
-        input[type="radio"] {
-            display: none;
-
-            &+ .cr{
-                > .cr-icon {
-                    transform: scale(3) rotateZ(-20deg);
-                    opacity: 0;
-                    transition: all .2s ease-in;
-                }
-            }
-
-            &:checked{
-                &+ .cr{
-
-                    background-color:$link;
-                    border: 1px solid $link;
-
-                    > .cr-icon {
-                        transform: scale(1) rotateZ(0deg);
-                        opacity: 1;
-                    }
-                }
-            }
-
-            &:disabled{
-                &+ .cr {
-                    opacity: .5;
-                }
-            }
-        }
     }
-    .cr {
+    input[type="checkbox"],
-        position: relative;
+    input[type="radio"] {
-        display: inline-block;
+      display: none;
-        border: 1px solid $colorBlack;
-        border-radius: 4px;
-        width: 22px;
-        height: 22px;
-        float: left;
-        margin-right: 10px;
-        transition: all .2s ease-in;
-        margin-top: 2px;
 
-        .cr-icon {
+      &+ .cr{
-            position: absolute;
+        > .cr-icon {
-            font-size: 10px;
+          transform: scale(3) rotateZ(-20deg);
-            line-height: 0;
+          opacity: 0;
-            top: 50%;
+          transition: all .2s ease-in;
-            left: 25%;
-            color:$typoWhite;
         }
+      }
+
+      &:checked{
+        &+ .cr{
+
+          background-color:$link;
+          border: 1px solid $link;
+
+          > .cr-icon {
+            transform: scale(1) rotateZ(0deg);
+            opacity: 1;
+          }
+        }
+      }
+
+      &:disabled{
+        &+ .cr {
+          opacity: .5;
+        }
+      }
     }
+  }
+  .cr {
+    position: relative;
+    display: inline-block;
+    border: 1px solid $colorBlack;
+    border-radius: 4px;
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin-right: 10px;
+    transition: all .2s ease-in;
+    margin-top: 2px;
+
+    .cr-icon {
+      position: absolute;
+      font-size: 10px;
+      line-height: 0;
+      top: 50%;
+      left: 25%;
+      color:$typoWhite;
+    }
+  }
 }
 
 .radio .cr {
-    border-radius: 50%;
+  border-radius: 50%;
 }
 
 .radio .cr .cr-icon {
-    margin-left: 0.04em;
+  margin-left: 0.04em;
-}
-
-.mailform {
-
-    .form-group, fieldset {
-        margin-bottom: 17px;
-    }
-
-    .checkbox label, .radio label {
-        padding-left: 0;
-    }
-
 }

web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_buttons.scss

@@ -73,6 +73,10 @@
     background-color: $color-label-success;
     color: white;
   }
+
+  .button-group &:not(:last-of-type) {
+    margin-right: 8px;
+  }
 }
 
 .buttonfull {

web/typo3conf/ext/ep_theme/Resources/Private/Forms/ApplicationForm.form.yaml

@@ -0,0 +1,366 @@
+
+renderingOptions:
+  submitButtonLabel: Absenden
+type: Form
+identifier: applicationform
+label: Bewerbungsformular
+prototypeName: applicationform
+finishers:
+  -
+    options:
+      subject: 'Bewerbung von {text-1}'
+      recipientAddress: [email protected]
+      recipientName: 'E&P Reisen'
+      senderAddress: [email protected]
+      senderName: Bewerbungsformular
+      replyToAddress: [email protected]
+      carbonCopyAddress: ''
+      blindCarbonCopyAddress: ''
+      format: html
+      attachUploads: false
+      translation:
+        language: ''
+    identifier: EmailToReceiver
+  -
+    options:
+      message: 'Vielen Dank für deine Bewerbung. Wir werden sie so schnell wie möglich bearbeiten.'
+    identifier: Confirmation
+renderables:
+  -
+    renderingOptions:
+      previousButtonLabel: zurück
+      nextButtonLabel: weiter
+    type: Page
+    identifier: page-1
+    label: ''
+    renderables:
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-1
+        label: Name
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'Vor- & Nachname'
+            required: required
+          elementDescription: ''
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-2
+        label: Straße
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'Straße & Hausnummer'
+            required: required
+          elementDescription: ''
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-3
+        label: Wohnort
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'PLZ & Ort'
+            required: required
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-4
+        label: 'Mobil Nummer'
+        properties:
+          fluidAdditionalAttributes:
+            required: required
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-5
+        label: 'Festnetz Nummer'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-6
+        label: 'E-Mail Adresse'
+        properties:
+          fluidAdditionalAttributes:
+            required: required
+        validators:
+          -
+            identifier: NotEmpty
+          -
+            identifier: EmailAddress
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-7
+        label: Geburtsdatum
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: tt.mm.jjjj
+            required: required
+        validators:
+          -
+            options:
+              regularExpression: '/\d{2}\.\d{2}\.\d{4}/'
+            identifier: RegularExpression
+          -
+            identifier: NotEmpty
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-8
+        label: Nationalität
+      -
+        properties:
+          options:
+            nein: nein
+            ja: ja
+            'ja, mit Anhänger': 'ja, mit Anhänger'
+        type: RadioButton
+        identifier: radiobutton-1
+        label: Führerschein
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-9
+        label: Ausbildung/Studium
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'Schul-, Uni-, Berufsausbildung'
+          elementDescription: ''
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-10
+        label: 'Aktuelle Tätigkeit'
+      -
+        properties:
+          options:
+            Haus-/Destinationsleitung: Haus-/Destinationsleitung
+            Koch/Köchin: Koch/Köchin
+            Koch-Assistenz/Service: Koch-Assistenz/Service
+            'Serviceleitung/Assistenz Hausleitung': 'Serviceleitung/Assistenz Hausleitung'
+            Serviceteamer: Serviceteamer
+            Reinigungskraft: Reinigungskraft
+            Materialteamer/Verleih: Materialteamer/Verleih
+            Allrounder: Allrounder
+            'Praktikum im Schnee': 'Praktikum im Schnee'
+          elementDescription: ''
+        type: MultiCheckbox
+        identifier: multicheckbox-1
+        label: 'Bewerbung als'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-11
+        label: 'Einsatz datum'
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'von tt.mm.jjjj bis tt.mm.jjjj'
+            required: required
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        properties:
+          options:
+            Ski: Ski
+            Snowboard: Snowboard
+            nichts: nichts
+        type: MultiCheckbox
+        identifier: multicheckbox-2
+        label: 'Ich fahre'
+        validators:
+          -
+            identifier: NotEmpty
+          -
+            options:
+              minimum: '1'
+              maximum: '2'
+            identifier: Count
+      -
+        properties:
+          options:
+            'noch nicht gelernt': 'noch nicht gelernt'
+            Anfänger: Anfänger
+            Fortgeschritten: Fortgeschritten
+            Experte: Experte
+        type: SingleSelect
+        identifier: singleselect-1
+        label: 'Wie gut fahre ich Ski'
+        defaultValue: 'noch nicht gelernt'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-12
+        label: 'Skifahrer seit'
+      -
+        properties:
+          options:
+            'noch nicht gelernt': 'noch nicht gelernt'
+            Anfänger: Anfänger
+            Fortgeschritten: Fortgeschritten
+            Experte: Experte
+        type: SingleSelect
+        identifier: singleselect-2
+        label: 'Wie gut fahre ich Snowboard'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-13
+        label: 'Snowboarder seit'
+        properties:
+          elementDescription: ''
+      -
+        properties:
+          options:
+            nein: nein
+            'Ski Grundstufe': 'Ski Grundstufe'
+            'Board Grundstufe': 'Board Grundstufe'
+            'Ski Instructor': 'Ski Instructor'
+            'Board Instructor': 'Board Instructor'
+            'Ski Begleitschein': 'Ski Begleitschein'
+            'Board Begleitschein': 'Board Begleitschein'
+        type: MultiSelect
+        identifier: multiselect-1
+        label: Ski-/Snowboardlehrerschein
+        defaultValue:
+          - nein
+      -
+        type: Fieldset
+        identifier: fieldset-1
+        label: Fremdsprachen
+        renderables:
+          -
+            properties:
+              options:
+                nein: nein
+                Grundkenntnisse: Grundkenntnisse
+                gut: gut
+                'sehr gut': 'sehr gut'
+            type: SingleSelect
+            identifier: singleselect-3
+            label: Englisch
+            defaultValue: nein
+          -
+            properties:
+              options:
+                nein: nein
+                Grundkenntnisse: Grundkenntnisse
+                gut: gut
+                'sehr gut': 'sehr gut'
+            type: SingleSelect
+            identifier: singleselect-4
+            label: Französisch
+            defaultValue: nein
+          -
+            properties:
+              options:
+                nein: nein
+                Grundkenntnisse: Grundkenntnisse
+                gut: gut
+                'sehr gut': 'sehr gut'
+            type: SingleSelect
+            identifier: singleselect-5
+            label: Spanisch
+            defaultValue: nein
+          -
+            defaultValue: ''
+            type: Text
+            identifier: text-14
+            label: 'Sonstige Fremdsprachen'
+      -
+        properties:
+          options:
+            ja: ja
+            nein: nein
+        type: RadioButton
+        identifier: radiobutton-2
+        label: 'Kocherfahrung für Gruppen (min. 30 Personen)'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-15
+        label: 'Wenn ja, welche?'
+        properties:
+          elementDescription: ''
+      -
+        properties:
+          options:
+            ja: ja
+            nein: nein
+        type: RadioButton
+        identifier: radiobutton-3
+        label: 'Erfahrungen im Tourismus'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-16
+        label: 'Wenn ja, welche?'
+        properties:
+          elementDescription: ''
+      -
+        properties:
+          options:
+            'ja, mit Zertifikat zur Bindungseinstellung': 'ja, mit Zertifikat zur Bindungseinstellung'
+            nein: nein
+        type: RadioButton
+        identifier: radiobutton-4
+        label: 'Erfahrungen im Skiverleih'
+      -
+        properties:
+          options:
+            Zillertal: Zillertal
+            Lenzerheide: Lenzerheide
+            'Davos Klosters': 'Davos Klosters'
+            Montafon: Montafon
+            Saalbach: Saalbach
+            'Les Deux Alpes': 'Les Deux Alpes'
+            '4 Vallées': '4 Vallées'
+            'Val Thorens': 'Val Thorens'
+            'Les Sybelles': 'Les Sybelles'
+            'Portes du Soleil': 'Portes du Soleil'
+        type: MultiCheckbox
+        identifier: multicheckbox-3
+        label: 'Ortskenntnisse in folgenden Destinationen'
+      -
+        properties:
+          options:
+            'Damen 36': 'Damen 36'
+            'Damen 38': 'Damen 38'
+            'Damen 40': 'Damen 40'
+            'Damen 42': 'Damen 42'
+            'Herren S': 'Herren S'
+            'Herren M': 'Herren M'
+            'Herren L': 'Herren L'
+            'Herren XL': 'Herren XL'
+        type: SingleSelect
+        identifier: singleselect-6
+        label: Jackengröße
+      -
+        defaultValue: ''
+        type: Textarea
+        identifier: textarea-1
+        label: 'Warum möchte ich für E&P Reisen arbeiten?'
+      -
+        properties:
+          options:
+            Freunde: Freunde
+            'Social Media': 'Social Media'
+            Uni: Uni
+            Sonstiges: Sonstiges
+        type: MultiCheckbox
+        identifier: multicheckbox-4
+        label: 'Wie bin ich auf E&P Reisen aufmerksam geworden?'

web/typo3conf/ext/ep_theme/Resources/Private/Forms/ContactForm.form.yaml

@@ -0,0 +1,104 @@
+
+renderingOptions:
+  submitButtonLabel: Absenden
+type: Form
+identifier: contactform
+label: Kontaktformular
+prototypeName: contactform
+finishers:
+  -
+    options:
+      subject: 'Kontaktanfrage  von {text-1}'
+      recipientAddress: [email protected]
+      recipientName: 'E&P Reisen'
+      senderAddress: [email protected]
+      senderName: Kontaktformular
+      replyToAddress: [email protected]
+      carbonCopyAddress: ''
+      blindCarbonCopyAddress: ''
+      format: html
+      attachUploads: false
+      translation:
+        language: ''
+    identifier: EmailToReceiver
+  -
+    options:
+      pageUid: '1387'
+      additionalParameters: ''
+    identifier: Redirect
+renderables:
+  -
+    renderingOptions:
+      previousButtonLabel: 'Previous step'
+      nextButtonLabel: 'Neue Seite'
+    type: Page
+    identifier: page-1
+    label: ''
+    renderables:
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-1
+        label: Name
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'Vor- & Nachname'
+            required: required
+          elementDescription: ''
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-2
+        label: Anschrift
+        properties:
+          fluidAdditionalAttributes:
+            placeholder: 'Straße & Nr.'
+          elementDescription: ''
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-3
+        label: 'PLZ, Ort'
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-4
+        label: E-Mail
+        properties:
+          fluidAdditionalAttributes:
+            required: required
+        validators:
+          -
+            identifier: NotEmpty
+          -
+            identifier: EmailAddress
+      -
+        defaultValue: ''
+        type: Text
+        identifier: text-5
+        label: Telefon
+      -
+        defaultValue: ''
+        type: Textarea
+        identifier: textarea-1
+        label: 'Deine Kontaktanfrage'
+      -
+        type: Checkbox
+        identifier: checkbox-1
+        label: 'Ich habe die Datenschutzbestimmungen gelesen und akzeptiere sie'
+        properties:
+          elementDescription: ''
+          fluidAdditionalAttributes:
+            required: required
+        validators:
+          -
+            identifier: NotEmpty
+      -
+        label: Inhaltselement
+        properties:
+          contentElementUid: '7710'
+        type: ContentElement
+        identifier: contentelement-1

web/typo3conf/ext/ep_theme/Resources/Private/Layouts/FluidStyledContent/Default.html

@@ -3,6 +3,6 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <a id="c{data.uid}"></a>
-    <f:render section="Content"/>
+    <f:render section="Main" optional="true"/>
 
 </html>

web/typo3conf/ext/ep_theme/Resources/Private/Layouts/FluidStyledContent/Textmedia.html

@@ -1,8 +0,0 @@
-<html data-namespace-typo3-fluid="true" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
-
-    <a id="c{data.uid}"></a>
-    <f:render section="Content"/>
-
-</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Checkbox.html

@@ -0,0 +1,20 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<formvh:renderRenderable renderable="{element}">
+	<f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: 1}" contentAs="elementContent">
+		<div class="checkbox">
+			<label class="{element.properties.elementClassAttribute} form-check-label" for="{element.uniqueIdentifier}">
+				<f:form.checkbox
+					property="{element.identifier}"
+					id="{element.uniqueIdentifier}"
+					value="{element.properties.value}"
+					additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+				/>
+                <span class="cr">
+                    <i class="cr-icon glyphicon glyphicon-ok"></i>
+                </span>
+                {formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if>
+			</label>
+		</div>
+	</f:render>
+</formvh:renderRenderable>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/ContentElement.html

@@ -0,0 +1,21 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<formvh:renderRenderable renderable="{element}">
+	<f:if condition="{element.rootForm.renderingOptions.previewMode}">
+		<f:then>
+            <f:if condition="{element.properties.contentElementUid}">
+                <f:then>
+                    <formvh:be.renderContentElementPreview contentElementUid="{element.properties.contentElementUid}" />
+                </f:then>
+                <f:else>
+                    <f:translate key="LLL:EXT:form/Resources/Private/Language/Database.xlf:formEditor.elements.ContentElement.selectContentElement" />
+                </f:else>
+            </f:if>
+		</f:then>
+		<f:else>
+			<f:if condition="{element.properties.contentElementUid}">
+                <f:cObject typoscriptObjectPath="lib.tx_form.contentElementRendering">{element.properties.contentElementUid}</f:cObject>
+			</f:if>
+		</f:else>
+	</f:if>
+</formvh:renderRenderable>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/ContainerElements/Checkboxgroup.html

@@ -1,23 +0,0 @@
-<f:if condition="{model.showElement}">
-	<f:then>
-        <fieldset
-        <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-            {htmAttributeKey}="{htmAttributeValue}"
-        </f:for>
-        >
-            <f:if condition="{model.additionalArguments.legend}">
-                <legend>
-                    {model.additionalArguments.legend}
-                </legend>
-            </f:if>
-            <f:for each="{model.childElements}" as="element">
-                <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-            </f:for>
-        </fieldset>
-	</f:then>
-	<f:else>
-		<f:for each="{model.childElements}" as="element">
-			<f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-		</f:for>
-	</f:else>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/ContainerElements/Fieldset.html

@@ -1,25 +0,0 @@
-<f:if condition="{model.showElement}">
-	<f:then>
-		<li class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
-			<fieldset
-			<f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-				{htmAttributeKey}="{htmAttributeValue}"
-			</f:for>
-			>
-				<f:if condition="{model.additionalArguments.legend}">
-					<legend>{model.additionalArguments.legend}</legend>
-				</f:if>
-				<ol>
-					<f:for each="{model.childElements}" as="element">
-						<f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-					</f:for>
-				</ol>
-			</fieldset>
-		</li>
-	</f:then>
-	<f:else>
-		<f:for each="{model.childElements}" as="element">
-			<f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-		</f:for>
-	</f:else>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/ContainerElements/Form.html

@@ -1,31 +0,0 @@
-<f:form
-        class="border mailform"
-
-        enctype="{model.additionalArguments.enctype}"
-        method="{model.additionalArguments.method}"
-        name="{model.additionalArguments.name}"
-
-        action="{model.additionalArguments.action}"
-        actionUri="{model.additionalArguments.actionUri}"
-        addQueryString="{model.additionalArguments.addQueryString}"
-        additionalAttributes="{model.htmlAttributes}"
-        additionalParams="{model.additionalArguments.additionalParams}"
-        arguments="{model.additionalArguments.arguments}"
-        argumentsToBeExcludedFromQueryString="{model.additionalArguments.argumentsToBeExcludedFromQueryString}"
-        controller="{model.additionalArguments.controller}"
-        extensionName="{model.additionalArguments.extensionName}"
-
-        format="{f:if(condition:'{model.additionalArguments.format}',then:'{model.additionalArguments.format}')}"
-        hiddenFieldClassName="{model.additionalArguments.hiddenFieldClassName}"
-
-        object="{model}"
-
-        pageType="{model.additionalArguments.pageType}"
-        pageUid="{model.additionalArguments.pageUid}"
-        pluginName="{model.additionalArguments.pluginName}"
-        section="{model.additionalArguments.section}"
-        >
-    <f:for each="{model.childElements}" as="element">
-        <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-    </f:for>
-</f:form>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/ContainerElements/Radiogroup.html

@@ -1,29 +0,0 @@
-<f:if condition="{model.showElement}">
-	<f:then>
-        <fieldset
-        <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-            {htmAttributeKey}="{htmAttributeValue}"
-        </f:for>
-        >
-            <f:if condition="{model.additionalArguments.legend}">
-                <legend>
-                    {model.additionalArguments.legend}
-                    <f:if condition="{model.mandatoryValidationMessages}">
-                        <em><f:for each="{model.mandatoryValidationMessages}" as="mandatoryValidationMessage" iteration="iterator">{mandatoryValidationMessage}<f:if condition="{iterator.isLast}"><f:else> - </f:else></f:if></f:for></em>
-                    </f:if>
-                    <f:if condition="{model.validationErrorMessages}">
-                        <strong><f:for each="{model.validationErrorMessages}" as="errorValidationMessage" iteration="iterator">{errorValidationMessage}<f:if condition="{iterator.isLast}"><f:else> - </f:else></f:if></f:for></strong>
-                    </f:if>
-                </legend>
-            </f:if>
-            <f:for each="{model.childElements}" as="element">
-                <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-            </f:for>
-        </fieldset>
-	</f:then>
-	<f:else>
-		<f:for each="{model.childElements}" as="element">
-			<f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-		</f:for>
-	</f:else>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Checkbox.html

@@ -1,52 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="checkbox">
-		<label for="{model.additionalArguments.id}">
-			<f:if condition="{model.additionalArguments.multiple}">
-				<f:then>
-					<f:form.checkbox
-						class="{model.additionalArguments.class}"
-						dir="{model.additionalArguments.dir}"
-						id="{model.additionalArguments.id}"
-						lang="{model.additionalArguments.lang}"
-						style="{model.additionalArguments.style}"
-						title="{model.additionalArguments.title}"
-						accesskey="{model.additionalArguments.accesskey}"
-						tabindex="{model.additionalArguments.tabindex}"
-						onclick="{model.additionalArguments.onclick}"
-
-						name="{model.additionalArguments.prefix}[{model.additionalArguments.name}][{model.name}]"
-						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>"
-
-						checked="{model.additionalArguments.checked}"
-
-						errorClass="{model.additionalAttributes.errorClass}"
-						additionalAttributes="{model.htmlAttributes}"
-					/>
-				</f:then>
-				<f:else>
-					<f:form.checkbox
-						class="{model.additionalArguments.class}"
-						dir="{model.additionalArguments.dir}"
-						id="{model.additionalArguments.id}"
-						lang="{model.additionalArguments.lang}"
-						style="{model.additionalArguments.style}"
-						title="{model.additionalArguments.title}"
-						accesskey="{model.additionalArguments.accesskey}"
-						tabindex="{model.additionalArguments.tabindex}"
-						onclick="{model.additionalArguments.onclick}"
-
-						name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-						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>"
-
-						checked="{model.additionalArguments.checked}"
-
-						errorClass="{model.additionalAttributes.errorClass}"
-						additionalAttributes="{model.htmlAttributes}"
-					/>
-				</f:else>
-			</f:if>
-			<span class="cr"><i class="cr-icon glyphicon glyphicon-ok"></i></span>
-			{model.additionalArguments.label}
-		</label>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Header.html

@@ -1,3 +0,0 @@
-<f:if condition="{model.showElement}">
-    <f:format.raw><{model.additionalArguments.headingSize}>{model.additionalArguments.content}</{model.additionalArguments.headingSize}></f:format.raw>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Hidden.html

@@ -1,16 +0,0 @@
-<f:form.hidden
-    class="{model.additionalArguments.class}"
-    dir="{model.additionalArguments.dir}"
-    id="{model.additionalArguments.id}"
-    lang="{model.additionalArguments.lang}"
-    style="{model.additionalArguments.style}"
-    title="{model.additionalArguments.title}"
-    accesskey="{model.additionalArguments.accesskey}"
-    tabindex="{model.additionalArguments.tabindex}"
-    onclick="{model.additionalArguments.onclick}"
-
-    name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-    value="{model.additionalArguments.value}"
-
-    additionalAttributes="{model.htmlAttributes}"
-/>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Radio.html

@@ -1,23 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="radio">
-		<label>
-			<f:form.radio
-					class="{model.additionalArguments.class}"
-					id="{model.additionalArguments.id}"
-					lang="{model.additionalArguments.lang}"
-					style="{model.additionalArguments.style}"
-					title="{model.additionalArguments.title}"
-
-					name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-					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>"
-
-					checked="{model.additionalArguments.checked}"
-
-					errorClass="{model.additionalArguments.errorClass}"
-					additionalAttributes="{model.htmlAttributes}"
-			/>
-			<span class="cr"><i class="cr-icon glyphicon glyphicon-ok"></i></span>
-			{model.additionalArguments.label}
-		</label>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/RadioField.html

@@ -1,20 +0,0 @@
-<div class="radio">
-    <label>
-        <f:form.radio
-                class="{model.additionalArguments.class}"
-                id="{model.additionalArguments.id}"
-                lang="{model.additionalArguments.lang}"
-                style="{model.additionalArguments.style}"
-                title="{model.additionalArguments.title}"
-
-                name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                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>"
-
-                checked="{model.additionalArguments.checked}"
-
-                errorClass="{model.additionalArguments.errorClass}"
-                additionalAttributes="{model.htmlAttributes}"
-        />
-        {model.additionalArguments.label}
-    </label>
-</div>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Select.html

@@ -1,30 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}
-
-<f:if condition="{model.showElement}">
-	<div class="form-group">
-		<label for="{model.additionalArguments.id}">
-			{model.additionalArguments.label}
-		</label>
-		<form:select
-				class="form-control"
-				id="{model.additionalArguments.id}"
-
-				name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-				value="{form:aggregateSelectOptions(model:model, returnSelectedValues: 1)}"
-
-				multiple="{model.additionalArguments.multiple}"
-				size="{model.additionalArguments.size}"
-
-				optionLabelField="label"
-				optionValueField="value"
-				options="{form:aggregateSelectOptions(model:model)}"
-				prependOptionLabel="{model.additionalArguments.prependOptionLabel}"
-				prependOptionValue="{model.additionalArguments.prependOptionValue}"
-				selectAllByDefault="{model.additionalArguments.selectAllByDefault}"
-				sortByOptionLabel="{model.additionalArguments.sortByOptionLabel}"
-
-				errorClass="{model.additionalArguments.errorClass}"
-				additionalAttributes="{model.htmlAttributes}"
-		/>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Submit.html

@@ -1,14 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="form-group">
-		<f:form.submit
-				class="btn btn-warning"
-				additionalAttributes="{model.htmlAttributes}"
-				id="{model.additionalArguments.id}"
-				title="{model.additionalArguments.title}"
-				tabindex="{model.additionalArguments.tabindex}"
-
-				name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-				value="{model.additionalArguments.value}"
-		/>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Textarea.html

@@ -1,33 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="form-group">
-		<label for="{model.additionalArguments.id}" class="control-label">
-			{model.additionalArguments.label}
-		</label>
-
-		<f:form.textarea
-			class="form-control"
-			dir="{model.additionalArguments.dir}"
-			id="{model.additionalArguments.id}"
-			lang="{model.additionalArguments.lang}"
-			title="{model.additionalArguments.title}"
-			tabindex="{model.additionalArguments.tabindex}"
-
-			name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-			value="{model.additionalArguments.text}"
-
-			autofocus="{model.additionalArguments.autofocus}"
-			rows="{model.additionalArguments.rows}"
-			cols="{model.additionalArguments.cols}"
-			placeholder="{model.additionalArguments.placeholder}"
-
-			errorClass="{model.additionalArguments.errorClass}"
-			additionalAttributes="{model.htmlAttributes}"
-		/>
-		<f:if condition="{model.mandatoryValidationMessages}">
-			<div class="help-block"><f:for each="{model.mandatoryValidationMessages}" as="mandatoryValidationMessage" iteration="iterator">{mandatoryValidationMessage}<f:if condition="{iterator.isLast}"><f:else> - </f:else></f:if></f:for></div>
-		</f:if>
-		<f:if condition="{model.validationErrorMessages}">
-			<strong><f:for each="{model.validationErrorMessages}" as="errorValidationMessage" iteration="iterator">{errorValidationMessage}<f:if condition="{iterator.isLast}"><f:else> - </f:else></f:if></f:for></strong>
-		</f:if>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Textblock.html

@@ -1,5 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="form-group">
-		<div class="help-block"><f:format.raw>{model.additionalArguments.text}</f:format.raw></div>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Textfield.html

@@ -1,34 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="form-group">
-		<label for="{model.additionalArguments.id}" class="control-label">
-			{model.additionalArguments.label}
-		</label>
-
-		<f:form.textfield
-				class="form-control"
-				id="{model.additionalArguments.id}"
-				title="{model.additionalArguments.title}"
-				tabindex="{model.additionalArguments.tabindex}"
-
-				value="{model.additionalArguments.value}"
-				name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-
-				autofocus="{model.additionalArguments.autofocus}"
-				maxlength="{model.additionalArguments.maxlength}"
-				size="{model.additionalArguments.size}"
-				placeholder="{model.additionalArguments.placeholder}"
-				pattern="{model.additionalArguments.pattern}"
-				required="{model.additionalArguments.required}"
-				type="{model.additionalArguments.type}"
-
-				errorClass="{model.additionalArguments.errorClass}"
-				additionalAttributes="{model.htmlAttributes}"
-		/>
-		<f:if condition="{model.mandatoryValidationMessages}">
-			<div class="help-block"><f:for each="{model.mandatoryValidationMessages}" as="mandatoryValidationMessage" iteration="iterator">{mandatoryValidationMessage}<f:if condition="{iterator.isLast}"><f:else> - </f:else></f:if></f:for></div>
-		</f:if>
-		<f:if condition="{model.validationErrorMessages}">
-			<strong><f:for each="{model.validationErrorMessages}" as="errorValidationMessage" iteration="iterator">{errorValidationMessage}<f:if condition="{iterator.isLast}"><f:else> - </f:else></f:if></f:for></strong>
-		</f:if>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Default/Show/FlatElements/Upload.html

@@ -1,20 +0,0 @@
-<f:if condition="{model.showElement}">
-	<div class="form-group">
-		<label for="{model.additionalArguments.id}" class="control-label">
-			{model.additionalArguments.label}
-		</label>
-
-		<f:form.upload
-			class="form-control"
-			id="{model.additionalArguments.id}"
-
-			name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-			value="{model.additionalArguments.value}"
-
-			multiple="{model.additionalArguments.multiple}"
-
-			errorClass="{model.additionalArguments.errorClass}"
-			additionalAttributes="{model.htmlAttributes}"
-		/>
-	</div>
-</f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Field/Field.html

@@ -0,0 +1,23 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:form.validationResults for="{element.rootForm.identifier}.{element.identifier}">
+	<div class="form-group{f:if(condition: '{validationResults.errors.0}', then: ' has-error')}">
+		<f:if condition="{doNotShowLabel} != 1">
+			<label class="control-label" for="{element.uniqueIdentifier}">{formvh:translateElementProperty(element: element, property: 'label')}<f:if condition="{element.required}"><f:render partial="Field/Required" /></f:if></label>
+		</f:if>
+        <f:format.raw>
+            {elementContent}
+            <f:if condition="{validationResults.flattenedErrors}">
+                <span class="error help-block" role="alert">
+                    <f:for each="{validationResults.errors}" as="error">
+                        {formvh:translateElementError(element: element, error: error)}
+                        <br />
+                    </f:for>
+                </span>
+            </f:if>
+        </f:format.raw>
+        <f:if condition="{element.properties.elementDescription}">
+            <span class="help-block">{formvh:translateElementProperty(element: element, property: 'elementDescription')}</span>
+        </f:if>
+	</div>
+</f:form.validationResults>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/Form/Navigation.html

@@ -0,0 +1,20 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<nav class="form-navigation">
+    <div class="button-group" role="group">
+        <f:if condition="{form.previousPage}">
+            <f:form.hidden property="__currentPage" value="{form.previousPage.index}" />
+            <f:form.button type="button" onclick="document.forms['{form.formDefinition.identifier}'].submit();" class="button" formnovalidate="formnovalidate">{formvh:translateElementProperty(element: form.currentPage, renderingOptionProperty: 'previousButtonLabel')}</f:form.button>
+        </f:if>
+        <f:if condition="{form.nextPage}">
+            <f:then>
+                <f:form.button property="__currentPage" value="{form.nextPage.index}" class="button button--active">{formvh:translateElementProperty(element: form.currentPage, renderingOptionProperty: 'nextButtonLabel')}</f:form.button>
+            </f:then>
+            <f:else>
+                <f:form.button property="__currentPage" value="{form.pages -> f:count()}" class="button button--active">
+                    {formvh:translateElementProperty(element: form, renderingOptionProperty: 'submitButtonLabel')}
+                </f:form.button>
+            </f:else>
+        </f:if>
+    </div>
+</nav>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/MultiCheckbox.html

@@ -0,0 +1,26 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<formvh:renderRenderable renderable="{element}">
+	<f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+		<div id="{element.uniqueIdentifier}">
+			<f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
+				<div class="checkbox">
+					<label class="form-check-label" for="{element.uniqueIdentifier}-{idIterator.index}">
+						<f:form.checkbox
+							property="{element.identifier}"
+							multiple="1"
+							id="{element.uniqueIdentifier}-{idIterator.index}"
+							value="{value}"
+							errorClass="{element.properties.elementErrorClassAttribute}"
+							additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+						/>
+                        <span class="cr">
+                            <i class="cr-icon glyphicon glyphicon-ok"></i>
+                        </span>
+						{formvh:translateElementProperty(element: element, property: '{0: \'options\', 1: value}')}
+					</label>
+				</div>
+			</f:for>
+		</div>
+	</f:render>
+</formvh:renderRenderable>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/RadioButton.html

@@ -0,0 +1,20 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<formvh:renderRenderable renderable="{element}">
+	<f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
+        <f:for each="{element.properties.options}" as="label" key="value" iteration="idIterator">
+            <div class="radio">
+                <label for="{element.uniqueIdentifier}-{idIterator.index}">
+                    <f:form.radio
+                        property="{element.identifier}"
+                        id="{element.uniqueIdentifier}-{idIterator.index}"
+                        value="{value}"
+                        errorClass="{element.properties.elementErrorClassAttribute}"
+                        additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+                    />
+                    <span class="cr"><i class="cr-icon glyphicon glyphicon-ok"></i></span> {formvh:translateElementProperty(element: element, property: '{0: \'options\', 1: value}')}
+                </label>
+            </div>
+        </f:for>
+	</f:render>
+</formvh:renderRenderable>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Partials/Form/StaticText.html

@@ -0,0 +1,9 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+<formvh:renderRenderable renderable="{element}">
+    <f:if condition="{element.properties.text}">
+        <p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}>
+            {formvh:translateElementProperty(element: element, property: 'text') -> f:format.nl2br()}
+        </p>
+    </f:if>
+</formvh:renderRenderable>
+</html>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Button.html

@@ -5,7 +5,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <ep:container data="{data}">
             <f:link.typolink class="button" parameter="{data.header_link}" additionalParams="&ref={referrerPid}">
                 {data.header}

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <div class="container">
             <calendar
                 uri="{ep:uri.ajax(action: 'range', controller: 'AjaxCalendar', extensionName: 'epproducts', pageUid: settings.defaultAjaxUid, arguments: '{hotel: data.tx_eptheme_context_hotel}', format: 'html')}"

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Contact.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <div class="ep-sidebar ep-quote">
             <div class="row">
                 <div class="col-xs-4">

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <div class="container-fluid ep-disturber ep-weekly-deal">
             <div>
                 <div>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Disturber.html

@@ -5,7 +5,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:switch expression="{data.layout}">
             <f:case value="0">
                 <f:render partial="Disturber/Small" section="Disturber" arguments="{_all}"/>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/EventPricetable.html

@@ -6,7 +6,7 @@
 
 	<f:layout name="Default"/>
 
-	<f:section name="Content">
+	<f:section name="Main">
         <event-pricetable
             uri="{ep:uri.ajax(extensionName: 'epproducts', action: 'eventPricetable', controller: 'AjaxTable', pageUid: settings.defaultAjaxUid, arguments: '{product: data.tx_eptheme_context_product}', format: 'html')}"
             loader-uri="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/ajax-loader-white.gif')}"

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html

@@ -4,7 +4,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:if condition="{hotel}">
             <f:render section="Map" arguments="{latitude: hotel.0.data.latitude, longitude: hotel.0.data.longitude, googleMapsApiKey: settings.googleMapsApiKey}"/>
         </f:if>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Header.html

@@ -5,7 +5,7 @@
 
     <f:layout name="Default" />
 
-    <f:section name="Content">
+    <f:section name="Main">
         <ep:container data="{data}">
             <f:render partial="Header/Header" arguments="{
                     header: data.header,

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Html.html

@@ -5,7 +5,7 @@
 
 	<f:layout name="Default"/>
 
-	<f:section name="Content">
+	<f:section name="Main">
 		<f:format.raw>{data.bodytext}</f:format.raw>
 	</f:section>
 

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html

@@ -6,7 +6,7 @@
 
 	<f:layout name="Default" />
 
-	<f:section name="Content">
+	<f:section name="Main">
 		<div>
 			<f:for each="{items}" as="item" iteration="iteration">
 				<div class="row ep-lineup{f:if(condition: iteration.isEven, then: ' right')}">

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:switch expression="{data.list_type}">
             <f:comment>Plugin watchlist</f:comment>
             <f:case value="epproducts_watchlist">

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSection.html

@@ -2,7 +2,7 @@
 
     <f:layout name="Default" />
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:spaceless>
             <f:if condition="{menu}">
                 <ul class="list-unstyled">

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSectionPages.html

@@ -2,7 +2,7 @@
 
     <f:layout name="Default" />
 
-    <f:section name="Content">
+    <f:section name="Main">
 
         <f:if condition="{menu}">
             <ul>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html

@@ -2,7 +2,7 @@
 
     <f:layout name="Default" />
 
-    <f:section name="Content">
+    <f:section name="Main">
 
         <f:if condition="{menu}">
             <ul class="list-unstyled">

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/NewsletterForm.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <iframe class="newsletterform" scrolling="no" frameborder="none"
                 src="https://bpn.ep-reisen.de/buspronet/anmeldung_news.php"
                 width="100%" height="100"></iframe>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Shortcut.html

@@ -3,7 +3,7 @@
 
 	<f:layout name="Default" />
 
-	<f:section name="Content">
+	<f:section name="Main">
 		<f:format.raw>{shortcuts}</f:format.raw>
 	</f:section>
 

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Teaser.html

@@ -5,7 +5,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:switch expression="{data.layout}">
             <f:case value="0">
                 <f:render partial="Teaser/OneColumn" section="Teaser" arguments="{_all}"/>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCity.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:render partial="City/Teaser" section="Teaser" arguments="{_all}"/>
     </f:section>
 

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserConcept.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:render partial="Concept/Teaser" section="Teaser" arguments="{_all}"/>
     </f:section>
 

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:link.typolink class="teaserbox teaserbox--country" parameter="{country.detailPage}" title="{country.name}">
             <div class="teaserbox__image">
                 <img class="teaserbox__flag"

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserHotel.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:render partial="Hotel/Teaser" section="Teaser" arguments="{_all}"/>
     </f:section>
 

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:if condition="{teaser.dates}">
             <f:switch expression="{data.layout}">
                 <f:case value="2">

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserRegion.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:render partial="Region/Teaser" section="Teaser" arguments="{_all}"/>
     </f:section>
 

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html

@@ -5,7 +5,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <f:switch expression="{data.layout}">
             <f:case value="2">
                 <f:render partial="ContentSlider" arguments="{images: files, thumbnails: 1, id: data.uid}"/>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/YoutubeVideo.html

@@ -6,7 +6,7 @@
 
     <f:layout name="Default"/>
 
-    <f:section name="Content">
+    <f:section name="Main">
         <div class="video">
             <iframe class="video__frame" width="560" height="315" frameborder="0" allowfullscreen
                     src="{ep:uri.video(value: data.header_link, layout: data.layout)}"></iframe>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/Frontend/AfterProcess.html

@@ -1,12 +0,0 @@
-<f:layout name="Default" />
-
-<f:section name="main">
-	<div class="container">
-		<div class="row">
-			<div class="alert alert-success col-md-6" role="alert">
-				<f:format.raw>{postProcessorContent}</f:format.raw>
-			</div>
-		</div>
-	</div>
-    <f:cObject typoscriptObjectPath="lib.conversionCode"/>
-</f:section>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/Frontend/Show.html

@@ -1,5 +0,0 @@
-<f:layout name="Default" />
-
-<f:section name="main">
-	<f:render partial="{model.themeName}/Show/ContainerElements/Form" arguments="{model: model, themeName: model.themeName}" />
-</f:section>

web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/Render.html

@@ -0,0 +1,10 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+
+    <f:flashMessages />
+    <f:if condition="{formConfiguration}">
+        <div class="form-wrapper form--border">
+            <formvh:render overrideConfiguration="{formConfiguration}" />
+        </div>
+    </f:if>
+
+</html>