speedo-formstrap 1.2.7 → 1.2.8

data/lib/formtastic-bootstrap/helpers/fieldset_wrapper.rb

@@ -3,17 +3,13 @@ module FormtasticBootstrap
     module FieldsetWrapper
 
       include Formtastic::Helpers::FieldsetWrapper
-      
+
       protected
 
       def field_set_and_list_wrapping(*args, &block) #:nodoc:
         contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
         html_options = args.extract_options!
 
-        legend  = (html_options[:name] || '').to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, Formtastic::Util.html_safe(legend)) unless legend.blank?
-
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
             template.capture_haml(&block)
@@ -24,6 +20,8 @@ module FormtasticBootstrap
 
         # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
         contents = contents.join if contents.respond_to?(:join)
+
+        legend = field_set_legend(html_options)
         fieldset = template.content_tag(:fieldset,
           Formtastic::Util.html_safe(legend) << Formtastic::Util.html_safe(contents),
           html_options.except(:builder, :parent, :name)
@@ -32,6 +30,13 @@ module FormtasticBootstrap
         fieldset
       end
 
+      def field_set_legend(html_options)
+        legend  = (html_options[:name] || '').to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, Formtastic::Util.html_safe(legend)) unless legend.blank?
+        legend
+      end
+
     end
   end
-end
+end

data/lib/formtastic-bootstrap/helpers/inputs_helper.rb

@@ -6,7 +6,7 @@ module FormtasticBootstrap
         def inputs(*args, &block)
           wrap_it = @already_in_an_inputs_block ? true : false
           @already_in_an_inputs_block = true
-        
+
           title = field_set_title_from_args(*args)
           html_options = args.extract_options!
           html_options[:class] ||= "inputs"
@@ -25,12 +25,12 @@ module FormtasticBootstrap
               field_set_and_list_wrapping(*((args << html_options) << contents))
             end
           end
-        
+
           # out = template.content_tag(:li, out, :class => "input") if wrap_it
-          @already_in_an_inputs_block = false
+          @already_in_an_inputs_block = wrap_it
           out
         end
 
     end
   end
-end
+end

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

@@ -3,6 +3,7 @@ require "formtastic-bootstrap/inputs/base/errors"
 require "formtastic-bootstrap/inputs/base/hints"
 require "formtastic-bootstrap/inputs/base/html"
 require "formtastic-bootstrap/inputs/base/labelling"
+require "formtastic-bootstrap/inputs/base/numeric"
 require "formtastic-bootstrap/inputs/base/stringish"
 require "formtastic-bootstrap/inputs/base/timeish"
 require "formtastic-bootstrap/inputs/base/wrapping"
@@ -16,7 +17,7 @@ module FormtasticBootstrap
       include Html
       include Labelling
       include Wrapping
-      
+
     end
   end
 end

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

@@ -5,45 +5,34 @@ module FormtasticBootstrap
 
         def input_div_wrapping(&block)
           template.content_tag(:div, choices_wrapping_html_options) do
-            [yield, error_html(:block), hint_html(:block)].join("\n").html_safe  
+            [yield, error_html(:block), hint_html(:block)].join("\n").html_safe
           end
         end
 
         def choices_wrapping_html_options
-          # TODO Call the Formtastic one explicity and append?
-          { :class => "choices input" }
+          new_class = [super[:class], "controls"].compact.join(" ")
+          super.merge(:class => new_class)
         end
 
-        def choices_group_wrapping(&block)
-          template.content_tag(:ul,
-            template.capture(&block),
-            choices_group_wrapping_html_options
-          )
-        end
-
-        def choices_group_wrapping_html_options
-          { :class => "choices-group inputs-list" }
-        end
-
-        def choice_label(choice)
-          "\n".html_safe + template.content_tag(:span) do
-            # (choice.is_a?(Array) ? choice.first : choice).to_s
-            (choice.is_a?(Array) ? choice.first : choice).to_s
-          end
-        end
+        #def choices_group_wrapping(&block)
+        #  template.content_tag(:ul,
+        #    template.capture(&block),
+        #    choices_group_wrapping_html_options
+        #  )
+        #end
 
         # This is actually a label in Bootstrap.
         def legend_html
