Merge remote branch 'gandaro/1602-delete-profile-photo'

This commit is contained in:
Raphael Sofaer 2011-07-27 17:19:47 -07:00
commit 6406de89ee

View file

@ -48,12 +48,13 @@
.span-7.prepend-1
.show_photo_attachments
- for photo in additional_photos
= link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo_path(photo)
- for _photo in additional_photos
= link_to (image_tag _photo.url(:thumb_small), :class => 'thumb_small'), photo_path(_photo)
#photo_edit_options
%h4= t('.edit_delete_photo')
- if photo.status_message
%p
= form_for photo, :remote => true do |p|
= p.text_field :text, :value => photo.text