Merge commit 'refs/merge-requests/50' of git://gitorious.org/noosfero/noosfero

Joenio Costa
2 parents 26e7f665 2da2072e
Showing 13 changed files with 291 additions and 8 deletions Show diff stats
app/controllers/public/browse_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/views/browse/_article.rhtml
app/views/browse/_display_results.rhtml
app/views/browse/_person.rhtml
app/views/browse/_profile.rhtml
app/views/browse/contents.rhtml
features/browse.feature
public/designs/themes/base/navigation.rhtml
public/stylesheets/application.css
test/functional/browse_controller_test.rb
test/unit/article_test.rb
@@ -6,6 +6,8 @@ class BrowseController &lt; PublicController
     more_recent
     more_active
     more_popular
+    more_comments
+    more_views
   )
  
   def per_page
@@ -36,6 +38,18 @@ class BrowseController &lt; PublicController
     @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
   end
  
+  def contents
+    @filter = filter
+    @title = self.filter_description(params[:action] + '_' + @filter )
+
+    @results = @environment.articles.published.text_articles.send(@filter)
+
+    if !params[:query].blank?
+      @results = @results.find_by_contents(params[:query])
+    end
+    @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
+  end
+
   protected
  
   def filter
@@ -54,6 +68,9 @@ class BrowseController &lt; PublicController
       'communities_more_recent' => _('More recent communities'),  
       'communities_more_active' => _('More active communities'),  
       'communities_more_popular' => _('More popular communities'),
+      'contents_more_recent' => _('More recent contents'),
+      'contents_more_views' => _('Most viewed contents'),
+      'contents_more_comments' => _('Most commented contents'),
     }[str] || str
   end
  
@@ -1134,6 +1134,17 @@ module ApplicationHelper
     link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
   end
  
