Add a block to display the categories as a website menu.

(ActionItem1543)

Add a block to display the categories as a website menu.
(ActionItem1543)
Leandro Santos · Joenio Costa
1 parent 5b1eb2d2
Showing 13 changed files with 329 additions and 6 deletions Show diff stats
app/controllers/admin/environment_design_controller.rb
app/helpers/application_helper.rb
app/models/categories_block.rb
app/models/category.rb
app/views/blocks/categories.rhtml
app/views/box_organizer/_categories_block.rhtml
features/categories_block.feature
features/step_definitions/noosfero_steps.rb
public/javascripts/application.js
public/stylesheets/application.css
test/functional/environment_design_controller_test.rb
test/unit/categories_block_test.rb
test/unit/category_test.rb
@@ -3,7 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock ]
   end
 end
@@ -985,4 +985,38 @@ module ApplicationHelper
     number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
   end
+  def collapsed_item_icon
+    "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>"
+  end
+  def expanded_item_icon
+    "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>"
+  end
+  def leaf_item_icon
+    "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>"
+  end
+
+  def display_category_menu(block, categories, root = true)
+    categories = categories.sort{|x,y| x.name <=> y.name}
+    return "" if categories.blank?
+    content_tag(:ul,
+      categories.map do |category|
+        category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
+        category.display_in_menu? ?
+        content_tag(:li,
+          ( !category.is_leaf_displayable_in_menu? ? content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => 'category-link-expand ' + (root ? 'category-root' : 'category-no-root'), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => 'display: none') : leaf_item_icon) +
+          link_to(content_tag(:span, category.name, :class => 'category-name'), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
+          content_tag(:div, display_category_menu(block, category.children, false), :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category')
+        ) : ''
+      end
+    ) +
+    content_tag(:p) +
+    (root ? javascript_tag("
+      jQuery('.child-category').hide();
+      jQuery('.category-link-expand').show();
+      var expanded_icon = \"#{ expanded_item_icon }\";
+      var collapsed_icon = \"#{ collapsed_item_icon }\";
+      var category_expanded = { 'block' : 0, 'category' : 0 };
+    ") : '')
+  end
+
 end
@@ -0,0 +1,38 @@
+class CategoriesBlock < Block
+
+  CATEGORY_TYPES = {
+    _('Generic category') => nil,
+    _('Region') => 'Region',
+    _('Product') => 'ProductCategory'
+  }
+
+  settings_items :category_types, :type => Array, :default => []
+
+  def self.description
+    _("Categories Menu")
+  end
+
+  def default_title
+    _("Categories Menu")
+  end
+
+  def help
+    _('This block presents the categories like a web site menu.')
+  end
+
+  def available_category_types
+    CATEGORY_TYPES
+  end
+
+  def selected_categories
+    Category.top_level_for(self.owner).from_types(self.category_types)
+  end
+
+  def content
+    block = self
+    lambda do
+      render :file => 'blocks/categories', :locals => { :block => block }
+    end
+  end
+
+end
@@ -9,9 +9,9 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.')
   # Finds all top level categories for a given environment. 
-  def self.top_level_for(environment)
-    self.find(:all, :conditions => ['parent_id is null and environment_id = ?', environment.id ])
-  end
+  named_scope :top_level_for, lambda { |environment|
+    {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
+  }
   acts_as_filesystem
@@ -30,6 +30,12 @@ class Category &lt; ActiveRecord::Base
   acts_as_having_image
+  named_scope :from_types, lambda { |types|
+    types.select{ |t| t.blank? }.empty? ?
+      { :conditions => { :type => types } } :
+      { :conditions => [ "type IN (?) OR type IS NULL", types.reject{ |t| t.blank? } ] }
+  }
+
   def recent_articles(limit = 10)
     self.articles.recent(limit)
   end
@@ -58,4 +64,9 @@ class Category &lt; ActiveRecord::Base
     results
   end
+  def is_leaf_displayable_in_menu?
+    return false if self.display_in_menu == false
+    self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
+  end
+
 end
@@ -0,0 +1,3 @@
+<%= block_title(block.title) %>
+
+<%= display_category_menu block, block.selected_categories %>
@@ -0,0 +1,5 @@
+<strong><%= _('Category types') %></strong>
+
+<% @block.available_category_types.each do |type_label, type_value| %>
+  <p><%= labelled_check_box(type_label, 'block[category_types][]', type_value.to_s, @block.category_types.include?(type_value.to_s)) %></p>
+<% end %>
@@ -0,0 +1,86 @@
+Feature: categories_block
+  As an admin
+  I want to manage the categories block
+
+  Background:
+    Given I am on the homepage
+    And the following product_categories
+      | name       | display_in_menu |
+      | Food       | true            |
+      | Book       | true            |
+    And the following product_categories
+      | parent  | name        | display_in_menu |
+      | Food    | Vegetarian  | true            |
+      | Food    | Steak       | true            |
+      | Book    | Fiction     | false           |
+      | Book    | Literature  | true            |
+    And the following categories
+      | name       | display_in_menu |
+      | Wood       | true            |
+    And the following regions
+      | name       | display_in_menu |
+      | Bahia       | true            |
+    And the following blocks
+      | owner       | type          |
+      | environment | CategoriesBlock |
+    And I am logged in as admin
+
+  @selenium
+  Scenario: List just product categories
+    Given I go to /admin/environment_design
+    And I follow "Edit" within ".categories-block"
+    And I check "Product"
+    When I press "Save"
+    Then I should see "Food"
+    And I should see "Book"
+    And I should not see "Vegetarian"
+    And I should not see "Steak"
+    And I should not see "Fiction"
+
+  @selenium
+  Scenario: Show submenu if it exists
+    Given I go to /admin/environment_design
+    And I follow "Edit" within ".categories-block"
+    And I check "Product"
+    And I press "Save"
+    Then I should see "Food"
+    And I should see "Book"
+    And I should not see "Vegetarian"
+    And I should not see "Steak"
+    And I should not see "Literature"
+    When I click ".category-link-expand category-root"
+    Then I should see "Literature"
+    When I click ".category-link-expand category-root"
+    Then I should see "Vegetarian"
+    And I should see "Steak"
+    And I should not see "Fiction"
+
+  @selenium
+  Scenario: Show only one submenu per time
+    Given I go to /admin/environment_design
+    And I follow "Edit" within ".categories-block"
+    And I check "Product"
+    And I press "Save"
+    Then I should see "Food"
+    And I should not see "Vegetarian"
+    And I should not see "Steak"
+    When I click ".category-link-expand category-root"
+    Then I should see "Vegetarian"
+    And I should see "Steak"
+
+  @selenium
+  Scenario: List just general categories
+    Given I go to /admin/environment_design
+    And I follow "Edit" within ".categories-block"
+    And I check "Generic Category"
+    When I press "Save"
+    Then I should see "Wood"
+
+  @selenium
+  Scenario: List just regions
+    Given I go to /admin/environment_design
+    And I follow "Edit" within ".categories-block"
+    And I check "Region"
+    When I press "Save"
+    Then I should see "Bahia"
+
@@ -21,7 +21,12 @@ end
 Given /^the following blocks$/ do |table|
   table.hashes.map{|item| item.dup}.each do |item|
     klass = item.delete('type')
-    owner = Profile[item.delete('owner')]
+    owner_type = item.delete('owner')
+    owner = owner_type == 'environment' ? Environment.default : Profile[owner_type]
+    if owner.boxes.empty?
+      owner.boxes<< Box.new
+      owner.boxes.first.blocks << MainBlock.new
+    end
     box_id = owner.boxes.last.id
     klass.constantize.create!(item.merge(:box_id => box_id))
   end
@@ -193,3 +193,24 @@ function render_jquery_ui_buttons(element_id) {
       })
    }
 }
+
+function expandCategory(block, id) {
+  var link = jQuery('#block_' + block + '_category_' + id);
+  if (category_expanded['block'] > 0 && category_expanded['category'] > 0 && category_expanded['block'] == block && category_expanded['category'] != id && link.hasClass('category-root')) {
+    expandCategory(category_expanded['block'], category_expanded['category']);
+    category_expanded['category'] = id;
+    category_expanded['block'] = block;
+  }
+  if (category_expanded['block'] == 0) category_expanded['block'] = block;
+  if (category_expanded['category'] == 0) category_expanded['category'] = id;
+  jQuery('#block_' + block + '_category_content_' + id).slideToggle('slow');
+  link.toggleClass('category-expanded');
+  if (link.hasClass('category-expanded')) link.html(expanded_icon);
+  else {
+    link.html(collapsed_icon);
+    if (link.hasClass('category-root')) {
+      category_expanded['block'] = 0;
+      category_expanded['category'] = 0;
+    }
+  }
+}
@@ -4051,3 +4051,35 @@ h1#agenda-title {
 .treeitem .button{
   display: inline;
 }
+
+/* Categories block stuff */
+
+.categories-block ul {
+  margin: 0;
+  padding: 0;
+  float: left;
+}
+.categories-block li {
+  display: block;
+  float: left;
+  width: 100%;
+}
+.categories-block ul a {
+  text-decoration: none;
+  background-color: transparent;
+  border-bottom: 1px solid #fff;
+  border-color: #fff;
+  line-height: 22px;
+}
+.categories-block div {
+  clear: both;
+}
+.categories-block p {
+  clear: both;
+}
+.categories-block li a:hover {
+  text-decoration: none;
+}
+.categories-block .ui-icon {
+  margin-top: 2px;
+}
@@ -6,7 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
 class EnvironmentDesignControllerTest < Test::Unit::TestCase
-  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock ]
+  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock ]
   def setup
     @controller = EnvironmentDesignController.new
