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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
ilya 2010-08-24 15:24:18 -07:00
commit 1aef262165
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/groups/index.html.haml
View file

@ -6,7 +6,7 @@
%ul#stream %ul#stream
- for post in @posts - for post in @posts
= render type_partial(post), :post => post = render type_partial(post), :post => post unless post.class == Album
#pagination #pagination
= will_paginate @posts = will_paginate @posts

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

@ -8,7 +8,10 @@
= link_to post.album.name, object_path(post.album) = link_to post.album.name, object_path(post.album)
%br %br
= link_to (image_tag post.url(:thumb_large)), object_path(post)
= render "albums/album", :post => post.album
= link_to (image_tag post.url(:thumb_medium)), object_path(post)
%div.time %div.time
= link_to(how_long_ago(post), photo_path(post)) = link_to(how_long_ago(post), photo_path(post))