nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Raphael Sofaer 2011-07-27 17:19:47 -07:00
commit 6406de89ee
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/views/photos/show.html.haml
View file

@ -48,18 +48,19 @@
.span-7.prepend-1 .span-7.prepend-1
.show_photo_attachments .show_photo_attachments
- for photo in additional_photos - for _photo in additional_photos
= link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo_path(photo) = link_to (image_tag _photo.url(:thumb_small), :class => 'thumb_small'), photo_path(_photo)
#photo_edit_options #photo_edit_options
%h4= t('.edit_delete_photo') %h4= t('.edit_delete_photo')
- if photo.status_message
%p %p
= form_for photo, :remote => true do |p| = form_for photo, :remote => true do |p|
= p.text_field :text, :value => photo.text = p.text_field :text, :value => photo.text
= p.submit t('.update_photo') = p.submit t('.update_photo')
%p %p
= button_to t('.delete_photo'), photo, :confirm => t('are_you_sure'), :method => :delete = button_to t('.delete_photo'), photo, :confirm => t('are_you_sure'), :method => :delete
.span-16.prepend-4.append-4.last .span-16.prepend-4.append-4.last
#photo_stream.stream.show #photo_stream.stream.show