-          template.content_tag(:label, label_html_options) do
+          template.content_tag(:label, control_label_html_options) do
             render_label? ? label_text : "".html_safe
           end
         end
 
-        def label_html_options
+        def control_label_html_options
           super.merge(:for => nil)
         end
 
       end
     end
   end
-end
+end

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

@@ -5,14 +5,24 @@ module FormtasticBootstrap
 
         include Formtastic::Inputs::Base::Labelling
 
+        def label_html
+          render_label? ? builder.label(input_name, label_text, control_label_html_options) : "".html_safe
+        end
+
         def label_html_options
-          {}.tap do |opts|
-            opts[:for] ||= input_html_options[:id]
-            opts[:class] = [opts[:class]]
-          end
+          opts = {}
+          opts[:for] ||= input_html_options[:id]
+          opts[:class] = [opts[:class]]
+
+          opts
         end
-        
+
+        def control_label_html_options
+          new_class = [label_html_options[:class], "control-label"].compact.join(" ")
+          label_html_options.merge(:class => new_class)
+        end
+
       end
     end
   end
-end
+end

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

@@ -0,0 +1,18 @@
+# Alas, I need to duplicate code from Formtastic::Inputs::Base::Numeric because
+# there's no way to re-import that module.
+module FormtasticBootstrap
+	module Inputs
+		module Base
+			module Numeric
+
+				include Formtastic::Inputs::Base::Numeric
+
+				def wrapper_html_options
+					new_class = [super[:class], "numeric", "stringish"].compact.join(" ")
+					super.merge(:class => new_class)
+				end
+
+			end
+		end
+	end
+end

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

@@ -3,13 +3,6 @@ module FormtasticBootstrap
     module Base
       module Timeish
 
-        def label_html
-          # TODO Supress the "for" field?
-          template.content_tag(:label, label_html_options) do
-            render_label? ? label_text : "".html_safe
-          end
-        end
-
         def date_input_html
           fragment_input_html(:date, "small")
         end
@@ -17,19 +10,19 @@ module FormtasticBootstrap
         def time_input_html
           fragment_input_html(:time, "mini")
         end
-        
+
         def fragment_id(fragment)
           # TODO is this right?
           # "#{input_html_options[:id]}_#{position(fragment)}i"
           "#{input_html_options[:id]}[#{fragment}]"
         end
-        
+
         def fragment_input_html(fragment, klass)