@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CategoriesBlockTest < ActiveSupport::TestCase
+
+  should 'default describe' do
+    assert_not_equal Block.description, CategoriesBlock.description
+  end
+
+  should 'default title' do
+    block = Block.new
+    category_block =  CategoriesBlock.new
+    assert_not_equal block.title, category_block.default_title
+  end
+
+  should 'have a help defined' do
+    category_block =  CategoriesBlock.new
+    assert_not_nil category_block.help
+  end
+
+  should 'display category block' do
+    block = CategoriesBlock.new
+
+    self.expects(:render).with(:file => 'blocks/categories', :locals => { :block => block})
+    instance_eval(& block.content)
+  end
+
+  should 'be editable' do
+    assert CategoriesBlock.new.editable?
+  end
+
+  should 'default category types is an empty array' do
+    category_block = CategoriesBlock.new
+    assert_kind_of Array, category_block.category_types
+    assert category_block.category_types.empty?
+  end
+
+  should 'available category types' do
+    category_block = CategoriesBlock.new
+    assert_equal({ _('Generic category') => nil, _('Region') => 'Region', _('Product') => 'ProductCategory' }, category_block.available_category_types)
+  end
+
+end
@@ -389,4 +389,50 @@ class CategoryTest &lt; Test::Unit::TestCase
     assert Category.new.accept_products?
   end