+  def browse_contents_menu
+     links = [
+       {s_('contents|More Comments') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_comments'})}},
+       {s_('contents|More Views') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_views'})}},
+       {s_('contents|More Recent') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_recent'})}}
+     ]
+
+    link_to(content_tag(:span, _('Contents'), :class => 'icon-blog'), {:controller => "browse", :action => 'contents'}, :id => 'submenu-contents') +
+    link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
+  end
+
   def pagination_links(collection, options={})
     options = {:prev_label => '&laquo; ' + _('Previous'), :next_label => _('Next') + ' &raquo;'}.merge(options)
     will_paginate(collection, options)
@@ -355,11 +355,20 @@ class Article &lt; ActiveRecord::Base
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
  
+  def self.text_article_types
+    ['TextArticle', 'TextileArticle', 'TinyMceArticle']
+  end
+
   named_scope :published, :conditions => { :published => true }
   named_scope :folders, :conditions => { :type => folder_types}
   named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
+  named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+
+  named_scope :more_comments, :order => "comments_count DESC"
+  named_scope :more_views, :order => "hits DESC"
+  named_scope :more_recent, :order => "created_at DESC"
  
   def self.display_filter(user, profile)
     return {:conditions => ['published = ?', true]} if !user
@@ -528,6 +537,28 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
+  def more_comments_label
+    amount = self.comments_count
+    {
+      0 => _('no comments'),
+      1 => _('one comment')
+    }[amount] || _("%s comments") % amount
+
+  end
+
+  def more_views_label
+    amount = self.hits
+    {
+      0 => _('no views'),
+      1 => _('one view')
+    }[amount] || _("%s views") % amount
+
+  end
+
+  def more_recent_label
+    _('Created at: ')
+  end
+
   private
  
   def sanitize_tag_list
@@ -0,0 +1,11 @@
+<li class="<%= 'browse-results-type-content ' + icon_for_article(result) %>">
+  <strong><%= link_to(result.title, result.view_url) %></strong>
+  <div class="item_meta">
+    <span class="item_by">
+    <%= _('by %s') % link_to(result.author.name, result.author.url) %>
+    </span>
+    <span class="extra-info">
+      <%= (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
+    </span>
+  </div>
+</li>
@@ -8,7 +8,7 @@
     <% end %>
     <ul class='common-profile-list-block'>
       <% @results.each do |result| %>
-        <%= render :partial => partial_for_class(result.class), :locals => {:profile => result} %>
+        <%= render :partial => partial_for_class(result.class), :locals => {:result => result} %>
       <% end %>
     </ul>
     <br style='clear: both;'>
-<%= profile_image_link profile, :portrait, 'li',
-                                "<span class='adr'>#{profile.city}</span>" +
-                                (@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label')) %>
+<%= profile_image_link result, :portrait, 'li',
+                                "<span class='adr'>#{result.city}</span>" +
+                                (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
-<%= profile_image_link profile, :portrait, 'li', @filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label') %>
+<%= profile_image_link result, :portrait, 'li', @filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label') %>
@@ -0,0 +1,9 @@
+<%= search_page_title( @title, { :query => @query} ) %>
+
+<%= render :partial => 'search_form', :locals => {:action => 'contents'} %>
+
+<%= render :partial => 'display_results' %>
+
+<%= pagination_links @results %>
+
+<br style="clear:both" />
@@ -84,3 +84,26 @@ Feature: browse
     And I should not see "Pedro Silva"
     And I should not see "Paulo Neto"
     And I should not see "Community Silva"
+
+  @selenium
+  Scenario: Show contents browse menu
+    Given I should not see "More Comments"
+    And I should not see "More Views"
+    And I should not see "More Recent"
+    When I click "#submenu-contents-trigger"
+    Then I should see "More Comments"
+    And I should see "More Views"
+    And I should see "More Recent"
+
+  Scenario: Browse contents by query
+    Given the following articles
+      | owner     | name                      | body                    |
+      | joaosilva | Bees can fly              | this is an article      |
+      | joaosilva | Bees and ants are insects | this is another article |
+      | joaosilva | Ants are small            | this is another article |
+    When I go to /browse/contents
+    And I fill in "bees" for "query"
+    And I press "Search"
+    Then I should see "Bees can fly"
+    And I should see "Bees and ants are insects"
+    And I should not see "Ants are small"
@@ -3,5 +3,8 @@
 </li>
 <li>
   <%= browse_communities_menu %>
+  </li>
+<li>
+  <%= browse_contents_menu %>
 </li>
 <li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
@@ -4503,23 +4503,30 @@ h1#agenda-title {
 }
  
 .controller-search #content .search-results-type-article li,
-.controller-search #content .search-results-type-event li {
+.controller-search #content .search-results-type-event li,
+.controller-browse #content li.browse-results-type-content {
   padding: 0px 0px 4px 20px;
   background-repeat: no-repeat;
   border-color: transparent;
 }
  
 .controller-search #content .search-results-type-article li:hover,
-.controller-search #content .search-results-type-event li:hover {
+.controller-search #content .search-results-type-event li:hover,
+.controller-browse #content li.browse-results-type-content:hover {
   background-color: transparent;
 }
  
 .controller-search .search-results-type-article .item_meta,
-.controller-search .search-results-type-event .item_meta {
+.controller-search .search-results-type-event .item_meta,
+.controller-browse .browse-results-type-content .item_meta {
   font-size: 10px;
   color: #888;
 }
  
+.controller-browse .browse-results-type-content .item_meta span {
+  width: auto;
+}
+
 .search-results-type-article.search-results-innerbox {
   overflow: auto;
 }
@@ -19,7 +19,10 @@ class BrowseControllerTest &lt; Test::Unit::TestCase
     user.stubs(:email).returns('some@test.com')
     user.stubs(:save!).returns(true)
     Person.any_instance.stubs(:user).returns(user)
+    @profile = create_user('testinguser').person
+    Article.destroy_all
   end
+  attr_reader :profile
  
   should 'search for people' do
     Person.delete_all
@@ -274,4 +277,98 @@ class BrowseControllerTest &lt; Test::Unit::TestCase
     assert_not_includes assigns(:results), p1
   end
  
+  should 'search for contents' do
+    small = create(TinyMceArticle, :name => 'Testing article', :body => 'A small article for testing', :profile => profile)
+    create(TinyMceArticle, :name => 'Testing article 2', :body => 'A big article for testing', :profile => profile)
+
+    get :contents, :query => 'small'
+    assert_equal [small], assigns(:results)
+  end
+
+  should 'list all contents ordered by more recent by default' do
+    c1 = create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile => profile, :created_at => DateTime.now - 2)
+    c2 = create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile => profile, :created_at => DateTime.now - 1)
+    c3 = create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile => profile)
+
+    get :contents
+    assert_equal [c3,c2,c1], assigns(:results)
+  end
+
+  should 'paginate search of contents in groups of 27' do
+    1.upto(30).map do |n|
+      create(TinyMceArticle, :name => "Testing article #{n}", :body => "Article body #{n}", :profile => profile)
+    end
+
+    get :contents
+    assert_equal 27 , assigns(:results).count
+    assert_tag :a, '', :attributes => {:class => 'next_page'}
+  end
+
+  should 'paginate ferret search of contents in groups of 27' do
+    1.upto(30).map do |n|
+      create(TinyMceArticle, :name => "Testing article #{n}", :body => "Article body #{n}", :profile => profile)
+    end
+
+    get :contents, :query => 'Testing'
+    assert_equal 27 , assigns(:results).count
+    assert_tag :a, '', :attributes => {:class => 'next_page'}
+  end
+
+  should 'list all contents filter by more comments' do
+    article1 = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :comments_count => 5)
+    article2 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :comments_count => 10)
+    article3 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :comments_count => 1)
+
+    get :contents, :filter => 'more_comments'
+    assert_equal [article2,article1,article3] , assigns(:results)
+  end
+
+  should 'list all contents filter by more views' do
+    article1 = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :hits => 5)
+    article2 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :hits => 10)
+    article3 = fast_create(TinyMceArticle, :body => '<p>Another article to test browse contents</p>', :profile_id => profile.id, :hits => 1)
+
+    get :contents, :filter => 'more_views'
+    assert_equal [article2,article1,article3], assigns(:results)
+  end
+
+  should 'have the more_recent filter by default' do
+    get :contents, :filter => 'more_recent'
+    assert_equal 'more_recent' , assigns(:filter)
+
+    get :contents, :filter => 'more_comments'
+    assert_equal 'more_comments' , assigns(:filter)
+
+    get :contents, :filter => 'more_views'
+    assert_equal 'more_views' , assigns(:filter)
+
+    get :contents, :filter => 'more_anything'
+    assert_equal 'more_recent' , assigns(:filter)
+  end
+
+  should 'the contents filter define the title' do
+    get :contents, :filter => 'more_recent'
+    assert_equal 'More recent contents' , assigns(:title)
+    assert_tag :h1, :content => 'More recent contents'
+
+    get :contents, :filter => 'more_views'
+    assert_equal 'Most viewed contents' , assigns(:title)
+    assert_tag :h1, :content => 'Most viewed contents'
+
+    get :contents, :filter => 'more_comments'
+    assert_equal 'Most commented contents' , assigns(:title)
+    assert_tag :h1, :content => 'Most commented contents'
+
+    get :contents, :filter => 'more_anything'
+    assert_equal 'More recent contents' , assigns(:title)
+    assert_tag :h1, :content => 'More recent contents'
+  end
+
+  should "only include published contents in more_recent filter" do
+    # assuming that all filters behave the same!
+    article = fast_create(TinyMceArticle, :body => '<p>Article to test browse contents', :profile_id => profile.id, :published => false)
+    get :contents, :filter => 'more_recent'
+    assert_not_includes assigns(:results), article
+  end
+
 end
@@ -1562,4 +1562,78 @@ class ArticleTest &lt; Test::Unit::TestCase
     end
   end
  
+  should 'find more recent contents' do
+    Article.delete_all
+
+    c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
+    c2 = fast_create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
+    c3 = fast_create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
+
+    assert_equal [c2,c3,c1] , Article.more_recent
+
+    c4 = fast_create(TinyMceArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
+    assert_equal [c2,c4,c3,c1] , Article.more_recent
+  end
+
+  should 'respond to more comments' do
+    assert_respond_to Article, :more_comments
+  end
+
+  should 'respond to more views' do
+    assert_respond_to Article, :more_views
+  end
+
+  should "return the more recent label" do
+    a = Article.new
+    assert_equal "Created at: ", a.more_recent_label
+  end
+
+  should "return no comments if profile has 0 comments" do
+    a = Article.new
+    assert_equal 0, a.comments_count
+    assert_equal "no comments", a.more_comments_label
+  end
+
+  should "return 1 comment on label if the content has 1 comment" do
+    a = Article.new(:comments_count => 1)
+    assert_equal 1, a.comments_count
+    assert_equal "one comment", a.more_comments_label
+  end
+
+  should "return number of comments on label if the content has more than one comment" do
+    a = Article.new(:comments_count => 4)
+    assert_equal 4, a.comments_count
+    assert_equal "4 comments", a.more_comments_label
+  end
+
+  should "return no views if profile has 0 views" do
+    a = Article.new
+    assert_equal 0, a.hits
+    assert_equal "no views", a.more_views_label
+  end
+
+  should "return 1 view on label if the content has 1 view" do
+    a = Article.new(:hits => 1)
+    assert_equal 1, a.hits
+    assert_equal "one view", a.more_views_label
+  end
+
+  should "return number of views on label if the content has more than one view" do
+    a = Article.new(:hits => 4)
+    assert_equal 4, a.hits
+    assert_equal "4 views", a.more_views_label
+  end
+
+  should 'return only text articles' do
+    Article.delete_all
+
+    c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)
+    c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id)
+    c3 = fast_create(Event, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id)
+    c4 = fast_create(RssFeed, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id)
+    c5 = fast_create(TextileArticle, :name => 'Testing article 5', :body => 'Article body 5', :profile_id => profile.id)
+
+    assert_equal [c1,c2,c5], Article.text_articles
+  end
+
 end
...	...	@@ -6,6 +6,8 @@ class BrowseController < PublicController
6	6	more_recent
7	7	more_active
8	8	more_popular
	9	+ more_comments
	10	+ more_views
9	11	)
10	12
11	13	def per_page
...	...	@@ -36,6 +38,18 @@ class BrowseController < PublicController
36	38	@results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
37	39	end
38	40
	41	+ def contents
	42	+ @filter = filter
	43	+ @title = self.filter_description(params[:action] + '_' + @filter )
	44	+
	45	+ @results = @environment.articles.published.text_articles.send(@filter)
	46	+
	47	+ if !params[:query].blank?
	48	+ @results = @results.find_by_contents(params[:query])
	49	+ end
	50	+ @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
	51	+ end
	52	+
39	53	protected
40	54
41	55	def filter
...	...	@@ -54,6 +68,9 @@ class BrowseController < PublicController
54	68	'communities_more_recent' => _('More recent communities'),
55	69	'communities_more_active' => _('More active communities'),
56	70	'communities_more_popular' => _('More popular communities'),
	71	+ 'contents_more_recent' => _('More recent contents'),
	72	+ 'contents_more_views' => _('Most viewed contents'),
	73	+ 'contents_more_comments' => _('Most commented contents'),
57	74	}[str] \|\| str
58	75	end
59	76
...	...
...	...	@@ -1134,6 +1134,17 @@ module ApplicationHelper
1134	1134	link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1135	1135	end
1136	1136
	1137	+ def browse_contents_menu
	1138	+ links = [
	1139	+ {s_('contents\|More Comments') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_comments'})}},
	1140	+ {s_('contents\|More Views') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_views'})}},
	1141	+ {s_('contents\|More Recent') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_recent'})}}
	1142	+ ]
	1143	+
	1144	+ link_to(content_tag(:span, _('Contents'), :class => 'icon-blog'), {:controller => "browse", :action => 'contents'}, :id => 'submenu-contents') +
	1145	+ link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
	1146	+ end
	1147	+
1137	1148	def pagination_links(collection, options={})
1138	1149	options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options)
1139	1150	will_paginate(collection, options)
...	...
...	...	@@ -355,11 +355,20 @@ class Article < ActiveRecord::Base
355	355	['Folder', 'Blog', 'Forum', 'Gallery']
356	356	end
357	357
	358	+ def self.text_article_types
	359	+ ['TextArticle', 'TextileArticle', 'TinyMceArticle']
	360	+ end
	361	+
358	362	named_scope :published, :conditions => { :published => true }
359	363	named_scope :folders, :conditions => { :type => folder_types}
360	364	named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
361	365	named_scope :galleries, :conditions => { :type => 'Gallery' }
362	366	named_scope :images, :conditions => { :is_image => true }
	367	+ named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
	368	+
	369	+ named_scope :more_comments, :order => "comments_count DESC"
	370	+ named_scope :more_views, :order => "hits DESC"
	371	+ named_scope :more_recent, :order => "created_at DESC"
363	372
364	373	def self.display_filter(user, profile)
365	374	return {:conditions => ['published = ?', true]} if !user
...	...	@@ -528,6 +537,28 @@ class Article < ActiveRecord::Base
528	537	end
529	538	end
530	539
	540	+ def more_comments_label
	541	+ amount = self.comments_count
	542	+ {
	543	+ 0 => _('no comments'),
	544	+ 1 => _('one comment')
	545	+ }[amount] \|\| _("%s comments") % amount
	546	+
	547	+ end
	548	+
	549	+ def more_views_label
	550	+ amount = self.hits
	551	+ {
	552	+ 0 => _('no views'),
	553	+ 1 => _('one view')
	554	+ }[amount] \|\| _("%s views") % amount
	555	+
	556	+ end
	557	+
	558	+ def more_recent_label
	559	+ _('Created at: ')
	560	+ end
	561	+
531	562	private
532	563
533	564	def sanitize_tag_list
...	...
...	...	@@ -0,0 +1,11 @@
	1	+<li class="<%= 'browse-results-type-content ' + icon_for_article(result) %>">
	2	+ <strong><%= link_to(result.title, result.view_url) %></strong>
	3	+ <div class="item_meta">
	4	+ <span class="item_by">
	5	+ <%= _('by %s') % link_to(result.author.name, result.author.url) %>
	6	+ </span>
	7	+ <span class="extra-info">
	8	+ <%= (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
	9	+ </span>
	10	+ </div>
	11	+</li>
...	...
...	...	@@ -8,7 +8,7 @@
8	8	<% end %>
9	9	<ul class='common-profile-list-block'>
10	10	<% @results.each do \|result\| %>
11		- <%= render :partial => partial_for_class(result.class), :locals => {:profile => result} %>
	11	+ <%= render :partial => partial_for_class(result.class), :locals => {:result => result} %>
12	12	<% end %>
13	13	</ul>
14	14	<br style='clear: both;'>
...	...
1		-<%= profile_image_link profile, :portrait, 'li',
2		- "<span class='adr'>#{profile.city}</span>" +
3		- (@filter == 'more_recent' ? profile.send(@filter + '_label') + show_date(profile.created_at) : profile.send(@filter + '_label')) %>
	1	+<%= profile_image_link result, :portrait, 'li',
	2	+ "<span class='adr'>#{result.city}</span>" +
	3	+ (@filter == 'more_recent' ? result.send(@filter + '_label') + show_date(result.created_at) : result.send(@filter + '_label')) %>
...	...
...	...	@@ -0,0 +1,9 @@
	1	+<%= search_page_title( @title, { :query => @query} ) %>
	2	+
	3	+<%= render :partial => 'search_form', :locals => {:action => 'contents'} %>
	4	+
	5	+<%= render :partial => 'display_results' %>
	6	+
	7	+<%= pagination_links @results %>
	8	+
	9	+<br style="clear:both" />
...	...
...	...	@@ -84,3 +84,26 @@ Feature: browse
84	84	And I should not see "Pedro Silva"
85	85	And I should not see "Paulo Neto"
86	86	And I should not see "Community Silva"
	87	+
	88	+ @selenium
	89	+ Scenario: Show contents browse menu
	90	+ Given I should not see "More Comments"
	91	+ And I should not see "More Views"
	92	+ And I should not see "More Recent"
	93	+ When I click "#submenu-contents-trigger"
	94	+ Then I should see "More Comments"
	95	+ And I should see "More Views"
	96	+ And I should see "More Recent"
	97	+
	98	+ Scenario: Browse contents by query
	99	+ Given the following articles
	100	+ \| owner \| name \| body \|
	101	+ \| joaosilva \| Bees can fly \| this is an article \|
	102	+ \| joaosilva \| Bees and ants are insects \| this is another article \|
	103	+ \| joaosilva \| Ants are small \| this is another article \|
	104	+ When I go to /browse/contents
	105	+ And I fill in "bees" for "query"
	106	+ And I press "Search"
	107	+ Then I should see "Bees can fly"
	108	+ And I should see "Bees and ants are insects"
	109	+ And I should not see "Ants are small"
...	...
...	...	@@ -3,5 +3,8 @@
3	3	</li>
4	4	<li>
5	5	<%= browse_communities_menu %>
	6	+ </li>
	7	+<li>
	8	+ <%= browse_contents_menu %>
6	9	</li>
7	10	<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
...	...
...	...	@@ -4503,23 +4503,30 @@ h1#agenda-title {
4503	4503	}
4504	4504
4505	4505	.controller-search #content .search-results-type-article li,
4506		-.controller-search #content .search-results-type-event li {
	4506	+.controller-search #content .search-results-type-event li,
	4507	+.controller-browse #content li.browse-results-type-content {
4507	4508	padding: 0px 0px 4px 20px;
4508	4509	background-repeat: no-repeat;
4509	4510	border-color: transparent;
4510	4511	}
4511	4512
4512	4513	.controller-search #content .search-results-type-article li:hover,
4513		-.controller-search #content .search-results-type-event li:hover {
	4514	+.controller-search #content .search-results-type-event li:hover,
	4515	+.controller-browse #content li.browse-results-type-content:hover {
4514	4516	background-color: transparent;
4515	4517	}
4516	4518
4517	4519	.controller-search .search-results-type-article .item_meta,
4518		-.controller-search .search-results-type-event .item_meta {
	4520	+.controller-search .search-results-type-event .item_meta,
	4521	+.controller-browse .browse-results-type-content .item_meta {
4519	4522	font-size: 10px;
4520	4523	color: #888;
4521	4524	}
4522	4525
	4526	+.controller-browse .browse-results-type-content .item_meta span {
	4527	+ width: auto;
	4528	+}
	4529	+
4523	4530	.search-results-type-article.search-results-innerbox {
4524	4531	overflow: auto;
4525	4532	}
...	...