Merge branch 'stable'

Joenio Costa
2 parents 64a617d5 7ea323e4
Showing 20 changed files with 97 additions and 55 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/public/profile_controller.rb
app/models/person.rb
app/models/profile.rb
app/models/tags_block.rb
app/views/content_viewer/view_page.rhtml
app/views/profile/content_tagged.rhtml
app/views/profile/index.rhtml
app/views/profile/tag.rhtml
app/views/profile/tags.rhtml
config/routes.rb
features/tags.feature
lib/noosfero.rb
public/designs/themes/base/style.css
public/stylesheets/application.css
test/functional/content_viewer_controller_test.rb
test/functional/profile_controller_test.rb
test/integration/routing_test.rb
test/unit/tags_block_test.rb
@@ -232,6 +232,7 @@ class CmsController &lt; MyProfileController
         end
       end
       if @failed.blank?
+        flash[:notice] = _("Your publish request was sent successfully")
         redirect_back
       end
     end
@@ -29,7 +29,7 @@ class MembershipsController &lt; MyProfileController
     @community = Community.find(params[:id])
     if request.post?
       if @community.destroy
-        flash[:notice] = _('%s was destroyed!') % @community.short_name
+        flash[:notice] = _('%s was removed.') % @community.short_name
         redirect_to :action => 'index'
       end
     end
@@ -21,7 +21,7 @@ class ProfileController &lt; PublicController
     end
   end
-  def tag
+  def content_tagged
     @tag = params[:id]
     @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key, true)
@@ -37,7 +37,7 @@ class ProfileController &lt; PublicController
       tagged,
       :title => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
       :description => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
-      :link => url_for(:action => 'tag')
+      :link => url_for(:action => 'tags')
     )
     render :text => data, :content_type => "text/xml"
   end
@@ -270,20 +270,20 @@ class Person &lt; Profile
   def communities_cache_key(params = {})
     page = params[:npage] || '1'
-    identifier + '-communities-page-' + page
+    cache_key + '-communities-page-' + page
   end
   def friends_cache_key(params = {})
     page = params[:npage] || '1'
-    identifier + '-friends-page-' + page
+    cache_key + '-friends-page-' + page
   end
   def manage_friends_cache_key(params = {})
     page = params[:npage] || '1'
-    identifier + '-manage-friends-page-' + page
+    cache_key + '-manage-friends-page-' + page
   end
   def relationships_cache_key
-    identifier + '-profile-relationships'
+    cache_key + '-profile-relationships'
   end
 end
@@ -679,7 +679,7 @@ private :generate_url, :url_options
   def members_cache_key(params = {})
     page = params[:npage] || '1'
-    identifier + '-members-page-' + page
+    cache_key + '-members-page-' + page
   end
   protected
@@ -32,7 +32,7 @@ class TagsBlock &lt; Block
     block_title(title) +
     "\n<div class='tag_cloud'>\n"+
     tag_cloud( tags, :id,
-               owner.public_profile_url.merge(:controller => 'profile', :action => 'tag'),
+               owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'),
                :max_size => 16, :min_size => 9 ) +
     "\n</div><!-- end class='tag_cloud' -->\n";
   end
@@ -66,7 +66,7 @@
 <% if !@page.tags.empty? %>
   <div id="article-tags">
     <%= _("This article's tags:") %>