+  should 'get categories by type including nil' do
+    category = Category.create!(:name => 'test category', :environment => Environment.default)
+    region = Region.create!(:name => 'test region', :environment => Environment.default)
+    product = ProductCategory.create!(:name => 'test product', :environment => Environment.default)
+    result = Category.from_types(['ProductCategory', '']).all
+    assert_equal 2, result.size
+    assert result.include?(product)
+    assert result.include?(category)
+  end
+
+  should 'get categories by type and not nil' do
+    category = Category.create!(:name => 'test category', :environment => Environment.default)
+    region = Region.create!(:name => 'test region', :environment => Environment.default)
+    product = ProductCategory.create!(:name => 'test product', :environment => Environment.default)
+    result = Category.from_types(['Region', 'ProductCategory']).all
+    assert_equal 2, result.size
+    assert result.include?(region)
+    assert result.include?(product)
+  end
+
+  should 'define a leaf to be displayed in menu' do
+    c1 = fast_create(Category, :display_in_menu => true)
+    c11  = fast_create(Category, :display_in_menu => true, :parent_id => c1.id)
+    c2   = fast_create(Category, :display_in_menu => true)
+    c21  = fast_create(Category, :display_in_menu => false, :parent_id => c2.id)
+    c22  = fast_create(Category, :display_in_menu => false, :parent_id => c2.id)
+
+    assert_equal false, c1.is_leaf_displayable_in_menu?
+    assert_equal true, c11.is_leaf_displayable_in_menu?
+    assert_equal true, c2.is_leaf_displayable_in_menu?
+    assert_equal false, c21.is_leaf_displayable_in_menu?
+    assert_equal false, c22.is_leaf_displayable_in_menu?
+  end
+
+  should 'filter top_level categories by type' do
+    toplevel_productcategory = fast_create(ProductCategory)
+    leaf_productcategory = fast_create(ProductCategory, :parent_id => toplevel_productcategory.id)
+
+    toplevel_category = fast_create(Category)
+    leaf_category = fast_create(Category, :parent_id => toplevel_category.id)
+
+    assert_includes Category.top_level_for(Environment.default).from_types(['ProductCategory']), toplevel_productcategory
+    assert_not_includes Category.top_level_for(Environment.default).from_types(['ProductCategory']), leaf_productcategory
+    assert_not_includes Category.top_level_for(Environment.default).from_types(['ProductCategory']), toplevel_category
+  end
+
 end
	@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3	protect 'edit_environment_design', :environment	3	protect 'edit_environment_design', :environment
