Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 4 insertions, 0 deletions

diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index ddb063e..b74e1d7 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -39,6 +39,10 @@ module LinkHelper
   def btn(*args, &block)
     html_options = extract_html_options!(args, &block)
     type = Array(html_options.delete(:type))
+    btn_opts = [:default, :primary, :success, :info, :warning, :danger, :link]
+    if (type & btn_opts).blank?
+      type << :default
+    end
     type.map! {|t| "btn-#{t}"}
     html_options[:class] = concat_classes(html_options[:class], 'btn', type)
     args[0] = t(args[0]) if args[0].is_a?(Symbol)