-          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
           template.send(:"text_field_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment), :class => klass))
         end
-     
+
       end
     end
   end
-end
+end

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

@@ -6,23 +6,29 @@ module FormtasticBootstrap
         include Formtastic::Inputs::Base::Wrapping
 
         def generic_input_wrapping(&block)
-          clearfix_div_wrapping do
+          control_group_div_wrapping do
             label_html <<
             input_div_wrapping do
-              yield
+              if options[:prepend]
+                prepended_input_wrapping do
+                  [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield].join("\n").html_safe
+                end
+              else
+                yield
+              end
             end
           end
         end
 
-        def clearfix_div_wrapping(&block)
+        def control_group_div_wrapping(&block)
           template.content_tag(:div, wrapper_html_options) do
             yield
           end
         end
 
         def input_div_wrapping(inline_or_block_errors = :inline)
-          template.content_tag(:div, :class => "input") do 
-            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe  
+          template.content_tag(:div, :class => "controls") do
+            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe
           end
         end
 
@@ -33,24 +39,36 @@ module FormtasticBootstrap
         end
 
         def wrapper_html_options
-          opts = options[:wrapper_html] || {}
-          opts[:class] ||= []
-          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
-          opts[:class] << as
-          opts[:class] << "clearfix"
+          opts = (options[:wrapper_html] || {}).dup
+          opts[:class] =
+            case opts[:class]
+            when Array
+              opts[:class].dup
+            when nil
+              []
+            else
+              [opts[:class].to_s]
+            end
+          opts[:class] << "#{as}-wrapper"
+          opts[:class] << "control-group"
           # opts[:class] << "input"
           opts[:class] << "error" if errors?
           opts[:class] << "optional" if optional?
           opts[:class] << "required" if required?
           opts[:class] << "autofocus" if autofocus?
           opts[:class] = opts[:class].join(' ')
-        
+
           opts[:id] ||= wrapper_dom_id
-      
+
           opts
         end
-
+        
+        def prepended_input_wrapping(&block)
+          template.content_tag(:div, :class => 'input-prepend') do
+            yield
+          end
+        end
       end
     end
   end
-end
+end

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

@@ -5,29 +5,25 @@ module FormtasticBootstrap
       include Base
 
       def to_html
-        clearfix_div_wrapping do
+        control_group_div_wrapping do
           empty_label <<
           hidden_field_html <<
           input_div_wrapping(:block) do
-            template.content_tag(:ul, :class => "inputs-list") do
-              template.content_tag(:li) do
-                label_with_nested_checkbox
-              end
-            end
+            label_with_nested_checkbox
           end
         end
       end
 
-      def label_text_with_embedded_checkbox
-        # That newline matters!  Why, I do no not know.
-        check_box_html << "\n" << template.content_tag(:span) do label_text end
+      def label_html_options
+        new_class = [super[:class], "checkbox"].compact.join(" ")
+        super.merge(:class => new_class)
       end
 
       # Need this for formatting to work.
       def empty_label
-        template.content_tag(:label) do end
+        template.content_tag(:label, '', :class => 'control-label') do end
       end
 
     end
   end
-end
+end

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

@@ -5,17 +5,13 @@ module FormtasticBootstrap
       include Base::Choices
 
       def to_html
-        clearfix_div_wrapping do
+        control_group_div_wrapping do
           legend_html <<
           hidden_field_for_all <<
           input_div_wrapping do
-            choices_group_wrapping do
-              collection.map { |choice|
-                choice_wrapping(choice_wrapping_html_options(choice)) do
-                  choice_html(choice)
-                end
-              }.join("\n").html_safe
-            end
+            collection.map { |choice|
+              choice_html(choice)
+            }.join("\n").html_safe
           end
         end
       end
@@ -26,10 +22,15 @@ module FormtasticBootstrap
             check_box_with_hidden_input(choice) :
             check_box_without_hidden_input(choice) <<
           choice_label(choice),
-          label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
+          label_html_options.merge(:for => choice_input_dom_id(choice)).merge(choice_wrapping_html_options(choice))
         )
       end
 
+      def choice_wrapping_html_options(choice)
+        new_class = [super[:class], 'checkbox'].join(' ')
+        super.merge(:class => new_class)
+      end
+
     end
   end
 end

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

@@ -3,10 +3,12 @@ module FormtasticBootstrap
     class HiddenInput < Formtastic::Inputs::HiddenInput
       include Base
       def to_html
-        generic_input_wrapping do
-          builder.hidden_field(method, input_html_options)
+        control_group_div_wrapping do
+          input_div_wrapping do
+            builder.hidden_field(method, input_html_options)
+          end
         end
       end
     end
   end
-end
+end

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

@@ -2,7 +2,7 @@ module FormtasticBootstrap
   module Inputs
     class NumberInput < Formtastic::Inputs::NumberInput
       include Base
-      include Base::Stringish
+      include Base::Numeric
 
       def to_html
         generic_input_wrapping do
@@ -12,4 +12,4 @@ module FormtasticBootstrap
 
     end
   end
-end
+end

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

@@ -5,28 +5,29 @@ module FormtasticBootstrap
       include Base::Choices
 
       def to_html
-        clearfix_div_wrapping do
+        control_group_div_wrapping do
           legend_html <<
           input_div_wrapping do
-            choices_group_wrapping do
-              collection.map { |choice| 
-                choice_wrapping(choice_wrapping_html_options(choice)) do
-                  choice_html(choice)
-                end
-              }.join("\n").html_safe
-            end
+            collection.map { |choice|
+              choice_html(choice)
+            }.join("\n").html_safe
           end
         end
       end
 
-      def choice_html(choice)        
-        template.content_tag(:label, label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)) do
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
+      def choice_html(choice)
+        template.content_tag(:label, label_html_options.merge(:for => choice_input_dom_id(choice)).merge(choice_wrapping_html_options(choice))) do
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) <<
 
           choice_label(choice)
         end
       end
 
+      def choice_wrapping_html_options(choice)
+        new_class = [super[:class], 'radio'].join(' ')
+        super.merge(:class => new_class)
+      end
+
     end
   end
-end
+end