4		4
5	def available_blocks	5	def available_blocks
6	- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock ]	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock ]
7	end	7	end
8		8
9	end	9	end
	@@ -985,4 +985,38 @@ module ApplicationHelper		@@ -985,4 +985,38 @@ module ApplicationHelper
985	number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")	985	number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
986	end	986	end
987		987
		988	+ def collapsed_item_icon
		989	+ "<span class='ui-icon ui-icon-circlesmall-plus' style='float:left;'></span>"
		990	+ end
		991	+ def expanded_item_icon
		992	+ "<span class='ui-icon ui-icon-circlesmall-minus' style='float:left;'></span>"
		993	+ end
		994	+ def leaf_item_icon
		995	+ "<span class='ui-icon ui-icon-arrow-1-e' style='float:left;'></span>"
		996	+ end
		997	+
		998	+ def display_category_menu(block, categories, root = true)
		999	+ categories = categories.sort{\|x,y\| x.name <=> y.name}
		1000	+ return "" if categories.blank?
		1001	+ content_tag(:ul,
		1002	+ categories.map do \|category\|
		1003	+ category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
		1004	+ category.display_in_menu? ?
		1005	+ content_tag(:li,
		1006	+ ( !category.is_leaf_displayable_in_menu? ? content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => 'category-link-expand ' + (root ? 'category-root' : 'category-no-root'), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => 'display: none') : leaf_item_icon) +
		1007	+ link_to(content_tag(:span, category.name, :class => 'category-name'), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
		1008	+ content_tag(:div, display_category_menu(block, category.children, false), :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category')
		1009	+ ) : ''
		1010	+ end
		1011	+ ) +
		1012	+ content_tag(:p) +
		1013	+ (root ? javascript_tag("
		1014	+ jQuery('.child-category').hide();
		1015	+ jQuery('.category-link-expand').show();
		1016	+ var expanded_icon = \"#{ expanded_item_icon }\";
		1017	+ var collapsed_icon = \"#{ collapsed_item_icon }\";
		1018	+ var category_expanded = { 'block' : 0, 'category' : 0 };
		1019	+ ") : '')
		1020	+ end
		1021	+
988	end	1022	end
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+class CategoriesBlock < Block
	2	+
	3	+ CATEGORY_TYPES = {
	4	+ _('Generic category') => nil,
	5	+ _('Region') => 'Region',
	6	+ _('Product') => 'ProductCategory'
	7	+ }
	8	+
	9	+ settings_items :category_types, :type => Array, :default => []
	10	+
	11	+ def self.description
	12	+ _("Categories Menu")
	13	+ end
	14	+
	15	+ def default_title
	16	+ _("Categories Menu")
	17	+ end
	18	+
	19	+ def help
	20	+ _('This block presents the categories like a web site menu.')
	21	+ end
	22	+
	23	+ def available_category_types
	24	+ CATEGORY_TYPES
	25	+ end
	26	+
	27	+ def selected_categories
	28	+ Category.top_level_for(self.owner).from_types(self.category_types)
	29	+ end
	30	+
	31	+ def content
	32	+ block = self
	33	+ lambda do
	34	+ render :file => 'blocks/categories', :locals => { :block => block }
	35	+ end
	36	+ end
	37	+
	38	+end
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<%= block_title(block.title) %>
	2	+
	3	+<%= display_category_menu block, block.selected_categories %>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<strong><%= _('Category types') %></strong>
	2	+
	3	+<% @block.available_category_types.each do \|type_label, type_value\| %>
	4	+ <p><%= labelled_check_box(type_label, 'block[category_types][]', type_value.to_s, @block.category_types.include?(type_value.to_s)) %></p>
	5	+<% end %>
@@ -0,0 +1,86 @@		@@ -0,0 +1,86 @@
	1	+Feature: categories_block
	2	+ As an admin
	3	+ I want to manage the categories block
	4	+
	5	+ Background:
	6	+ Given I am on the homepage
	7	+ And the following product_categories
	8	+ \| name \| display_in_menu \|
	9	+ \| Food \| true \|
	10	+ \| Book \| true \|
	11	+ And the following product_categories
	12	+ \| parent \| name \| display_in_menu \|
	13	+ \| Food \| Vegetarian \| true \|
	14	+ \| Food \| Steak \| true \|
	15	+ \| Book \| Fiction \| false \|
	16	+ \| Book \| Literature \| true \|
	17	+ And the following categories
	18	+ \| name \| display_in_menu \|
	19	+ \| Wood \| true \|
	20	+ And the following regions
	21	+ \| name \| display_in_menu \|
	22	+ \| Bahia \| true \|
	23	+ And the following blocks
	24	+ \| owner \| type \|
	25	+ \| environment \| CategoriesBlock \|
	26	+ And I am logged in as admin
	27	+
	28	+ @selenium
	29	+ Scenario: List just product categories
	30	+ Given I go to /admin/environment_design
	31	+ And I follow "Edit" within ".categories-block"
	32	+ And I check "Product"
	33	+ When I press "Save"
	34	+ Then I should see "Food"
	35	+ And I should see "Book"
	36	+ And I should not see "Vegetarian"
	37	+ And I should not see "Steak"
	38	+ And I should not see "Fiction"
	39	+
	40	+ @selenium
	41	+ Scenario: Show submenu if it exists
	42	+ Given I go to /admin/environment_design
	43	+ And I follow "Edit" within ".categories-block"
	44	+ And I check "Product"
	45	+ And I press "Save"
	46	+ Then I should see "Food"
	47	+ And I should see "Book"
	48	+ And I should not see "Vegetarian"
	49	+ And I should not see "Steak"
	50	+ And I should not see "Literature"
	51	+ When I click ".category-link-expand category-root"
	52	+ Then I should see "Literature"
	53	+ When I click ".category-link-expand category-root"
	54	+ Then I should see "Vegetarian"
	55	+ And I should see "Steak"
	56	+ And I should not see "Fiction"
	57	+
	58	+ @selenium
	59	+ Scenario: Show only one submenu per time
	60	+ Given I go to /admin/environment_design
	61	+ And I follow "Edit" within ".categories-block"
	62	+ And I check "Product"
	63	+ And I press "Save"
	64	+ Then I should see "Food"
	65	+ And I should not see "Vegetarian"
	66	+ And I should not see "Steak"
	67	+ When I click ".category-link-expand category-root"
	68	+ Then I should see "Vegetarian"
	69	+ And I should see "Steak"
	70	+
	71	+ @selenium
	72	+ Scenario: List just general categories
	73	+ Given I go to /admin/environment_design
	74	+ And I follow "Edit" within ".categories-block"
	75	+ And I check "Generic Category"
	76	+ When I press "Save"
	77	+ Then I should see "Wood"
	78	+
	79	+ @selenium
	80	+ Scenario: List just regions
	81	+ Given I go to /admin/environment_design
	82	+ And I follow "Edit" within ".categories-block"
	83	+ And I check "Region"
	84	+ When I press "Save"
	85	+ Then I should see "Bahia"
	86	+
	@@ -21,7 +21,12 @@ end		@@ -21,7 +21,12 @@ end
21	Given /^the following blocks$/ do \|table\|	21	Given /^the following blocks$/ do \|table\|
22	table.hashes.map{\|item\| item.dup}.each do \|item\|	22	table.hashes.map{\|item\| item.dup}.each do \|item\|
23	klass = item.delete('type')	23	klass = item.delete('type')
24	- owner = Profile[item.delete('owner')]	24	+ owner_type = item.delete('owner')
		25	+ owner = owner_type == 'environment' ? Environment.default : Profile[owner_type]
		26	+ if owner.boxes.empty?
		27	+ owner.boxes<< Box.new
		28	+ owner.boxes.first.blocks << MainBlock.new
		29	+ end
25	box_id = owner.boxes.last.id	30	box_id = owner.boxes.last.id
26	klass.constantize.create!(item.merge(:box_id => box_id))	31	klass.constantize.create!(item.merge(:box_id => box_id))
27	end	32	end
	@@ -193,3 +193,24 @@ function render_jquery_ui_buttons(element_id) {		@@ -193,3 +193,24 @@ function render_jquery_ui_buttons(element_id) {
193	})	193	})
194	}	194	}
195	}	195	}
		196	+
		197	+function expandCategory(block, id) {
		198	+ var link = jQuery('#block_' + block + '_category_' + id);
		199	+ if (category_expanded['block'] > 0 && category_expanded['category'] > 0 && category_expanded['block'] == block && category_expanded['category'] != id && link.hasClass('category-root')) {
		200	+ expandCategory(category_expanded['block'], category_expanded['category']);
		201	+ category_expanded['category'] = id;
		202	+ category_expanded['block'] = block;
		203	+ }
		204	+ if (category_expanded['block'] == 0) category_expanded['block'] = block;
		205	+ if (category_expanded['category'] == 0) category_expanded['category'] = id;
		206	+ jQuery('#block_' + block + '_category_content_' + id).slideToggle('slow');
		207	+ link.toggleClass('category-expanded');
		208	+ if (link.hasClass('category-expanded')) link.html(expanded_icon);
		209	+ else {
		210	+ link.html(collapsed_icon);
		211	+ if (link.hasClass('category-root')) {
		212	+ category_expanded['block'] = 0;
		213	+ category_expanded['category'] = 0;
		214	+ }
		215	+ }
		216	+}
	@@ -4051,3 +4051,35 @@ h1#agenda-title {		@@ -4051,3 +4051,35 @@ h1#agenda-title {
