Fixing field spacing on horizontal forms when no label exists

Author: potenza

lib/bootstrap_form/form_builder.rb

@@ -9,7 +9,7 @@ class FormBuilder < ActionView::Helpers::FormBuilder
 
     def initialize(object_name, object, template, options, proc=nil)
       @style = options[:style]
-      @left_class = options[:left] || "col-sm-2"
+      @left_class = (options[:left] || "col-sm-2") + " control-label"
       @right_class = options[:right] || "col-sm-10"
       super
     end
@@ -78,10 +78,14 @@ def form_group(name = nil, options = {}, &block)
 
       label_options = options.delete(:label)
       label_html = if label_options
-        label_options[:class] = "#{@left_class} control-label".lstrip if @style == :horizontal
+        label_options[:class] = "#{label_options[:class]} #{@left_class}".lstrip if @style == :horizontal
         label(name, label_options[:text], label_options.except(:text))
       end || ""
 
+      if label_html.empty? && @style == :horizontal
+        label_html = content_tag(:label, "", class: @left_class)
+      end
+
       html = capture(&block)
 
       help_text = options.delete(:help)

test/bootstrap_form_test.rb

@@ -192,13 +192,22 @@ def setup
 
   test "form_group creates a valid structure and allows arbitrary html to be added via a block" do
     output = @horizontal_builder.form_group :nil, label: { text: 'Foo' } do
-      content_tag :p, "Bar", class: "form-control-static"
+      %{<p class="form-control-static">Bar</p>}.html_safe
     end
 
     expected = %{<div class="form-group"><label class="col-sm-2 control-label" for="user_nil">Foo</label><div class="col-sm-10"><p class="form-control-static">Bar</p></div></div>}
     assert_equal expected, output
   end
 
+  test "form_group adds a spacer when no label exists for a horizontal form" do
+    output = @horizontal_builder.form_group do
+      content_tag :p, "Bar", class: "form-control-static"
+    end
+
+    expected = %{<div class="form-group"><label class="col-sm-2 control-label"></label><div class="col-sm-10"><p class="form-control-static">Bar</p></div></div>}
+    assert_equal expected, output
+  end
+
   test "control_group renders the options for div.control_group" do
     skip
     output = @builder.control_group nil, id: 'foo' do