formtastic-bootstrap 2.1.3 → 3.0.0.rc.1

data/lib/formtastic-bootstrap/inputs/base/hints.rb

@@ -2,7 +2,7 @@ module FormtasticBootstrap
   module Inputs
     module Base
       module Hints
-        
+
         include Formtastic::Inputs::Base::Hints
 
         def hint_html(inline_or_block = :block)
@@ -13,8 +13,8 @@ module FormtasticBootstrap
               options[:hint_class] || builder.default_block_hint_class
             end
             template.content_tag(
-              :span, 
-              Formtastic::Util.html_safe(hint_text), 
+              :span,
+              Formtastic::Util.html_safe(hint_text),
               :class => hint_class
             )
           end

data/lib/formtastic-bootstrap/inputs/base/html.rb

@@ -5,9 +5,15 @@ module FormtasticBootstrap
 
         include Formtastic::Inputs::Base::Html
 
+        def form_control_input_html_options
+          orig_class = input_html_options[:class]
+          new_class = [orig_class, "form-control"].compact.join(" ")
+          input_html_options.merge(:class => new_class)
+        end
+
         def input_html_options
           if errors?
-            { 
+            {
               :class => "error"
             }.merge(super)
           else
@@ -18,4 +24,4 @@ module FormtasticBootstrap
       end
     end
   end
-end
+end

data/lib/formtastic-bootstrap/inputs/base/labelling.rb

@@ -7,23 +7,18 @@ module FormtasticBootstrap
 
         def label_html_options
           super.tap do |options|
-            # Bootstrap defines class 'label'
+            # Bootstrap defines class 'label' too, so remove the
+            # one that gets created by Formtastic.
             options[:class] = options[:class].reject { |c| c == 'label' }
-            # options[:class] << "control-label"
-          end
-        end
-        
-        def control_label_html_options
-          label_html_options.tap do |options|
-            options[:class] << "control-label"
           end
         end
 
-        def control_label_html
-          render_label? ? builder.label(input_name, label_text, control_label_html_options) : "".html_safe
+        # def control_label_html
+        def label_html
+          render_label? ? builder.label(input_name, label_text, label_html_options) : "".html_safe
         end
 
       end
     end
   end
-end
+end

data/lib/formtastic-bootstrap/inputs/base/stringish.rb

@@ -2,16 +2,16 @@ module FormtasticBootstrap
   module Inputs
     module Base
       module Stringish
-        
+
         include Formtastic::Inputs::Base::Stringish
 
         def to_html
           bootstrap_wrapping do
-            builder.text_field(method, input_html_options)
+            builder.text_field(method, form_control_input_html_options)
           end
         end
-        
+
       end
     end
   end
-end
+end

data/lib/formtastic-bootstrap/inputs/base/timeish.rb

@@ -4,10 +4,10 @@ module FormtasticBootstrap
       module Timeish
 
         def to_html
-          control_group_wrapping do
-            control_label_html <<
-            controls_wrapping do
-              hidden_fragments <<
+          form_group_wrapping do
+            label_html <<
+            hidden_fragments <<
+            form_control_row_wrapping do
               fragments.map do |fragment|
                 fragment_input_html(fragment.to_sym)
               end.join.html_safe
@@ -15,10 +15,15 @@ module FormtasticBootstrap
           end
         end
 
-        def controls_wrapper_html_options
-          super.tap do |options|
-            options[:class] = (options[:class].split << "controls-row").join(" ")
-          end
+        def form_control_row_wrapping(&block)
+          template.content_tag(:div,
+            template.capture(&block).html_safe,
+            form_control_row_wrapper_html_options
+          )
+        end
+
+        def form_control_row_wrapper_html_options
+          { :class => "form-control" }
         end
 
         def fragment_input_html(fragment)
@@ -34,22 +39,23 @@ module FormtasticBootstrap
           end
         end
 
-        def fragment_class(fragment) 
-          { 
-            :year   => "span1", 
-            :month  => "span2",
-            :day    => "span1",
-            :hour   => "span1",
-            :minute => "span1",
-            :second => "span1"
+        def fragment_class(fragment)
+          {
+            :year   => "col-xs-1",
+            :month  => "col-xs-2",
+            :day    => "col-xs-1",
+            :hour   => "col-xs-1",
+            :minute => "col-xs-1",
+            :second => "col-xs-1"
           }[fragment]
         end
 
         def fragment_placeholder(fragment)
-          "." + fragment_class(fragment) 
+          # TODO This sets a useless placeholer right now.
+          "." + fragment_class(fragment)
         end
 
       end
     end
   end
-end
+end

data/lib/formtastic-bootstrap/inputs/base/wrapping.rb

@@ -6,74 +6,52 @@ module FormtasticBootstrap
         include Formtastic::Inputs::Base::Wrapping
 
         def bootstrap_wrapping(&block)
-          control_group_wrapping do
-            control_label_html <<
-            controls_wrapping do
-              if options[:prepend] || options[:append]
-                if options[:prepend] && options[:append]
-                  prepended_and_appended_input_wrapping do
-                    [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield, template.content_tag(:span, options[:append], :class => 'add-on'), hint_html].join("\n").html_safe
-                  end
-                elsif options[:prepend]
-                  prepended_input_wrapping do
-                    [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield, hint_html].join("\n").html_safe
-                  end
-                elsif options[:append]
-                  appended_input_wrapping do
-                    [yield, template.content_tag(:span, options[:append], :class => 'add-on'), hint_html].join("\n").html_safe
-                  end
-                end
-              else
-                [yield, hint_html].join("\n").html_safe
+          input_content = [
+            add_on_content(options[:prepend]),
+            options[:prepend_content],
+            yield,
+            add_on_content(options[:append]),
+            options[:append_content],
+            hint_html
+          ].compact.join("\n").html_safe
+
+          form_group_wrapping do
+            label_html <<
+            if prepended_or_appended?(options)
+              template.content_tag(:div, :class => add_on_wrapper_classes(options).join(" ")) do
+                input_content
               end
+            else
+              input_content
             end
           end
         end
 
-        def control_group_wrapping(&block)
-          template.content_tag(:div, 
-            template.capture(&block).html_safe, 
-            wrapper_html_options
-          )
+        def prepended_or_appended?(options)
+          options[:prepend] || options[:prepend_content] || options[:append] || options[:append_content]
+        end
+
+        def add_on_content(content)
+          return nil unless content
+          template.content_tag(:span, content, :class => 'add-on')
         end
 
-        def controls_wrapping(&block)
+        def form_group_wrapping(&block)
           template.content_tag(:div,
-            [template.capture(&block), error_html].join("\n").html_safe,
-            controls_wrapper_html_options
+            template.capture(&block).html_safe,
+            wrapper_html_options
           )
         end
-        
-        def controls_wrapper_html_options
-          {
-            :class => "controls"
-          }
-        end
 
         def wrapper_html_options
           super.tap do |options|
-            options[:class] << " control-group"
-          end
-        end
-        
-        # Bootstrap prepend feature
-        def prepended_input_wrapping(&block)
-          template.content_tag(:div, :class => 'input-prepend') do
-            yield
-          end
-        end
-
-        # Bootstrap append feature
-        def appended_input_wrapping(&block)
-          template.content_tag(:div, :class => 'input-append') do
-            yield
+            options[:class] << " form-group"
           end
         end
 
-        # Bootstrap prepend and append feature
-        def prepended_and_appended_input_wrapping(&block)
-          template.content_tag(:div, :class => 'input-prepend input-append') do
-            yield
+        def add_on_wrapper_classes(options)
+          [:prepend, :append, :prepend_content, :append_content].map do |key|
+            "input-#{key.to_s.gsub('_content', '')}" if options[key]
           end
         end
 

data/lib/formtastic-bootstrap/inputs/boolean_input.rb

@@ -5,25 +5,33 @@ module FormtasticBootstrap
       include Base
 
       def to_html
-        control_group_wrapping do
-          (options[:label_outside] ? control_label_html : "".html_safe) <<
-          hidden_field_html <<
-          controls_wrapping do
-            [label_with_nested_checkbox, hint_html].join("\n").html_safe
-          end
+        checkbox_wrapping do
+          "".html_safe <<
+          [label_with_nested_checkbox, hint_html].join("\n").html_safe
         end
       end
 
       def label_with_nested_checkbox
         builder.label(
           method,
-          options[:label_outside] ? check_box_html : label_text_with_embedded_checkbox,
-          label_html_options.tap do |options|
-            options[:class] << "checkbox"
-          end
+          label_text_with_embedded_checkbox,
+          label_html_options
         )
       end
 
+      def checkbox_wrapping(&block)
+        template.content_tag(:div,
+          template.capture(&block).html_safe,
+          wrapper_html_options
+        )
+      end
+
+      def wrapper_html_options
+        super.tap do |options|
+          options[:class] = (options[:class].split - ["form-group"] + ["checkbox"]).join(" ")
+        end
+      end
+
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/check_boxes_input.rb

@@ -8,30 +8,31 @@ module FormtasticBootstrap
       # TODO Support .inline
 
       def to_html
-        control_group_wrapping do
-          control_label_html <<
-          hidden_field_for_all <<
-          controls_wrapping do
-            collection.map { |choice|
-              choice_html(choice)
-            }.join("\n").html_safe
-          end
+        form_group_wrapping do
+          label_html <<
+          hidden_field_for_all << # Might need to remove this guy.
+          collection.map { |choice|
+            choice_html(choice)
+          }.join("\n").html_safe
         end
       end
 
-      def choice_wrapping_html_options(choice)
-        super(choice).tap do |options|
-          options[:class] = ((options[:class].split) << "checkbox").join(" ")
+      def choice_html(choice)
+        checkbox_wrapping do
+          template.content_tag(:label,
+            hidden_fields? ?
+              check_box_with_hidden_input(choice) :
+              check_box_without_hidden_input(choice) <<
+            choice_label(choice),
+            label_html_options.merge(choice_label_html_options(choice))
+          )
         end
       end
 
-      def choice_html(choice)
-        template.content_tag(:label,
-          hidden_fields? ?
-            check_box_with_hidden_input(choice) :
-            check_box_without_hidden_input(choice) <<
-          choice_label(choice),
-          label_html_options.merge(choice_label_html_options(choice))
+      def checkbox_wrapping(&block)
+        template.content_tag(:div,
+          template.capture(&block).html_safe,
+          :class => "checkbox"
         )
       end
 

data/lib/formtastic-bootstrap/inputs/email_input.rb

@@ -6,7 +6,7 @@ module FormtasticBootstrap
 
       def to_html
         bootstrap_wrapping do
-          builder.email_field(method, input_html_options)
+          builder.email_field(method, form_control_input_html_options)
         end
       end
 

data/lib/formtastic-bootstrap/inputs/number_input.rb

@@ -6,10 +6,10 @@ module FormtasticBootstrap
 
       def to_html
         bootstrap_wrapping do
-          builder.number_field(method, input_html_options)
+          builder.number_field(method, form_control_input_html_options)
         end
       end
-      
+
     end
   end
-end
+end

data/lib/formtastic-bootstrap/inputs/password_input.rb

@@ -6,7 +6,7 @@ module FormtasticBootstrap
 
       def to_html
         bootstrap_wrapping do
-          builder.password_field(method, input_html_options)
+          builder.password_field(method, form_control_input_html_options)
         end
       end
 

data/lib/formtastic-bootstrap/inputs/phone_input.rb

@@ -6,7 +6,7 @@ module FormtasticBootstrap
 
       def to_html
         bootstrap_wrapping do
-          builder.phone_field(method, input_html_options)
+          builder.phone_field(method, form_control_input_html_options)
         end
       end
 

data/lib/formtastic-bootstrap/inputs/radio_input.rb

@@ -8,13 +8,11 @@ module FormtasticBootstrap
       # TODO Support .inline
 
       def to_html
-        control_group_wrapping do
-          control_label_html <<
-          controls_wrapping do
-            collection.map { |choice|
-              choice_html(choice)
-            }.join("\n").html_safe
-          end
+        form_group_wrapping do
+          label_html <<
+          collection.map { |choice|
+            choice_html(choice)
+          }.join("\n").html_safe
         end
       end
 
@@ -26,21 +24,24 @@ module FormtasticBootstrap
         end
       end
 
-      # This came from check_boxes.  Do needed refactoring.
-      def choice_wrapping_html_options(choice)
-        super(choice).tap do |options|
-          options[:class] = ((options[:class].split) << "radio").join(" ")
+      def choice_html(choice)
+        radio_wrapping do
+          template.content_tag(:label,
+            builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) <<
+            choice_label(choice),
+            label_html_options.merge(choice_label_html_options(choice))
+          )
         end
       end
 
-      def choice_html(choice)        
-        template.content_tag(:label,
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
-          choice_label(choice),
-          label_html_options.merge(choice_label_html_options(choice))
+      def radio_wrapping(&block)
+        template.content_tag(:div,
+          template.capture(&block).html_safe,
+          :class => "radio"
         )
       end
-      
+
     end
   end
-end
+end
+