-    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tag', :id => t.name ) }.join("\n") %>
+    <%= @page.tags.map { |t| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
   </div>
 <% end %>
@@ -0,0 +1,23 @@
+<% add_rss_feed_to_head(_("%s's contents tagged with \"%s\"") % [profile.name, @tag], tag_feed_path) %>
+
+<h1><%= _('Content tagged with "%s"') % @tag %></h1>
+
+<p>
+<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
+</p>
+
+<% cache_timeout(@tag_cache_key, 4.hour.from_now) do %>
+  <div class='search-tagged-items'>
+    <ul>
+    <% for doc in @tagged %>
+      <li><%= link_to doc.title, doc.url %></li>
+    <% end %>
+    </ul>
+  </div>
+
+  <%= pagination_links @tagged, :param_name => 'npage' %>
+
+  <div>
+    <%= link_to _('See content tagged with "%s" in the entire site') % @tag, :controller => 'search', :action => 'tag', :tag => @tag %>
+  </div>
+<% end %>
@@ -4,19 +4,19 @@
 <% if @action %>
   <%= render :partial => 'private_profile' %>
-<% end %>
-
-<% if !@action %>
-  <div class='public-profile-description'>
-    <%= profile.description %>
-  </div>
+<% else %>
+  <% unless profile.description.blank? %>
+    <div class='public-profile-description'>
+      <%= profile.description %>
+    </div>
+  <% end %>
 <% end %>
 <table class='profile'>
   <%= render :partial => partial_for_class(profile.class) %>
   <% unless @action %>
-    <% cache_timeout(profile.identifier + '-profile-general-info', 4.hours.from_now) do %>
+    <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours.from_now) do %>
       <tr>
         <th colspan='2'>
           <%= _('Content') %>
@@ -51,7 +51,7 @@
           <%= _('Tags:') %>
         </td>
         <td>
-          <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
+          <%= tag_cloud @tags, :id, { :action => 'tags' }, :max_size => 18, :min_size => 10%>
         </td>
       </tr>
@@ -1,23 +0,0 @@
-<% add_rss_feed_to_head(_("%s's contents tagged with \"%s\"") % [profile.name, @tag], tag_feed_path) %>
-
-<h1><%= _('Content tagged with "%s"') % @tag %></h1>
-
-<p>
-<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
-</p>
-
-<% cache_timeout(@tag_cache_key, 4.hour.from_now) do %>
-  <div class='search-tagged-items'>
-    <ul>
-    <% for doc in @tagged %>
-      <li><%= link_to doc.title, doc.url %></li>
-    <% end %>
-    </ul>
-  </div>
-
-  <%= pagination_links @tagged, :param_name => 'npage' %>
-
-  <div>
-    <%= link_to _('See content tagged with "%s" in the entire site') % @tag, :controller => 'search', :action => 'tag', :tag => @tag %>
-  </div>
-<% end %>
@@ -2,6 +2,6 @@
 <div class='tag_cloud'>
 <% cache_timeout(@tags_cache_key, 4.hour.from_now) do %>
-  <%= tag_cloud @tags, :id, { :action => :tag}, {:show_count => true} %>
+  <%= tag_cloud @tags, :id, { :action => :tags }, {:show_count => true} %>
 <% end %>
 </div>
@@ -66,7 +66,11 @@ ActionController::Routing::Routes.draw do |map|
   map.invite 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
   # feeds per tag
-  map.tag_feed 'profile/:profile/tag/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.*/, :profile => /#{Noosfero.identifier_format}/
+  map.tag_feed 'profile/:profile/tags/:id/feed', :controller => 'profile', :action =>'tag_feed', :id => /.+/, :profile => /#{Noosfero.identifier_format}/
+
+  # profile tags
+  map.tag 'profile/:profile/tags/:id', :controller => 'profile', :action => 'content_tagged', :id => /.+/, :profile => /#{Noosfero.identifier_format}/
+  map.tag 'profile/:profile/tags', :controller => 'profile', :action => 'tags', :profile => /#{Noosfero.identifier_format}/
   # public profile information
   map.profile 'profile/:profile/:action/:id', :controller => 'profile', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format}/
@@ -31,3 +31,12 @@ Feature: tags
     And I follow "whales"
     Then I should see "save the whales"
     And I should not see "the Amazon is being destroyed"
+
+  Scenario: viewing profile's tag cloud
+    When I go to /profile/joaoaraujo/tags
+    Then I should see "amazon"
+    And I should not see "whales"
+
+  Scenario: viewing profile's content tagged
+    When I go to /profile/joaoaraujo/tags/amazon
+    Then I should see "the Amazon is being destroyed"
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.24.0'
+  VERSION = '0.24.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -3,6 +3,7 @@
 .button {
   -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
 }
 #content input.button, #content a.button {
