choices.rb in formtastic-bootstrap-2.0.0

- old
+ new
@@ -1,47 +1,18 @@
 module FormtasticBootstrap
   module Inputs
     module Base
       module Choices
+        include Formtastic::Inputs::Base::Choices
 
-        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  
+        def choice_wrapping_html_options(choice)
+          super(choice).tap do |options|
+            options[:for]   = choice_input_dom_id(choice)
           end
         end
 
-        def choices_wrapping_html_options
-          # TODO Call the Formtastic one explicity and append?
-          { :class => "choices input" }
-        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
-
-        # This is actually a label in Bootstrap.
-        def legend_html
-          template.content_tag(:label, label_html_options) do
-            render_label? ? label_text : "".html_safe
-          end
-        end
-
-        def label_html_options
-          super.merge(:for => nil)
+        def choice_label_html_options(choice)
+          choice_wrapping_html_options(choice)
         end
 
       end
     end
   end
\ No newline at end of file