From f5655fc21b3718fda4810e9254d9de6938ced72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Tue, 26 Nov 2013 22:56:30 +0100
Subject: [PATCH] add errors in labels

---
 Resources/views/Form/fields.html.twig      | 25 ++++++++++++++++++----
 Tests/Controller/DefaultControllerTest.php |  6 +-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
index b79394550..173941e44 100644
--- a/Resources/views/Form/fields.html.twig
+++ b/Resources/views/Form/fields.html.twig
@@ -2,10 +2,14 @@
 
 {% block form_row %}
 {% spaceless %}
-    <div class="field inline">
-        {{ form_errors(form) }}
+    <div class="field inline {% spaceless %} 
+{% if errors|length > 0 %}
+has_error danger
+{% endif %}
+ {% endspaceless %}">
         {{ form_label(form) }}
         {{ form_widget(form)  }}
+        {{ form_errors(form) }}
     </div>
 {% endspaceless %}
 {% endblock form_row %}
@@ -89,7 +93,7 @@
             {% set label_attr = label_attr|merge({'for': id}) %}
         {% endif %}
         {% if required %}
-            {% set label_attr = label_attr|merge({'class': (label_attr.class|default('inline ') ~ ' required')|trim}) %}
+            {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' required')|trim}) %}
         {% endif %}
         {% if label is empty %}
             {% set label = name|humanize %}
@@ -106,7 +110,20 @@
         {{ form_widget(form.daily_counter, { 'attr': { 'class': 'input belgian_national_number_daily_counter' } } ) }}
         {{ form_widget(form.control_digit, { 'attr': { 'class': 'input belgian_national_number_control_digit' } } ) }}
     {% endspaceless %}
-{% endblock %}        
+{% endblock %}  
+        
+        
+{% block form_errors %}
+{% spaceless %}
+    {% if errors|length > 0 %}
+    <ul class="errors">
+        {% for error in errors %}
+            <li>{{ error.message }}</li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+{% endspaceless %}
+{% endblock form_errors %}      
 
  
 {#    
diff --git a/Tests/Controller/DefaultControllerTest.php b/Tests/Controller/DefaultControllerTest.php
index d728906dd..6b49cccf5 100644
--- a/Tests/Controller/DefaultControllerTest.php
+++ b/Tests/Controller/DefaultControllerTest.php
@@ -8,10 +8,6 @@ class DefaultControllerTest extends WebTestCase
 {
     public function testIndex()
     {
-        $client = static::createClient();
-
-        $crawler = $client->request('GET', '/hello/Fabien');
-
-        $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
+        
     }
 }