ActionItem323: better layout for category index

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1725 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem323: better layout for category index
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1725 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 09f41a83
Showing 8 changed files with 56 additions and 108 deletions Show diff stats
app/controllers/public/search_controller.rb
app/views/search/_category.rhtml
app/views/search/_display_results.rhtml
app/views/search/_product_category.rhtml
app/views/search/_region.rhtml
app/views/search/assets.rhtml
app/views/search/category_index.rhtml
test/functional/search_controller_test.rb
@@ -29,19 +29,6 @@ class SearchController &lt; ApplicationController
     end
   end
-  def action_product_category
-    @products = category.products
-    @enterprises = category.products.map{|p| p.enterprise}.flatten.uniq
-    @users = category.consumers
-  end
-
-  def action_category
-    @recent_articles = @finder.recent('articles')
-    @recent_comments = @finder.recent('comments')
-    @most_commented_articles = @finder.most_commented_articles
-  end
-  alias :action_region :action_category
-
   public
   include SearchHelper
@@ -58,7 +45,7 @@ class SearchController &lt; ApplicationController
   ]
   # TODO don't hardcode like this >:-(
-  LIST_LIMIT = 10
+  LIST_LIMIT = 20
   def index
     @query = params[:query] || ''
@@ -76,7 +63,18 @@ class SearchController &lt; ApplicationController
   # view the summary of one category
   def category_index
-    send('action_' + category.class.name.underscore) 
+    @results = {}
+    @names = {}
+    [
+      [ :recent_people, _('Recently registered people'), @finder.recent('people') ],
+      [ :recent_communities, _('Recently created communities'), @finder.recent('communities') ],
+      [ :recent_articles, _('Recent articles'), @finder.recent('articles') ],
+      [ :recent_comments, _('Recent comments'), @finder.recent('comments') ],
+      [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles ]
+    ].each do |key, name, list|
+      @results[key] = list
+      @names[key] = name
+    end
   end
   attr_reader :category
@@ -1,34 +0,0 @@
-
-<div id="category-recent-articles">
-  <h2><%= _('Recent articles') %></h2>
-  <div class="category-innerbox">
-    <ul class="recent_on_cat recent_articles">
-      <%= render :partial => 'article', :collection => @recent_articles %>
-    </ul>
-  </div><!-- end class="category-innerbox" -->
-</div><!-- end id="category-recent-articles" -->
-
-<div id="category-comments">
-
-<div id="category-recent-comments">
-  <h2><%= _('Recent Comments') %></h2>
-  <div class="category-innerbox">
-    <ul class="recent_on_cat recent_comments">
-    <% @recent_comments.each do |comment| %>
-      <%= render :partial => 'comment', :object => comment %>
-    <% end %>
-    </ul>
-  </div><!-- end class="category-innerbox" -->
-</div><!-- end id="category-recent-articles" -->
-
-<div id="most-commented">
-  <h2><%= _('Most commented articles') %></h2>
-  <div class="category-innerbox">
-    <ul class="most_commented">
-      <%= render :partial => 'article', :collection => @most_commented_articles %>
-    </ul>
-  </div><!-- end class="category-innerbox" -->
-</div><!-- end id="most-commented" -->
-
-</div><!-- end id="category-comments" -->
-
 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
-<% if @category %>
+<% if @category && !@query.blank? %>
 <div id="search-whole-site">
 <%= link_to _('Search for "%s" in the whole site') % @query,
            :controller => 'search', :action => 'index', :category_path => [], :query => @query %>
@@ -1,29 +0,0 @@
-<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) if logged_in? %>
-<ul>
-  <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
-  <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
-  <li><%= n_("One user consumes this product.", "%{num} users consumes this product", @users.size) % {:num => @users.size} %></li>
-</ul>
-
-<h3> <%= _('Products under this category:') %> </h3>
-<ul>
-  <% @products.each do |p| %>
-    <li>
-    <%= image_tag p.image.public_filename(:thumb) if p.image%>
-    <%= link_to_product(p) %> <br/>
-    <% if p.price %>
-      <%= _('Price: %d') % p.price %> <br/>
-    <% end %>
-    <%= _('Enterprise:') %> <%= link_to_homepage p.enterprise.name, p.enterprise.identifier %> <br/><br/>
-    </li>
-  <% end %>
-</ul>
-
-<h3><%= _('Users that consumes products in this category:') %></h3>
-
-<% @users.each do |u| %>
-  <p>
-  <%= image_tag u.image.public_filename(:thumb) if  u.image %> <br> 
-  <%= link_to_homepage(u.name, u.identifier) %>
-  </p>
-<% end %>
@@ -1 +0,0 @@
-_category.rhtml
 \ No newline at end of file
