From 77d28b411706a8590accf8a4b33cfe5c422117d6 Mon Sep 17 00:00:00 2001
From: Ilyaaaaaaaaaaaaa Zhitomirskiy <ilya@joindiaspora.com>
Date: Fri, 1 Jul 2011 13:13:59 -0700
Subject: [PATCH] wip following tags

---
 app/views/tags/show.haml      | 27 +++++++++++++++++----------
 features/follows_tags.feature | 12 +++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index ee681076c..2ff385006 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -18,11 +18,24 @@
 - content_for :body_class do
   = "tags_show"
 
-.span-24.last
-  %h1.tag
-    = "##{params[:name]}"
+.span-6
+  %h3
+    = t('people', :count => @people_count)
+
+  .side_stream.stream
+    = render :partial => 'people/index', :locals => {:people => @people}
+
+.span-15.last
+  .stream_container
+    #author_info
+      - if user_signed_in? && current_user.person != @person
+        .right
+          = button_to "Follow ##{params[:name]}", :class => "button"
+      %h2
+        = "##{params[:name]}"
+
+    %hr
 
-.span-13
   #main_stream.stream
     - if @posts.length > 0
       = render 'shared/stream', :posts => @posts
@@ -31,9 +44,3 @@
     - else
       = t('.nobody_talking', :tag => "##{params[:name]}")
 
-.prepend-2.span-9.last
-  %h3
-    = t('people', :count => @people_count)
-
-  .side_stream.stream
-    = render :partial => 'people/index', :locals => {:people => @people}
diff --git a/features/follows_tags.feature b/features/follows_tags.feature
index 07e7ae9b3..9e95fa482 100644
--- a/features/follows_tags.feature
+++ b/features/follows_tags.feature
@@ -8,18 +8,12 @@ Feature: posting
     Given a user with username "bob"
     And a user with username "alice"
     When I sign in as "bob@bob.bob"
-    And I have an aspect called "PostTo"
-    And I have an aspect called "DidntPostTo"
-    And I have user with username "alice" in an aspect called "PostTo"
-    And I have user with username "alice" in an aspect called "DidntPostTo"
-
     And I am on the home page
 
 
   Scenario: see a tag that I am following
-    Given I am on the home page
-    And I expand the publisher
-    And I fill in "status_message_fake_text" with "I am #bob"
+    Given I expand the publisher
+    And I fill in "status_message_fake_text" with "I am ALICE"
     And I press the first ".public_icon" within "#publisher"
     And I press "Share"
     And I go to the destroy user session page
@@ -28,7 +22,7 @@ Feature: posting
     And I search for "#alice"
     And I press "Follow #alice"
     And I go to the home page
-    And I press on "#alice"
+    And I press "#alice"
     Then I should see "I am #alice"