Merge pull request #43 from jisk/errors_inside_div

Move help-inline error sentences inside their control's div
mjbellantoni · Feb 2, 2013 · 86601d9 · 86601d9
2 parents d02ec34 + da6d1f3
commit 86601d9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/formtastic-bootstrap/inputs/base/wrapping.rb b/lib/formtastic-bootstrap/inputs/base/wrapping.rb
@@ -22,13 +22,16 @@ def bootstrap_wrapping(&block)
 
         def control_group_wrapping(&block)
           template.content_tag(:div, 
-          [template.capture(&block), error_html].join("\n").html_safe, 
+            template.capture(&block).html_safe, 
             wrapper_html_options
           )
         end
 
         def controls_wrapping(&block)
-          template.content_tag(:div, template.capture(&block).html_safe, controls_wrapper_html_options)
+          template.content_tag(:div,
+            [template.capture(&block), error_html].join("\n").html_safe,
+            controls_wrapper_html_options
+          )
         end
 
         def controls_wrapper_html_options