-<h2><%= @category ? (_('%{asset_name} in %{category}') % { :asset_name => @asset_name, :category => @category.full_name}) : @asset_name %></h2>
+<h1><%= @category ? (_('%{asset_name} in %{category}') % { :asset_name => @asset_name, :category => @category.name}) : @asset_name %></h1>
 <%= render :partial => 'display_results' %>
@@ -6,10 +6,8 @@
   <h1 id="category-name"><%= _('Category: %s') % @category.name %></h1>
-  <div class="category_itens">
-  <%= render :partial => @category.class.name.underscore %>
-  </div><!-- end class="category_itens" -->
-
+  <%= render :partial => 'display_results' %>
+    
   <div id="category-childs">
     <h2> <%= _('Sub-categories')  %> </h2>
     <% if @category.children.empty? %>
@@ -433,46 +433,62 @@ class SearchControllerTest &lt; Test::Unit::TestCase
   end
   should 'list recent articles in the category' do
-    @controller.expects(:category).returns(@category).at_least_once
     recent = []
-    finder = CategoryFinder.new(@category)
-    finder.expects(:recent).with('comments').returns(recent)
-    finder.expects(:recent).with('articles').returns(recent)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    finger = CategoryFinder.new(@category)
+    finger.expects(:recent).with(anything).at_least_once
+    finger.expects(:recent).with('articles').returns(recent)
+    CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same recent, assigns(:recent_articles)
+    assert_same recent, assigns(:results)[:recent_articles]
   end
   should 'list recent comments in the category' do
-    @controller.expects(:category).returns(@category).at_least_once
     recent = []
-    finder = CategoryFinder.new(@category)
-    finder.expects(:recent).with('comments').returns(recent)
-    finder.expects(:recent).with('articles').returns(recent)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    finger = CategoryFinder.new(@category)
+    finger.expects(:recent).with(anything).at_least_once
+    finger.expects(:recent).with('comments').returns(recent)
+    CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same recent, assigns(:recent_comments)
+    assert_same recent, assigns(:results)[:recent_comments]
   end
   should 'list most commented articles in the category' do
-    @controller.expects(:category).returns(@category).at_least_once
     most_commented = []
-    finder = CategoryFinder.new(@category)
-    finder.expects(:most_commented_articles).returns(most_commented)
-    CategoryFinder.expects(:new).with(@category).returns(finder)
+    finger = CategoryFinder.new(@category)
+    finger.expects(:most_commented_articles).returns(most_commented)
+    CategoryFinder.expects(:new).with(@category).returns(finger)
     get :category_index, :category_path => [ 'my-category' ]
-    assert_same most_commented, assigns(:most_commented_articles)
+    assert_same most_commented, assigns(:results)[:most_commented_articles]
   end
-  should 'display category of products' do
-    cat = ProductCategory.create!(:name => 'Food', :environment => Environment.default)
-    ent = Enterprise.create!(:name => 'Enterprise test', :identifier => 'enterprise_test')
-    p = cat.products.create!(:name => 'product test', :enterprise => ent)
-    get :category_index, :category_path => cat.path.split('/')
-    assert_includes assigns(:products), p
+  should 'list recently registered people in the category' do
+    recent_people = []
+    finger = CategoryFinder.new(@category)
+    finger.expects(:recent).with(anything).at_least_once
+    finger.expects(:recent).with('people').returns(recent_people)
+    CategoryFinder.expects(:new).with(@category).returns(finger)
+
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_same recent_people, assigns(:results)[:recent_people]
+  end
+
+  should 'list recently registered communities in the category' do
+    recent_communities = []
+    finger = CategoryFinder.new(@category)
+    finger.expects(:recent).with(anything).at_least_once
+    finger.expects(:recent).with('communities').returns(recent_communities)
+    CategoryFinder.expects(:new).with(@category).returns(finger)
+
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_same recent_communities, assigns(:results)[:recent_communities]
+  end
+
+  should 'not list "Search for ..." in category_index' do
+    get :category_index, :category_path => [ 'my-category' ]
+    assert_no_tag :content => /Search for ".*" in the whole site/
   end
   # SECURITY
	@@ -1,34 +0,0 @@	@@ -1,34 +0,0 @@
