3 files changed, 25 insertions, 20 deletions
diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb
index bbb611506..b3d79262e 100644
--- a/app/helpers/routes_helper.rb
+++ b/app/helpers/routes_helper.rb
@@ -14,4 +14,3 @@ module RoutesHelper
   end
   
 end
-
diff --git a/app/helpers/rule_parameter_sets_helper.rb b/app/helpers/rule_parameter_sets_helper.rb
new file mode 100644
index 000000000..8485b63ca
--- /dev/null
+++ b/app/helpers/rule_parameter_sets_helper.rb
@@ -0,0 +1,18 @@
+module RuleParameterSetsHelper
+
+  def unique( value)
+    return t("true") if value == "1"
+    t "false"
+  end
+
+  def pattern(value)
+    return t("rule_parameter_sets.labels.free_char") if value == "0"
+    return t("rule_parameter_sets.labels.num_char") if value == "1"
+    return t("rule_parameter_sets.labels.alpha_char") if value == "2"
+    return t("rule_parameter_sets.labels.upper_char") if value == "3"
+    return t("rule_parameter_sets.labels.lower_char") if value == "4"
+  end
+  
+end
+
+
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 0dfc1552f..ea5f41fb7 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -4,25 +4,13 @@ module UsersHelper
       image_tag user_image(user), :alt => "", :class => "preview", :width => size, :height => size
   end
 
-  def gravatar_hash(user)
-    Digest::MD5.hexdigest( user.email)
-  end
-  def gravatar_url( user)
-    "http://www.gravatar.com/avatar/#{gravatar_hash(user)}?d=404"
-  end
-  def user_image(user)
-    begin
-      gravatar_resource = RestClient.get( gravatar_url( user)){|response, request, result| response }
-    rescue
-      # Happens if network is not available
-      return 'icons/user.png'
-    end
-    if gravatar_resource.code == 404
-      # Happens if user has not registered to gravatar
-      'icons/user.png'
-    else
-      gravatar_url( user)
-    end
+  def user_default_avatar
+    return "#{authenticated_root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
+
+    relative_url_root = Rails.application.config.relative_url_root.gsub( /\//, '')
+    "#{authenticated_root_url}#{image_path('icons/user.png')}".
+      sub( Regexp.new("/#{relative_url_root}/#{relative_url_root}/"), "/#{relative_url_root}/").
+      sub( Regexp.new("/#{relative_url_root}//#{relative_url_root}/"), "/#{relative_url_root}/")
   end
 
 end