mod/06_bootstrap/set/all/bootstrap/form.rb in card-1.15.pre2 vs mod/06_bootstrap/set/all/bootstrap/form.rb in card-1.15.0

@@ -1,14 +1,13 @@
 format :html do
   def button_tag content_or_options = nil, options = {}, &block
-    if block_given?
-      content_or_options[:class] ||= ''
-      content_or_options[:class] += ' btn btn-default'
-    else
-      options[:class] ||= ''
-      options[:class] += ' btn btn-default'
-    end
+    bootstrapify_button( block_given? ? content_or_options : options )
     super(content_or_options, options, &block)
+  end
+  
+  def bootstrapify_button options
+    situation = options.delete(:situation) || 'default'
+    options[:class] = [ options[:class], 'btn', "btn-#{situation}" ].compact*' '
   end
   
   def type_field args={}
     args[:class] ||= ''
     args[:class] += ' form-control'