Merge branch 'devel' into v0.2.x

jbox-web · Mar 12, 2015 · d081eee · d081eee
2 parents ef35335 + 38b69e6
commit d081eee
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/helpers/bootstrap_switch_helper.rb b/app/helpers/bootstrap_switch_helper.rb
@@ -1,8 +1,12 @@
 module BootstrapSwitchHelper
 
-  def bootstrapswitch_button(&block)
-    content_tag(:span, class: 'bootstrap-switch switch-small', data: bootstrapswitch_default_data) do
-      yield
+  def bootstrap_switch_tag(opts = {}, &block)
+    css_class = opts.delete(:class){ '' }
+    options   = { data: bootstrapswitch_default_data }
+    options   = options.deep_merge(opts)
+    options[:class] = ['bootstrap-switch', 'switch-small'].push(css_class)
+    content_tag(:span, options) do
+      yield if block_given?
     end
   end