diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-28 04:19:47 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-28 04:19:47 +0400 |
| commit | 6406de89eebf53384d65230c75fe62e06dbd2b3b (patch) | |
| tree | 140d84593b44eb3de5aaf296a95a43ff0af2656e /app | |
| parent | 99751af5a86d14b96cfb3d892866b778a27a38a1 (diff) | |
| parent | cb0124f48ef2c088602033fd25b5c9f07f7b5cc5 (diff) | |
Merge remote branch 'gandaro/1602-delete-profile-photo'
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/photos/show.html.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index d71b1f6bf..296f6fbb5 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -48,18 +48,19 @@ .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') + #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 = p.submit t('.update_photo') - %p - = button_to t('.delete_photo'), photo, :confirm => t('are_you_sure'), :method => :delete + %p + = button_to t('.delete_photo'), photo, :confirm => t('are_you_sure'), :method => :delete .span-16.prepend-4.append-4.last #photo_stream.stream.show |