various funnel template fixes (#368)

* various funnel template fixes
* add translation keys to layer actions

Author: solverat

README.md

@@ -12,7 +12,7 @@
 
 | Release | Supported Pimcore Versions        | Supported Symfony Versions | Release Date | Maintained     | Branch                                                                           |
 |---------|-----------------------------------|----------------------------|--------------|----------------|----------------------------------------------------------------------------------|
-| **4.x** | `10.1` - `10.5`                   | `^5.4`                     | 13.10.2021   | Feature Branch | master                                                                           |
+| **4.x** | `10.5`                            | `^5.4`                     | 13.10.2021   | Feature Branch | master                                                                           |
 | **3.x** | `6.0` - `6.9`                     | `3.4`, `^4.4`              | 17.07.2019   | Bugfix only    | [3.x](https://github.com/dachcom-digital/pimcore-formbuilder/tree/3.x)           |
 | **2.7** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4`                      | 27.06.2019   | Unsupported    | [2.7](https://github.com/dachcom-digital/pimcore-formbuilder/tree/2.7)           |
 | **1.5** | `4.0`                             | --                         | 18.03.2017   | Unsupported    | [pimcore4](https://github.com/dachcom-digital/pimcore-formbuilder/tree/pimcore4) |

src/FormBuilderBundle/Assembler/FormAssembler.php

@@ -74,10 +74,11 @@ public function assembleViewVars(FormOptionsResolver $optionsResolver): array
         }
 
         $systemRuntimeData = [
-            'form_preset'          => $optionsResolver->getFormPreset(),
-            'form_output_workflow' => $optionsResolver->getOutputWorkflow(),
-            'form_template'        => $optionsResolver->getFormTemplateName(),
-            'custom_options'       => $optionsResolver->getCustomOptions()
+            'form_preset'             => $optionsResolver->getFormPreset(),
+            'form_output_workflow'    => $optionsResolver->getOutputWorkflow(),
+            'form_template'           => $optionsResolver->getFormTemplateName(),
+            'form_template_full_path' => $optionsResolver->getFormTemplate(),
+            'custom_options'          => $optionsResolver->getCustomOptions()
         ];
 
         $viewVars['form_block_template'] = $optionsResolver->getFormBlockTemplate();

src/FormBuilderBundle/Form/Type/LayerType.php

@@ -23,7 +23,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 continue;
             }
 
-            $builder->add($element->getFunnelActionDefinition()->getName(), SubmitType::class);
+            $builder->add(
+                $element->getFunnelActionDefinition()->getName(),
+                SubmitType::class,
+                [
+                    'label' => $element->getFunnelActionDefinition()->getLabel()
+                ]
+            );
         }
     }
 

src/FormBuilderBundle/OutputWorkflow/Channel/Funnel/FunnelOutputChannel.php

@@ -137,10 +137,11 @@ public function dispatchFunnelProcessing(FunnelWorkerData $funnelWorkerData): Re
         $renderType = $funnelLayer->dynamicFunnelActionAware() ? self::RENDER_TYPE_PRERENDER : self::RENDER_TYPE_INCLUDE;
 
         $viewArguments = array_merge($funnelLayerData->getFunnelLayerViewArguments(), [
-            'form'          => $form->createView(),
-            'formTheme'     => $funnelWorkerData->getSubmissionEvent()->getFormRuntimeData()['form_template'] ?? null,
+            'form'           => $form->createView(),
+            'formTheme'      => $funnelWorkerData->getSubmissionEvent()->getFormRuntimeData()['form_template'] ?? null,
+            'formThemePath'  => $funnelWorkerData->getSubmissionEvent()->getFormRuntimeData()['form_template_full_path'] ?? null,
             'formRenderRest' => $renderType === self::RENDER_TYPE_INCLUDE,
-            'funnelActions' => $funnelWorkerData->getFunnelActionElementStack(),
+            'funnelActions'  => $funnelWorkerData->getFunnelActionElementStack(),
         ]);
 
         $templateArguments = [

src/FormBuilderBundle/Resources/views/funnel/form-data-bs4.html.twig renamed to src/FormBuilderBundle/Resources/views/form/data/data_bootstrap_4.html.twig

@@ -1,7 +1,7 @@
 {% extends '@FormBuilder/layout_funnel.html.twig' %}
 
-{% if formTheme is not null %}
-    {% form_theme form with [formTheme ~ '.html.twig'] only %}
+{% if formThemePath is not null %}
+    {% form_theme form formThemePath %}
 {% endif %}
 
 {% block funnel_content %}