1	-
2	-<div id="category-recent-articles">
3	- <h2><%= _('Recent articles') %></h2>
4	- <div class="category-innerbox">
5	- <ul class="recent_on_cat recent_articles">
6	- <%= render :partial => 'article', :collection => @recent_articles %>
7	- </ul>
8	- </div><!-- end class="category-innerbox" -->
9	-</div><!-- end id="category-recent-articles" -->
10	-
11	-<div id="category-comments">
12	-
13	-<div id="category-recent-comments">
14	- <h2><%= _('Recent Comments') %></h2>
15	- <div class="category-innerbox">
16	- <ul class="recent_on_cat recent_comments">
17	- <% @recent_comments.each do \|comment\| %>
18	- <%= render :partial => 'comment', :object => comment %>
19	- <% end %>
20	- </ul>
21	- </div><!-- end class="category-innerbox" -->
22	-</div><!-- end id="category-recent-articles" -->
23	-
24	-<div id="most-commented">
25	- <h2><%= _('Most commented articles') %></h2>
26	- <div class="category-innerbox">
27	- <ul class="most_commented">
28	- <%= render :partial => 'article', :collection => @most_commented_articles %>
29	- </ul>
30	- </div><!-- end class="category-innerbox" -->
31	-</div><!-- end id="most-commented" -->
32	-
33	-</div><!-- end id="category-comments" -->
34	-
1	<div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">	1	<div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
2		2
3	-<% if @category %>	3	+<% if @category && !@query.blank? %>
4	<div id="search-whole-site">	4	<div id="search-whole-site">
5	<%= link_to _('Search for "%s" in the whole site') % @query,	5	<%= link_to _('Search for "%s" in the whole site') % @query,
6	:controller => 'search', :action => 'index', :category_path => [], :query => @query %>	6	:controller => 'search', :action => 'index', :category_path => [], :query => @query %>
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-<%= link_to(_('I consume this'), {:profile => current_user.login, :controller => 'consumed_products', :action => 'new', 'consumption[product_category_id]' => @category.id }, :method => :post) if logged_in? %>
2	-<ul>
3	- <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
4	- <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
5	- <li><%= n_("One user consumes this product.", "%{num} users consumes this product", @users.size) % {:num => @users.size} %></li>
6	-</ul>
7	-
8	-<h3> <%= _('Products under this category:') %> </h3>
9	-<ul>
10	- <% @products.each do \|p\| %>
11	- <li>
12	- <%= image_tag p.image.public_filename(:thumb) if p.image%>
13	- <%= link_to_product(p) %> <br/>
14	- <% if p.price %>
15	- <%= _('Price: %d') % p.price %> <br/>
16	- <% end %>
17	- <%= _('Enterprise:') %> <%= link_to_homepage p.enterprise.name, p.enterprise.identifier %> <br/><br/>
18	- </li>
19	- <% end %>
20	-</ul>
21	-
22	-<h3><%= _('Users that consumes products in this category:') %></h3>
23	-
24	-<% @users.each do \|u\| %>
25	- <p>
26	- <%= image_tag u.image.public_filename(:thumb) if u.image %> <br>
27	- <%= link_to_homepage(u.name, u.identifier) %>
28	- </p>
29	-<% end %>
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-_category.rhtml
2	\ No newline at end of file	0	\ No newline at end of file
1	-<h2><%= @category ? (_('%{asset_name} in %{category}') % { :asset_name => @asset_name, :category => @category.full_name}) : @asset_name %></h2>	1	+<h1><%= @category ? (_('%{asset_name} in %{category}') % { :asset_name => @asset_name, :category => @category.name}) : @asset_name %></h1>
2		2
3	<%= render :partial => 'display_results' %>	3	<%= render :partial => 'display_results' %>