remove @backbone reference in people/show (thx @mrZYX for the catch); added loaders to people and tag pages
This commit is contained in:
parent
014d5a1724
commit
ff71bc5a44
3 changed files with 8 additions and 16 deletions
|
|
@ -15,5 +15,4 @@
|
||||||
#paginate
|
#paginate
|
||||||
|
|
||||||
- if current_user.contacts.size < 2
|
- if current_user.contacts.size < 2
|
||||||
= render 'aspects/no_contacts_message'
|
= render 'aspects/no_contacts_message'
|
||||||
|
|
||||||
|
|
@ -28,18 +28,9 @@
|
||||||
.stream_container
|
.stream_container
|
||||||
= render 'people/sub_header', :person => @person, :contact => @contact
|
= render 'people/sub_header', :person => @person, :contact => @contact
|
||||||
|
|
||||||
/ hackity hack until we get a photo stream
|
#main_stream.stream
|
||||||
- if @backbone && (@posts && @posts.length > 0) || (@stream && @stream.stream_posts.length > 0)
|
- if @block.present?
|
||||||
-if @post_type == :photos
|
|
||||||
= render 'photos/index', :photos => @posts
|
|
||||||
- else
|
|
||||||
#main_stream.stream
|
|
||||||
|
|
||||||
- else
|
|
||||||
#main_stream
|
|
||||||
%div{:style=>"text-align:center;", :class => "dull"}
|
%div{:style=>"text-align:center;", :class => "dull"}
|
||||||
- if @block.present?
|
= t('.ignoring', :name => @person.first_name)
|
||||||
= t('.ignoring', :name => @person.first_name)
|
|
||||||
- else
|
#paginate
|
||||||
= t('.has_not_shared_with_you_yet', :name => @person.first_name)
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -68,3 +68,5 @@
|
||||||
|
|
||||||
#main_stream.stream
|
#main_stream.stream
|
||||||
|
|
||||||
|
#paginate
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue