From ff71bc5a4458f4fb83a2bbf37076ce1d2a3aa6d7 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Fri, 27 Jan 2012 10:53:03 -0800
Subject: [PATCH] remove @backbone reference in people/show (thx @mrZYX for the
 catch); added loaders to people and tag pages

---
 app/views/aspects/_aspect_stream.haml |  3 +--
 app/views/people/show.html.haml       | 19 +++++--------------
 app/views/tags/show.haml              |  2 ++
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 0ddc45b94..79771a15b 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -15,5 +15,4 @@
 #paginate
 
 - if current_user.contacts.size < 2
-  = render 'aspects/no_contacts_message'
-
+  = render 'aspects/no_contacts_message'
\ No newline at end of file
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 303337bc9..2e97600ab 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -28,18 +28,9 @@
   .stream_container
     = render 'people/sub_header', :person => @person, :contact => @contact
 
-    / hackity hack until we get a photo stream
-    - if @backbone && (@posts && @posts.length > 0) || (@stream && @stream.stream_posts.length > 0)
-      -if @post_type == :photos
-        = render 'photos/index', :photos => @posts
-      - else
-        #main_stream.stream
-
-    - else
-      #main_stream
+    #main_stream.stream
+      - if @block.present?
         %div{:style=>"text-align:center;", :class => "dull"}
-          - if @block.present?
-            = t('.ignoring', :name => @person.first_name)
-          - else
-            = t('.has_not_shared_with_you_yet', :name => @person.first_name)
-
+          = t('.ignoring', :name => @person.first_name)
+          
+    #paginate
diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index 45ecfb7fc..b90eb33ef 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -68,3 +68,5 @@
 
     #main_stream.stream
 
+    #paginate
+