From 966b65004e85a47af52f76c29866782eccd68ed5 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 12 Aug 2010 19:27:44 -0300 Subject: [PATCH] Allow themes to override profile default images --- app/helpers/application_helper.rb | 16 +++++++++++----- app/models/comment.rb | 2 +- public/images/icons-app/community-big.png | Bin 0 -> 15518 bytes public/images/icons-app/community-minor.png | Bin 0 -> 3992 bytes public/images/icons-app/community-portrait.png | Bin 0 -> 5600 bytes public/images/icons-app/community-thumb.png | Bin 0 -> 10262 bytes public/images/icons-app/enterprise-big.png | Bin 0 -> 25130 bytes public/images/icons-app/enterprise-default-pic-big.png | Bin 25130 -> 0 bytes public/images/icons-app/enterprise-default-pic-minor.png | Bin 5318 -> 0 bytes public/images/icons-app/enterprise-default-pic-portrait.png | Bin 7746 -> 0 bytes public/images/icons-app/enterprise-default-pic-thumb.png | Bin 14380 -> 0 bytes public/images/icons-app/enterprise-minor.png | Bin 0 -> 5318 bytes public/images/icons-app/enterprise-portrait.png | Bin 0 -> 7746 bytes public/images/icons-app/enterprise-thumb.png | Bin 0 -> 14380 bytes public/images/icons-app/person-big.png | Bin 0 -> 9880 bytes public/images/icons-app/person-icon.png | Bin 0 -> 979 bytes public/images/icons-app/person-minor.png | Bin 0 -> 2565 bytes public/images/icons-app/person-portrait.png | Bin 0 -> 3770 bytes public/images/icons-app/person-thumb.png | Bin 0 -> 6053 bytes public/images/icons-app/user_icon_size-big.png | Bin 9880 -> 0 bytes public/images/icons-app/user_icon_size-icon.png | Bin 979 -> 0 bytes public/images/icons-app/user_icon_size-minor.png | Bin 2565 -> 0 bytes public/images/icons-app/user_icon_size-portrait.png | Bin 3770 -> 0 bytes public/images/icons-app/user_icon_size-thumb.png | Bin 6053 -> 0 bytes public/images/icons-app/users_size-big.png | Bin 15518 -> 0 bytes public/images/icons-app/users_size-minor.png | Bin 3992 -> 0 bytes public/images/icons-app/users_size-portrait.png | Bin 5600 -> 0 bytes public/images/icons-app/users_size-thumb.png | Bin 10262 -> 0 bytes test/unit/comment_test.rb | 5 +++++ 29 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 public/images/icons-app/community-big.png create mode 100644 public/images/icons-app/community-minor.png create mode 100644 public/images/icons-app/community-portrait.png create mode 100644 public/images/icons-app/community-thumb.png create mode 100644 public/images/icons-app/enterprise-big.png delete mode 100644 public/images/icons-app/enterprise-default-pic-big.png delete mode 100644 public/images/icons-app/enterprise-default-pic-minor.png delete mode 100644 public/images/icons-app/enterprise-default-pic-portrait.png delete mode 100644 public/images/icons-app/enterprise-default-pic-thumb.png create mode 100644 public/images/icons-app/enterprise-minor.png create mode 100644 public/images/icons-app/enterprise-portrait.png create mode 100644 public/images/icons-app/enterprise-thumb.png create mode 100644 public/images/icons-app/person-big.png create mode 100644 public/images/icons-app/person-icon.png create mode 100644 public/images/icons-app/person-minor.png create mode 100644 public/images/icons-app/person-portrait.png create mode 100644 public/images/icons-app/person-thumb.png delete mode 100644 public/images/icons-app/user_icon_size-big.png delete mode 100644 public/images/icons-app/user_icon_size-icon.png delete mode 100644 public/images/icons-app/user_icon_size-minor.png delete mode 100644 public/images/icons-app/user_icon_size-portrait.png delete mode 100644 public/images/icons-app/user_icon_size-thumb.png delete mode 100644 public/images/icons-app/users_size-big.png delete mode 100644 public/images/icons-app/users_size-minor.png delete mode 100644 public/images/icons-app/users_size-portrait.png delete mode 100644 public/images/icons-app/users_size-thumb.png diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 769111f..b7fa836 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 diff --git a/app/models/comment.rb b/app/models/comment.rb index 10205eb..82c0e53 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -44,7 +44,7 @@ class Comment < ActiveRecord::Base end def removed_user_image - '/images/icons-app/user_icon_size-minor.png' + '/images/icons-app/person-minor.png' end def anchor diff --git a/public/images/icons-app/community-big.png b/public/images/icons-app/community-big.png new file mode 100644 index 0000000..69cf400 Binary files /dev/null and b/public/images/icons-app/community-big.png differ diff --git a/public/images/icons-app/community-minor.png b/public/images/icons-app/community-minor.png new file mode 100644 index 0000000..55d0ab7 Binary files /dev/null and b/public/images/icons-app/community-minor.png differ diff --git a/public/images/icons-app/community-portrait.png b/public/images/icons-app/community-portrait.png new file mode 100644 index 0000000..5a3e30e Binary files /dev/null and b/public/images/icons-app/community-portrait.png differ diff --git a/public/images/icons-app/community-thumb.png b/public/images/icons-app/community-thumb.png new file mode 100644 index 0000000..7e415fe Binary files /dev/null and b/public/images/icons-app/community-thumb.png differ diff --git a/public/images/icons-app/enterprise-big.png b/public/images/icons-app/enterprise-big.png new file mode 100644 index 0000000..551bdb1 Binary files /dev/null and b/public/images/icons-app/enterprise-big.png differ diff --git a/public/images/icons-app/enterprise-default-pic-big.png b/public/images/icons-app/enterprise-default-pic-big.png deleted file mode 100644 index 551bdb1..0000000 Binary files a/public/images/icons-app/enterprise-default-pic-big.png and /dev/null differ diff --git a/public/images/icons-app/enterprise-default-pic-minor.png b/public/images/icons-app/enterprise-default-pic-minor.png deleted file mode 100644 index 1f40c91..0000000 Binary files a/public/images/icons-app/enterprise-default-pic-minor.png and /dev/null differ diff --git a/public/images/icons-app/enterprise-default-pic-portrait.png b/public/images/icons-app/enterprise-default-pic-portrait.png deleted file mode 100644 index 75c9803..0000000 Binary files a/public/images/icons-app/enterprise-default-pic-portrait.png and /dev/null differ diff --git a/public/images/icons-app/enterprise-default-pic-thumb.png b/public/images/icons-app/enterprise-default-pic-thumb.png deleted file mode 100644 index ba3a6f1..0000000 Binary files a/public/images/icons-app/enterprise-default-pic-thumb.png and /dev/null differ diff --git a/public/images/icons-app/enterprise-minor.png b/public/images/icons-app/enterprise-minor.png new file mode 100644 index 0000000..1f40c91 Binary files /dev/null and b/public/images/icons-app/enterprise-minor.png differ diff --git a/public/images/icons-app/enterprise-portrait.png b/public/images/icons-app/enterprise-portrait.png new file mode 100644 index 0000000..75c9803 Binary files /dev/null and b/public/images/icons-app/enterprise-portrait.png differ diff --git a/public/images/icons-app/enterprise-thumb.png b/public/images/icons-app/enterprise-thumb.png new file mode 100644 index 0000000..ba3a6f1 Binary files /dev/null and b/public/images/icons-app/enterprise-thumb.png differ diff --git a/public/images/icons-app/person-big.png b/public/images/icons-app/person-big.png new file mode 100644 index 0000000..cd08c91 Binary files /dev/null and b/public/images/icons-app/person-big.png differ diff --git a/public/images/icons-app/person-icon.png b/public/images/icons-app/person-icon.png new file mode 100644 index 0000000..5af99ca Binary files /dev/null and b/public/images/icons-app/person-icon.png differ diff --git a/public/images/icons-app/person-minor.png b/public/images/icons-app/person-minor.png new file mode 100644 index 0000000..1015f36 Binary files /dev/null and b/public/images/icons-app/person-minor.png differ diff --git a/public/images/icons-app/person-portrait.png b/public/images/icons-app/person-portrait.png new file mode 100644 index 0000000..80e6e60 Binary files /dev/null and b/public/images/icons-app/person-portrait.png differ diff --git a/public/images/icons-app/person-thumb.png b/public/images/icons-app/person-thumb.png new file mode 100644 index 0000000..e8e70c1 Binary files /dev/null and b/public/images/icons-app/person-thumb.png differ diff --git a/public/images/icons-app/user_icon_size-big.png b/public/images/icons-app/user_icon_size-big.png deleted file mode 100644 index cd08c91..0000000 Binary files a/public/images/icons-app/user_icon_size-big.png and /dev/null differ diff --git a/public/images/icons-app/user_icon_size-icon.png b/public/images/icons-app/user_icon_size-icon.png deleted file mode 100644 index 5af99ca..0000000 Binary files a/public/images/icons-app/user_icon_size-icon.png and /dev/null differ diff --git a/public/images/icons-app/user_icon_size-minor.png b/public/images/icons-app/user_icon_size-minor.png deleted file mode 100644 index 1015f36..0000000 Binary files a/public/images/icons-app/user_icon_size-minor.png and /dev/null differ diff --git a/public/images/icons-app/user_icon_size-portrait.png b/public/images/icons-app/user_icon_size-portrait.png deleted file mode 100644 index 80e6e60..0000000 Binary files a/public/images/icons-app/user_icon_size-portrait.png and /dev/null differ diff --git a/public/images/icons-app/user_icon_size-thumb.png b/public/images/icons-app/user_icon_size-thumb.png deleted file mode 100644 index e8e70c1..0000000 Binary files a/public/images/icons-app/user_icon_size-thumb.png and /dev/null differ diff --git a/public/images/icons-app/users_size-big.png b/public/images/icons-app/users_size-big.png deleted file mode 100644 index 69cf400..0000000 Binary files a/public/images/icons-app/users_size-big.png and /dev/null differ diff --git a/public/images/icons-app/users_size-minor.png b/public/images/icons-app/users_size-minor.png deleted file mode 100644 index 55d0ab7..0000000 Binary files a/public/images/icons-app/users_size-minor.png and /dev/null differ diff --git a/public/images/icons-app/users_size-portrait.png b/public/images/icons-app/users_size-portrait.png deleted file mode 100644 index 5a3e30e..0000000 Binary files a/public/images/icons-app/users_size-portrait.png and /dev/null differ diff --git a/public/images/icons-app/users_size-thumb.png b/public/images/icons-app/users_size-thumb.png deleted file mode 100644 index 7e415fe..0000000 Binary files a/public/images/icons-app/users_size-thumb.png and /dev/null differ diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb index 43708a5..97f4558 100644 --- a/test/unit/comment_test.rb +++ b/test/unit/comment_test.rb @@ -209,4 +209,9 @@ class CommentTest < 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 -- libgit2 0.21.2