Add hints. Clean up tests.

mjbellantoni · Nov 8, 2011 · ff950a3 · ff950a3
1 parent 9998cdb
commit ff950a3
Show file tree

Hide file tree

Showing 6 changed files with 991 additions and 5 deletions.
diff --git a/lib/formtastic-bootstrap/form_builder.rb b/lib/formtastic-bootstrap/form_builder.rb
@@ -4,6 +4,30 @@ class FormBuilder < Formtastic::FormBuilder
 
     configure :default_inline_error_class, 'help-inline'
     configure :default_block_error_class,  'help-block'
+    configure :default_inline_hint_class,  'help-inline'
+    configure :default_block_hint_class,   'help-block'
+
+    def self.default_error_class
+      # self.default_inline_error_class
+      raise
+    end
+
+    def self.default_error_class=(error_class)
+      # self.default_inline_error_class = error_class
+      # self.default_block_error_class = error_class
+      raise
+    end
+
+    def self.default_hint_class
+      # self.default_inline_hint_class
+      raise
+    end
+
+    def self.default_hint_class=(hint_class)
+      # self.default_inline_hint_class = hint_class
+      # self.default_block_hint_class = hint_class
+      raise
+    end
 
     include FormtasticBootstrap::Helpers::InputHelper
     include FormtasticBootstrap::Helpers::InputsHelper

diff --git a/lib/formtastic-bootstrap/inputs/base.rb b/lib/formtastic-bootstrap/inputs/base.rb
@@ -11,8 +11,8 @@ module FormtasticBootstrap
   module Inputs
     module Base
 
-      # include Hints
       include Errors
+      include Hints
       include Html
       include Labelling
       include Wrapping

diff --git a/lib/formtastic-bootstrap/inputs/base/choices.rb b/lib/formtastic-bootstrap/inputs/base/choices.rb
@@ -5,7 +5,7 @@ module Choices
 
         def input_div_wrapping(&block)
           template.content_tag(:div, choices_wrapping_html_options) do
-            [yield, error_html(:block), hint_html].join("\n").html_safe  
+            [yield, error_html(:block), hint_html(:block)].join("\n").html_safe  
           end
         end
 

diff --git a/lib/formtastic-bootstrap/inputs/base/hints.rb b/lib/formtastic-bootstrap/inputs/base/hints.rb
@@ -5,12 +5,17 @@ module Hints
 
         include Formtastic::Inputs::Base::Hints
 
-        def hint_html
+        def hint_html(inline_or_block = :inline)
           if hint?
+            hint_class = if inline_or_block == :inline
+              options[:hint_class] || builder.default_inline_hint_class
+            else
+              options[:hint_class] || builder.default_block_hint_class
+            end
             template.content_tag(
               :span, 
               Formtastic::Util.html_safe(hint_text), 
-              :class => (options[:hint_class] || builder.default_hint_class)
+              :class => hint_class
             )
           end
         end
@@ -19,3 +24,4 @@ def hint_html
     end
   end
 end
+
diff --git a/lib/formtastic-bootstrap/inputs/base/wrapping.rb b/lib/formtastic-bootstrap/inputs/base/wrapping.rb
@@ -22,7 +22,7 @@ def clearfix_div_wrapping(&block)
 
         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].join("\n").html_safe  
+            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe  
           end
         end