From de04e717c0cb1ac536bbfaa160eff758c3c9aa64 Mon Sep 17 00:00:00 2001 From: maxwell Date: Fri, 22 Oct 2010 16:57:01 -0700 Subject: [PATCH] made image or default to help with hcard parsing, deleted old default user picture --- app/helpers/application_helper.rb | 8 ++++++-- app/views/publics/hcard.erb | 6 +----- public/images/user/default.jpg | Bin 7418 -> 0 bytes 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 public/images/user/default.jpg diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4e9f94c24..8851f3c8e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -57,11 +57,15 @@ module ApplicationHelper end def person_image_tag(person) + image_tag image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id + end + + def image_or_default(person) image_location = person.profile.image_url image_location ||= "/images/user/default.png" - - image_tag image_location, :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id + image_location end + def person_image_link(person) link_to person_image_tag(person), object_path(person) diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb index 6b8ab3209..5102897a5 100644 --- a/app/views/publics/hcard.erb +++ b/app/views/publics/hcard.erb @@ -36,13 +36,9 @@
Photo
- +
-
-
Note
-
Diaspora is awesome! vi is better than emacs!
-
diff --git a/public/images/user/default.jpg b/public/images/user/default.jpg deleted file mode 100644 index b242c1e1c3ce1c06b7452a2fc93f74c05dea1950..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7418 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