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

stream using data-guid for messages. view fix in photo show

Browse source
This commit is contained in:
danielvincent 2010-10-20 13:47:16 -07:00
parent 675ebde5e6
commit d3d7131c8d
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/js/_websocket_js.haml
View file

@ -37,7 +37,7 @@
}); });
function processRetraction(post_id){ function processRetraction(post_id){
$('#' + post_id ).fadeOut(500).remove(); $("*[data-guid='"+post_id+"']").fadeOut(400, function(){$(this).remove()});
if($("#stream")[0].childElementCount == 0){ if($("#stream")[0].childElementCount == 0){
$("#no_posts").fadeIn(200); $("#no_posts").fadeIn(200);
} }

4
app/views/photos/_photo.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.message{:id => post.id} %li.message{:data=>{:guid=>post.id}}
= person_image_tag(post.person) = person_image_tag(post.person)
@ -20,7 +20,7 @@
- if current_user.owns?(post) - if current_user.owns?(post)
.right .right
= link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete" = link_to t('.delete'), photo_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
=t('.posted_a_new_photo_to') =t('.posted_a_new_photo_to')
= link_to post.album.name, object_path(post.album) = link_to post.album.name, object_path(post.album)

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

@ -76,9 +76,13 @@
%div{:id => @photo.id} %div{:id => @photo.id}
#show_photo #show_photo
.edit_pane
.controls{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}} -if current_user.owns? @photo
= link_to 'make profile photo', '#', :class => "make_profile_photo" .edit_pane
.controls{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}}
= link_to 'make profile photo', '#', :class => "make_profile_photo"
= linked_scaled_photo @photo, @album
-else
= linked_scaled_photo @photo, @album = linked_scaled_photo @photo, @album
.caption .caption
-if current_user.owns? @photo -if current_user.owns? @photo

2
app/views/status_messages/_status_message.html.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} %li.message{ :data=>{:guid=>post.id}, :class => ("mine" if current_user.owns?(post))}
= person_image_link(post.person) = person_image_link(post.person)