4051	.treeitem .button{	4051	.treeitem .button{
4052	display: inline;	4052	display: inline;
4053	}	4053	}
		4054	+
		4055	+/* Categories block stuff */
		4056	+
		4057	+.categories-block ul {
		4058	+ margin: 0;
		4059	+ padding: 0;
		4060	+ float: left;
		4061	+}
		4062	+.categories-block li {
		4063	+ display: block;
		4064	+ float: left;
		4065	+ width: 100%;
		4066	+}
		4067	+.categories-block ul a {
		4068	+ text-decoration: none;
		4069	+ background-color: transparent;
		4070	+ border-bottom: 1px solid #fff;
		4071	+ border-color: #fff;
		4072	+ line-height: 22px;
		4073	+}
		4074	+.categories-block div {
		4075	+ clear: both;
		4076	+}
		4077	+.categories-block p {
		4078	+ clear: both;
		4079	+}
		4080	+.categories-block li a:hover {
		4081	+ text-decoration: none;
		4082	+}
		4083	+.categories-block .ui-icon {
		4084	+ margin-top: 2px;
		4085	+}
	@@ -6,7 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end		@@ -6,7 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
6		6
7	class EnvironmentDesignControllerTest < Test::Unit::TestCase	7	class EnvironmentDesignControllerTest < Test::Unit::TestCase
8		8
9	- ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock ]	9	+ ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock ]
10		10
11	def setup	11	def setup
12	@controller = EnvironmentDesignController.new	12	@controller = EnvironmentDesignController.new