Added horizontal_label_div_class. (#1179)

Author: Stephan Vierkant

DependencyInjection/Configuration.php

@@ -48,6 +48,9 @@ protected function addFormConfig(ArrayNodeDefinition $rootNode)
                         ->scalarNode('horizontal_label_class')
                             ->defaultValue("col-sm-3")
                         ->end()
+                        ->scalarNode('horizontal_label_div_class')
+                            ->defaultNull()
+                        ->end()
                         ->scalarNode('horizontal_label_offset_class')
                             ->defaultValue("col-sm-offset-3")
                         ->end()

Form/Extension/HorizontalFormTypeExtension.php

@@ -55,6 +55,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['horizontal_label_class'] = $options['horizontal_label_class'];
         $view->vars['horizontal_label_offset_class'] = $options['horizontal_label_offset_class'];
         $view->vars['horizontal_input_wrapper_class'] = $options['horizontal_input_wrapper_class'];
+        $view->vars['horizontal_label_div_class'] = $options['horizontal_label_div_class'];
     }
 
     public function finishView(FormView $view, FormInterface $form, array $options)
@@ -110,6 +111,7 @@ public function configureOptions(OptionsResolver $resolver)
                 'horizontal_label_class' => $this->options['horizontal_label_class'],
                 'horizontal_label_offset_class' => $this->options['horizontal_label_offset_class'],
                 'horizontal_input_wrapper_class' => $this->options['horizontal_input_wrapper_class'],
+                'horizontal_label_div_class' => $this->options['horizontal_label_div_class'],
             )
         );
     }

Resources/config/form.xml

@@ -93,6 +93,7 @@
             <argument type="collection">
                 <argument key="horizontal">%mopa_bootstrap.form.horizontal%</argument>
                 <argument key="horizontal_label_class">%mopa_bootstrap.form.horizontal_label_class%</argument>
+                <argument key="horizontal_label_div_class">%mopa_bootstrap.form.horizontal_label_div_class%</argument>
                 <argument key="horizontal_label_offset_class">%mopa_bootstrap.form.horizontal_label_offset_class%</argument>
                 <argument key="horizontal_input_wrapper_class">%mopa_bootstrap.form.horizontal_input_wrapper_class%</argument>
             </argument>

Resources/doc/misc/configuration-reference.md

@@ -9,6 +9,7 @@ mopa_bootstrap:
         templating:           MopaBootstrapBundle:Form:fields.html.twig
         horizontal:           true
         horizontal_label_class:  col-sm-3 control-label
+        horizontal_label_div_class: null
         horizontal_label_offset_class:  col-sm-offset-3
         horizontal_input_wrapper_class:  col-sm-9
         render_fieldset:      true

Resources/views/Form/fields.html.twig

@@ -452,6 +452,9 @@
         {% if horizontal %}
             {% set label_attr_class = 'control-label ' ~ label_attr_class ~ horizontal_label_class %}
         {% endif %}
+        {% if horizontal_label_div_class %}
+        <div class="{{ horizontal_label_div_class }}">
+        {% endif %}
         {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ " " ~ label_attr_class ~ (required ? ' required' : ' optional'))|trim }) %}
         <label{% for attrname,attrvalue in label_attr %} {{attrname}}="{{attrvalue}}"{% endfor %}>
         {{ label|trans({}, translation_domain) }}
@@ -469,6 +472,9 @@
             {{ block('help_label_popover') }}
         {% endif %}
         </label>
+        {% if horizontal_label_div_class %}
+        </div>
+        {% endif %}
     {% endif %}
 {% endspaceless %}
 {% endif %}

Tests/Form/AbstractDivLayoutTest.php

@@ -164,6 +164,7 @@ protected function getHorizontalFormTypeExtension()
         return new HorizontalFormTypeExtension(array(
             'horizontal' => true,
             'horizontal_label_class' => 'col-sm-3',
+            'horizontal_label_div_class' => null,
             'horizontal_label_offset_class' => 'col-sm-offset-3',
             'horizontal_input_wrapper_class' => 'col-sm-9',
         ));