diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index 0e4c9f5dd..90baed222 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -55,10 +55,10 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface 'name' => $config['installation_name'] ), 'date_format' => 'd-M-Y' - ) + ), + 'form' => array( + 'resources' => array('ChillMainBundle:Form:fields.html.twig')) ); $container->prependExtensionConfig('twig', $twigConfig); - } - } diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig index 40642bb91..aa1343571 100644 --- a/Resources/views/Form/fields.html.twig +++ b/Resources/views/Form/fields.html.twig @@ -1,20 +1,19 @@ - - {% block form_row %} {% spaceless %} -
0 %} has_error danger {% endif %} - {% endspaceless %}"> - {{ form_label(form) }} - {{ form_widget(form) }} - {{ form_errors(form) }} -
+ {% endspaceless %}">#}"> +{{ form_label(form) }} + +
+ {{ form_widget(form) }} + {{ form_errors(form) }} +
{% endspaceless %} {% endblock form_row %} - {% block form_widget_simple %} {% spaceless %} {% if attr.class is not defined %} @@ -69,7 +68,6 @@ has_error danger {% endspaceless %} {% endblock choice_widget_expanded %} - {% block date_widget %} {% spaceless %} {% if widget == 'single_text' %}