Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 15 insertions, 8 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1e79990..90e649a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,18 +19,25 @@ module ApplicationHelper
   # http://twitter.github.io/bootstrap/base-css.html#icons
   #
   def icon(name, color=nil)
+    "<i class=\"icon-#{name} #{color_class(color)}\"></i> ".html_safe
+  end
+
+  def big_icon(name, color=nil)
+    "<i class=\"big-icon-#{name} #{color_class(color)}\"></i> ".html_safe
+  end
+
+  def huge_icon(name, color=nil)
+    "<i class=\"huge-icon-#{name} #{color_class(color)}\"></i> ".html_safe
+  end
+
+  def color_class(color)
     if color.nil?
-      color_class = nil
+      nil
     elsif color == :black
-      color_class = 'icon-black'
+      'icon-black'
     elsif color == :white
-      color_class = 'icon-white'
+      'icon-white'
     end
-    "<i class=\"icon-#{name} #{color_class}\"></i> ".html_safe
-  end
-
-  def big_icon(name, color=nil)
-    "<i class=\"big-icon-#{name}\"></i> ".html_safe
   end
 
   def format_flash(msg)