Allow themes to override profile default images

(ActionItem1627)

Allow themes to override profile default images
(ActionItem1627)
Antonio Terceiro
1 parent 801b04e3
Showing 29 changed files with 17 additions and 6 deletions Show diff stats
app/helpers/application_helper.rb
app/models/comment.rb
public/images/icons-app/community-big.png
public/images/icons-app/community-minor.png
public/images/icons-app/community-portrait.png
public/images/icons-app/community-thumb.png
public/images/icons-app/enterprise-big.png
public/images/icons-app/enterprise-default-pic-big.png
public/images/icons-app/enterprise-default-pic-minor.png
public/images/icons-app/enterprise-default-pic-portrait.png
public/images/icons-app/enterprise-default-pic-thumb.png
public/images/icons-app/enterprise-minor.png
public/images/icons-app/enterprise-portrait.png
public/images/icons-app/enterprise-thumb.png
public/images/icons-app/person-big.png
public/images/icons-app/person-icon.png
public/images/icons-app/person-minor.png
public/images/icons-app/person-portrait.png
public/images/icons-app/person-thumb.png
public/images/icons-app/user_icon_size-big.png
@@ -406,14 +406,20 @@ module ApplicationHelper
     if profile.image
       profile.image.public_filename( size )
     else
-      if profile.organization?
-        if profile.kind_of?(Community)
-          '/images/icons-app/users_size-'+ size.to_s() +'.png'
+      icon =
+        if profile.organization?
+          if profile.kind_of?(Community)
+            '/images/icons-app/community-'+ size.to_s() +'.png'
+          else
+            '/images/icons-app/enterprise-'+ size.to_s() +'.png'
+          end
         else
-          '/images/icons-app/enterprise-default-pic-'+ size.to_s() +'.png'
+          '/images/icons-app/person-'+ size.to_s() +'.png'
         end
+      if File.exists?(File.join(Rails.root, 'public', theme_path, icon))
+        theme_path + icon
       else
-        '/images/icons-app/user_icon_size-'+ size.to_s() +'.png'
+        icon
       end
     end
  
@@ -44,7 +44,7 @@ class Comment &lt; ActiveRecord::Base
   end
  
   def removed_user_image
-    '/images/icons-app/user_icon_size-minor.png'
+    '/images/icons-app/person-minor.png'
   end
  
   def anchor
@@ -209,4 +209,9 @@ class CommentTest &lt; Test::Unit::TestCase
     assert_no_match /[<>]/, comment.name
   end
  
+  should 'use an existing image for deleted comments' do
+    image = Comment.new.removed_user_image
+    assert File.exists?(File.join(Rails.root, 'public', image)), "#{image} does not exist."
+  end
+
 end
...	...	@@ -406,14 +406,20 @@ module ApplicationHelper
406	406	if profile.image
407	407	profile.image.public_filename( size )
408	408	else
409		- if profile.organization?
410		- if profile.kind_of?(Community)
411		- '/images/icons-app/users_size-'+ size.to_s() +'.png'
	409	+ icon =
	410	+ if profile.organization?
	411	+ if profile.kind_of?(Community)
	412	+ '/images/icons-app/community-'+ size.to_s() +'.png'
	413	+ else
	414	+ '/images/icons-app/enterprise-'+ size.to_s() +'.png'
	415	+ end
412	416	else
413		- '/images/icons-app/enterprise-default-pic-'+ size.to_s() +'.png'
	417	+ '/images/icons-app/person-'+ size.to_s() +'.png'
414	418	end
	419	+ if File.exists?(File.join(Rails.root, 'public', theme_path, icon))
	420	+ theme_path + icon
415	421	else
416		- '/images/icons-app/user_icon_size-'+ size.to_s() +'.png'
	422	+ icon
417	423	end
418	424	end
419	425
...	...
...	...	@@ -44,7 +44,7 @@ class Comment < ActiveRecord::Base
44	44	end
45	45
46	46	def removed_user_image
47		- '/images/icons-app/user_icon_size-minor.png'
	47	+ '/images/icons-app/person-minor.png'
48	48	end
49	49
50	50	def anchor
...	...
...	...	@@ -209,4 +209,9 @@ class CommentTest < Test::Unit::TestCase
209	209	assert_no_match /[<>]/, comment.name
210	210	end
211	211
	212	+ should 'use an existing image for deleted comments' do
	213	+ image = Comment.new.removed_user_image
	214	+ assert File.exists?(File.join(Rails.root, 'public', image)), "#{image} does not exist."
	215	+ end
	216	+
212	217	end
...	...