Merge remote branch 'ticho/followed-tag-listing-separate-file'

This commit is contained in:
Raphael Sofaer 2011-07-28 12:33:14 -07:00
commit 192ae3a52b
2 changed files with 19 additions and 14 deletions

View file

@ -16,20 +16,7 @@
= render 'aspects/aspect_listings' = render 'aspects/aspect_listings'
.section .section
%ul.left_nav = render 'tags/followed_tags_listings'
%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')
.span-13.append-1 .span-13.append-1
#aspect_stream_container.stream_container #aspect_stream_container.stream_container

View file

@ -0,0 +1,18 @@
-# Copyright (c) 2011, 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')