From 2dd09cfaa2ec868d7c0d4b4f17e9a4a5f747ce47 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Tue, 26 Jul 2011 18:30:09 +0200
Subject: [PATCH 1/2] Updated to fit current upstream master

---
 app/views/aspects/index.html.haml           | 15 +--------------
 app/views/tags/_followed_tags_listings.haml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 app/views/tags/_followed_tags_listings.haml

diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 5014a8ba3..814beeb1c 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -16,20 +16,7 @@
     = render 'aspects/aspect_listings'
 
   .section
-    %ul.left_nav
-      %li
-        %div.root_element
-          = t('aspects.index.tags_following')
-
-        %ul.sub_nav
-          - if tags.size > 0
-            - for tg in tags
-              %li
-                = link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector"
-          - else
-            %li
-              %span.new_aspect
-                = t('aspects.index.no_tags')
+    = render 'tags/followed_tags_listings'
 
 .span-13.append-1
   #aspect_stream_container.stream_container
diff --git a/app/views/tags/_followed_tags_listings.haml b/app/views/tags/_followed_tags_listings.haml
new file mode 100644
index 000000000..5f21d80f4
--- /dev/null
+++ b/app/views/tags/_followed_tags_listings.haml
@@ -0,0 +1,18 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+%ul.left_nav
+  %li
+    %div.root_element
+      = t('aspects.index.tags_following')
+
+    %ul.sub_nav
+      - if current_user.followed_tags.size > 0
+        - for tg in current_user.followed_tags
+          %li
+            =link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector"
+      - else
+        %li
+          %span.new_aspect
+            = t('aspects.index.no_tags')

From 77a654ef47b6224d3fa7ec6bc87899d20a9f8ee9 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Tue, 26 Jul 2011 18:32:25 +0200
Subject: [PATCH 2/2] Updated copyright year in new file

---
 app/views/tags/_followed_tags_listings.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/tags/_followed_tags_listings.haml b/app/views/tags/_followed_tags_listings.haml
index 5f21d80f4..ec5c2a5d6 100644
--- a/app/views/tags/_followed_tags_listings.haml
+++ b/app/views/tags/_followed_tags_listings.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   Copyright (c) 2011, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.