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

rebased and consolidated logic"

Browse source
This commit is contained in:
Maxwell Salzberg 2011-09-30 15:30:46 -07:00
parent 429ac42502
commit 412fe1b027
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/views/aspects/_aspect_stream.haml
View file

@ -20,15 +20,8 @@
= render 'aspects/no_contacts_message'
#main_stream.stream{:data => {:guids => stream.aspect_ids.join(',')}}
<<<<<<< HEAD
- if stream.ajax_stream?
=======
- if stream.ajax_posts?
>>>>>>> added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer
#pagination
=link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
- elsif stream.posts.length > 0
= render 'shared/stream', :posts => stream.posts
#pagination
=link_to(t('more'), next_page_path, :class => 'paginate')
#pagination
=link_to(t('more'), next_page_path(:ajax_stream => stream.ajax_stream?, :class => 'paginate')