@@ -112,6 +113,7 @@ body, th, td, input {
   width: 160px;
   border: 1px solid #BBB;
   -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
   color: #CCC;
 }
 #user form.focused input {
@@ -555,11 +557,14 @@ div#notice {
   background-color: #EEE;
   background-position: 4px 50%;
   -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
 }
 #content .link-list-block li a.link-this-page {
   -moz-border-radius-topright: 0px;
   -moz-border-radius-bottomright: 0px;
+  -webkit-border-radius-topright: 0px;
+  -webkit-border-radius-bottomright: 0px;
   background-color: #cecece;
   max-width: 175px;
   width: 200px;
@@ -786,6 +791,7 @@ X.sep {
 .controller-search #content .search_form {
   background: #DDD;
   -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
   padding: 12px 15px 13px 15px;
   position: relative;
   text-align: left;
@@ -813,6 +819,7 @@ X.sep {
 .controller-search .search-options {
   border: 1px solid #777;
   -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
 }
 .controller-search .search-options ul li {
   position: relative;
@@ -962,6 +969,7 @@ hr.pre-posts, hr.sep-posts {
   text-decoration: none;
   padding: 0px 2px;
   -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
   background: #BBB;
   color: #FFF;
 }
@@ -984,6 +992,7 @@ hr.pre-posts, hr.sep-posts {
 .post_comment_box.closed h4 {
   -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
 }
 .post_comment_box.opened h4 {
@@ -1119,6 +1128,7 @@ hr.pre-posts, hr.sep-posts {
 .common-profile-list-block .vcard a:hover {
   border: 1px solid #CCC;
   -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
   background: #EEE;
   text-decoration: none;
 }
@@ -1137,6 +1147,7 @@ table.profile th {
   background-color: #FFF;
   border: 1px solid #EEE;
   -moz-border-radius: 9px;
+  -webkit-border-radius: 9px;
   margin-bottom: 10px;
 }
@@ -1149,6 +1160,7 @@ table.profile th {
   border: 1px solid  #CCC;
   background-color: #EEE;
   -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
 }
 /************************** Control Panel ****************************/
@@ -132,6 +132,7 @@ div#notice {
   background-color: #000;
   color: white;
   -moz-border-radius: 15px;
+  -webkit-border-radius: 15px;
   font-size: 16px;
   font-weight: bold;
   z-index: 100000;
@@ -454,6 +455,7 @@ div.pending-tasks {
 #content #not-found,
 #content #access-denied {
   -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
 }
 #content #not-found p,
@@ -3100,6 +3102,7 @@ h1#agenda-title {
 .controller-profile_editor .control-panel a:hover {
   background-color: #d2e0f0;
   -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
 }
 .controller-profile_editor a.control-panel-groups { background-image: url(../images/control-panel/system-users.png) }
@@ -251,11 +251,11 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
     assert_tag :tag => 'div', :attributes => { :id => 'article-tags' }, :descendant => {
       :tag => 'a',
-      :attributes => { :href => "/profile/#{profile.identifier}/tag/tag1" }
+      :attributes => { :href => "/profile/#{profile.identifier}/tags/tag1" }
     }
     assert_tag :tag => 'div', :attributes => { :id => 'article-tags' }, :descendant => {
       :tag => 'a',
-      :attributes => { :href => "/profile/#{profile.identifier}/tag/tag2" }
+      :attributes => { :href => "/profile/#{profile.identifier}/tags/tag2" }
     }
     assert_tag :tag => 'div', :attributes => { :id => 'article-tags' }, :descendant => { :content => /This article's tags:/ }
@@ -142,13 +142,13 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
   should 'display tag for profile' do
     @profile.articles.create!(:name => 'testarticle', :tag_list => 'tag1')
-    get :tag, :profile => @profile.identifier, :id => 'tag1'
+    get :content_tagged, :profile => @profile.identifier, :id => 'tag1'
     assert_tag :tag => 'a', :attributes => { :href => /testuser\/testarticle$/ }
   end
   should 'link to the same tag but for whole environment' do
     @profile.articles.create!(:name => 'testarticle', :tag_list => 'tag1')
-    get :tag, :profile => @profile.identifier, :id => 'tag1'
+    get :content_tagged, :profile => @profile.identifier, :id => 'tag1'
     assert_tag :tag => 'a', :attributes => { :href => '/tag/tag1' }, :content => 'See content tagged with "tag1" in the entire site'
   end
@@ -311,8 +311,8 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     Person.any_instance.stubs(:article_tags).returns({ 'one' => 1, 'two' => 2})
     get :tags, :profile => 'testuser'
-    assert_tag :tag => 'div', :attributes => { :class => /main-block/ }, :descendant => { :tag => 'a', :attributes => { :href => '/profile/testuser/tag/one'} }
-    assert_tag :tag => 'div', :attributes => { :class => /main-block/ }, :descendant => { :tag => 'a', :attributes => { :href => '/profile/testuser/tag/two'} }
+    assert_tag :tag => 'div', :attributes => { :class => /main-block/ }, :descendant => { :tag => 'a', :attributes => { :href => '/profile/testuser/tags/one'} }
+    assert_tag :tag => 'div', :attributes => { :class => /main-block/ }, :descendant => { :tag => 'a', :attributes => { :href => '/profile/testuser/tags/two'} }
   end
   should 'show e-mail for friends on profile page' do
@@ -683,6 +683,19 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Person\'s description/
   end
+  should 'not show description of orgarnization if not filled' do
+    login_as(@profile.identifier)
+    ent = fast_create(Enterprise)
+    get :index, :profile => ent.identifier
+    assert_no_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }
+  end
+
+  should 'not show description of person if not filled' do
+    login_as(@profile.identifier)
+    get :index, :profile => @profile.identifier
+    assert_no_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }
+  end
+
   should 'ask for login if user not logged' do
     enterprise = fast_create(Enterprise)
     get :unblock, :profile => enterprise.identifier
@@ -119,7 +119,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
   end
   def test_profile_route_for_tags_with_dot
-    assert_routing('/profile/ze/tag/tag.withdot', :controller => 'profile', :profile => 'ze', :action => 'tag', :id => 'tag.withdot')
+    assert_routing('/profile/ze/tags/tag.withdot', :controller => 'profile', :profile => 'ze', :action => 'content_tagged', :id => 'tag.withdot')
   end
   def test_profile_with_tilde_routing
@@ -22,9 +22,9 @@ class TagsBlockTest &lt; Test::Unit::TestCase
   end
   should 'generate links to tags' do
-    assert_match /profile\/testinguser\/tag\/first-tag/, block.content
-    assert_match /profile\/testinguser\/tag\/second-tag/, block.content
-    assert_match /profile\/testinguser\/tag\/third-tag/, block.content
+    assert_match /profile\/testinguser\/tags\/first-tag/, block.content
+    assert_match /profile\/testinguser\/tags\/second-tag/, block.content
+    assert_match /profile\/testinguser\/tags\/third-tag/, block.content
   end
   should 'return (none) when no tags to display' do
@@ -34,7 +34,7 @@ class TagsBlockTest &lt; Test::Unit::TestCase
   should 'generate links when profile has own hostname' do
     @user.domains << Domain.new(:name => 'testuser.net'); @user.save!
-    assert_match /profile\/testinguser\/tag\/first-tag/, block.content
+    assert_match /profile\/testinguser\/tags\/first-tag/, block.content
   end
 end
	@@ -29,7 +29,7 @@ class MembershipsController < MyProfileController		@@ -29,7 +29,7 @@ class MembershipsController < MyProfileController
29	@community = Community.find(params[:id])	29	@community = Community.find(params[:id])
30	if request.post?	30	if request.post?
31	if @community.destroy	31	if @community.destroy
32	- flash[:notice] = _('%s was destroyed!') % @community.short_name	32	+ flash[:notice] = _('%s was removed.') % @community.short_name
33	redirect_to :action => 'index'	33	redirect_to :action => 'index'
34	end	34	end
35	end	35	end
	@@ -21,7 +21,7 @@ class ProfileController < PublicController		@@ -21,7 +21,7 @@ class ProfileController < PublicController
21	end	21	end
22	end	22	end
23		23
24	- def tag	24	+ def content_tagged
25	@tag = params[:id]	25	@tag = params[:id]
26	@tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"	26	@tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"
27	if is_cache_expired?(@tag_cache_key, true)	27	if is_cache_expired?(@tag_cache_key, true)
	@@ -37,7 +37,7 @@ class ProfileController < PublicController		@@ -37,7 +37,7 @@ class ProfileController < PublicController
37	tagged,	37	tagged,
38	:title => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],	38	:title => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
39	:description => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],	39	:description => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
40	- :link => url_for(:action => 'tag')	40	+ :link => url_for(:action => 'tags')
41	)	41	)
42	render :text => data, :content_type => "text/xml"	42	render :text => data, :content_type => "text/xml"
43	end	43	end
	@@ -270,20 +270,20 @@ class Person < Profile		@@ -270,20 +270,20 @@ class Person < Profile
270		270
271	def communities_cache_key(params = {})	271	def communities_cache_key(params = {})
272	page = params[:npage] \|\| '1'	272	page = params[:npage] \|\| '1'
273	- identifier + '-communities-page-' + page	273	+ cache_key + '-communities-page-' + page
274	end	274	end
275		275
276	def friends_cache_key(params = {})	276	def friends_cache_key(params = {})
277	page = params[:npage] \|\| '1'	277	page = params[:npage] \|\| '1'
278	- identifier + '-friends-page-' + page	278	+ cache_key + '-friends-page-' + page
279	end	279	end
280		280
281	def manage_friends_cache_key(params = {})	281	def manage_friends_cache_key(params = {})
282	page = params[:npage] \|\| '1'	282	page = params[:npage] \|\| '1'
283	- identifier + '-manage-friends-page-' + page	283	+ cache_key + '-manage-friends-page-' + page
284	end	284	end
285		285
286	def relationships_cache_key	286	def relationships_cache_key
287	- identifier + '-profile-relationships'	287	+ cache_key + '-profile-relationships'
288	end	288	end
289	end	289	end
	@@ -679,7 +679,7 @@ private :generate_url, :url_options		@@ -679,7 +679,7 @@ private :generate_url, :url_options
679		679
680	def members_cache_key(params = {})	680	def members_cache_key(params = {})
681	page = params[:npage] \|\| '1'	681	page = params[:npage] \|\| '1'
682	- identifier + '-members-page-' + page	682	+ cache_key + '-members-page-' + page
683	end	683	end
684		684
685	protected	685	protected
	@@ -32,7 +32,7 @@ class TagsBlock < Block		@@ -32,7 +32,7 @@ class TagsBlock < Block
32	block_title(title) +	32	block_title(title) +
33	"\n<div class='tag_cloud'>\n"+	33	"\n<div class='tag_cloud'>\n"+
34	tag_cloud( tags, :id,	34	tag_cloud( tags, :id,
35	- owner.public_profile_url.merge(:controller => 'profile', :action => 'tag'),	35	+ owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'),
36	:max_size => 16, :min_size => 9 ) +	36	:max_size => 16, :min_size => 9 ) +
37	"\n</div><!-- end class='tag_cloud' -->\n";	37	"\n</div><!-- end class='tag_cloud' -->\n";
38	end	38	end
	@@ -66,7 +66,7 @@		@@ -66,7 +66,7 @@
66	<% if !@page.tags.empty? %>	66	<% if !@page.tags.empty? %>
67	<div id="article-tags">	67	<div id="article-tags">
68	<%= _("This article's tags:") %>	68	<%= _("This article's tags:") %>
69	- <%= @page.tags.map { \|t\| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tag', :id => t.name ) }.join("\n") %>	69	+ <%= @page.tags.map { \|t\| link_to(t, :controller => 'profile', :profile => @profile.identifier, :action => 'tags', :id => t.name ) }.join("\n") %>
70	</div>	70	</div>
71	<% end %>	71	<% end %>
72		72
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+<% add_rss_feed_to_head(_("%s's contents tagged with \"%s\"") % [profile.name, @tag], tag_feed_path) %>
	2	+
	3	+<h1><%= _('Content tagged with "%s"') % @tag %></h1>
	4	+
	5	+<p>
	6	+<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
	7	+</p>
	8	+
	9	+<% cache_timeout(@tag_cache_key, 4.hour.from_now) do %>
	10	+ <div class='search-tagged-items'>
	11	+ <ul>
	12	+ <% for doc in @tagged %>
	13	+ <li><%= link_to doc.title, doc.url %></li>
	14	+ <% end %>
	15	+ </ul>
	16	+ </div>
	17	+
	18	+ <%= pagination_links @tagged, :param_name => 'npage' %>
	19	+
	20	+ <div>
	21	+ <%= link_to _('See content tagged with "%s" in the entire site') % @tag, :controller => 'search', :action => 'tag', :tag => @tag %>
	22	+ </div>
	23	+<% end %>
	@@ -1,23 +0,0 @@	@@ -1,23 +0,0 @@
1	-<% add_rss_feed_to_head(_("%s's contents tagged with \"%s\"") % [profile.name, @tag], tag_feed_path) %>
2	-
3	-<h1><%= _('Content tagged with "%s"') % @tag %></h1>
4	-
5	-<p>
6	-<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
7	-</p>
8	-
9	-<% cache_timeout(@tag_cache_key, 4.hour.from_now) do %>
10	- <div class='search-tagged-items'>
11	- <ul>
12	- <% for doc in @tagged %>
13	- <li><%= link_to doc.title, doc.url %></li>
14	- <% end %>
15	- </ul>
16	- </div>
17	-
18	- <%= pagination_links @tagged, :param_name => 'npage' %>
19	-
20	- <div>
21	- <%= link_to _('See content tagged with "%s" in the entire site') % @tag, :controller => 'search', :action => 'tag', :tag => @tag %>
22	- </div>
23	-<% end %>
	@@ -2,6 +2,6 @@		@@ -2,6 +2,6 @@
2		2
3	<div class='tag_cloud'>	3	<div class='tag_cloud'>
4	<% cache_timeout(@tags_cache_key, 4.hour.from_now) do %>	4	<% cache_timeout(@tags_cache_key, 4.hour.from_now) do %>
5	- <%= tag_cloud @tags, :id, { :action => :tag}, {:show_count => true} %>	5	+ <%= tag_cloud @tags, :id, { :action => :tags }, {:show_count => true} %>
6	<% end %>	6	<% end %>
7	</div>	7	</div>
	@@ -31,3 +31,12 @@ Feature: tags		@@ -31,3 +31,12 @@ Feature: tags
31	And I follow "whales"	31	And I follow "whales"
32	Then I should see "save the whales"	32	Then I should see "save the whales"
33	And I should not see "the Amazon is being destroyed"	33	And I should not see "the Amazon is being destroyed"
		34	+
		35	+ Scenario: viewing profile's tag cloud
		36	+ When I go to /profile/joaoaraujo/tags
		37	+ Then I should see "amazon"
		38	+ And I should not see "whales"
		39	+
		40	+ Scenario: viewing profile's content tagged
		41	+ When I go to /profile/joaoaraujo/tags/amazon
		42	+ Then I should see "the Amazon is being destroyed"