Merge branch 'container-block'

Conflicts: plugins/display_content/lib/display_content_block.rb

Merge branch 'container-block'
Conflicts: plugins/display_content/lib/display_content_block.rb
Rodrigo Souto
2 parents 9238c40c 784eed66
Showing 30 changed files with 809 additions and 30 deletions Show diff stats
app/helpers/boxes_helper.rb
app/models/article.rb
app/models/article_block.rb
app/models/box.rb
app/views/box_organizer/_article_block.rhtml
lib/noosfero/core_ext/string.rb
plugins/container_block/controllers/admin/container_block_plugin_admin_controller.rb
plugins/container_block/controllers/container_block_plugin_controller.rb
plugins/container_block/controllers/myprofile/container_block_plugin_myprofile_controller.rb
plugins/container_block/lib/container_block_plugin.rb
plugins/container_block/lib/container_block_plugin/container_block.rb
plugins/container_block/public/images/handle_e.png
plugins/container_block/public/images/handle_w.png
plugins/container_block/public/images/scalable/handle.svg
plugins/container_block/public/style.css
plugins/container_block/test/functional/container_block_environment_design_controller_test.rb
plugins/container_block/test/functional/container_block_home_controller_test.rb
plugins/container_block/test/functional/container_block_plugin_admin_controller_test.rb
plugins/container_block/test/functional/container_block_plugin_controller_test.rb
plugins/container_block/test/functional/container_block_plugin_myprofile_controller_test.rb
@@ -102,14 +102,16 @@ module BoxesHelper
  
     result = filter_html(result, block)
  
-    box_decorator.block_target(block.box, block) +
-      content_tag('div',
-       content_tag('div',
+    content_tag('div',
+      box_decorator.block_target(block.box, block) +
+        content_tag('div',
          content_tag('div',
-           result + footer_content + box_decorator.block_edit_buttons(block),
-           :class => 'block-inner-2'),
-         :class => 'block-inner-1'),
-       options) +
+           content_tag('div',
+             result + footer_content + box_decorator.block_edit_buttons(block),
+             :class => 'block-inner-2'),
+           :class => 'block-inner-1'),
+       options),
+    :class => 'block-outer') +
     box_decorator.block_handle(block)
   end
  
@@ -225,15 +227,11 @@ module BoxesHelper
  
   # DEPRECATED. Do not use this.
   def import_blocks_stylesheets(options = {})
-    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block_css_class_name(b)}.uniq
+    @blocks_css_files ||= current_blocks.map{|b|'blocks/' + block.class.name.to_css_class}.uniq
     stylesheet_import(@blocks_css_files, options)
   end
-
-  def block_css_class_name(block)
-    block.class.name.underscore.gsub('_', '-')
-  end
   def block_css_classes(block)
-    classes = block_css_class_name(block)
+    classes = block.class.name.to_css_class
     classes += ' invisible-block' if block.display == 'never'
     classes
   end
@@ -157,7 +157,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def css_class_list
-    [self.class.name.underscore.dasherize]
+    [self.class.name.to_css_class]
   end
  
   def css_class_name
@@ -49,8 +49,8 @@ class ArticleBlock &lt; Block
   end
  
   def available_articles
-    return [] if self.box.nil? or self.box.owner.nil?
-    self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
+    return [] if self.owner.nil?
+    self.owner.kind_of?(Environment) ? self.owner.portal_community.articles : self.owner.articles
   end
  
   def posts_per_page
@@ -3,12 +3,15 @@ class Box &lt; ActiveRecord::Base
   acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
   has_many :blocks, :dependent => :destroy, :order => 'position'
  
+  include Noosfero::Plugin::HotSpot
+
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
  
   def acceptable_blocks
-    to_css_class_name central?  ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
+    blocks_classes = central?  ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :position => [2, 3])
+    to_css_class_name(blocks_classes)
   end
  
   def central?
@@ -74,8 +77,8 @@ class Box &lt; ActiveRecord::Base
  
   private
  
-  def to_css_class_name(blocks)
-    blocks.map{ |block| block.to_s.underscore.tr('_', '-') }
+  def to_css_class_name(blocks_classes)
+    blocks_classes.map{ |block_class| block_class.name.to_css_class }
   end
  
 end
 <div class="article-block-edition">
-<% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
+<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
   <p id="no_portal_community">
   <%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
   </p>
@@ -80,6 +80,10 @@ class String
     transliterate.downcase.gsub(/[^\w~\s:;+=_."'`-]/, '').gsub(/[\s:;+=_"'`-]+/, '-').gsub(/-$/, '').gsub(/^-/, '').to_s
   end
  
+  def to_css_class
+    underscore.dasherize.gsub('/','_')
+  end
+
   def fix_i18n
     self.sub('{fn} ', '')
   end
@@ -0,0 +1,5 @@
+class ContainerBlockPluginAdminController < AdminController
+  
+  include ContainerBlockPluginController
+
+end
@@ -0,0 +1,17 @@
+module ContainerBlockPluginController
+
+  def saveWidths
+    container = boxes_holder.blocks.find(params[:id])
+    pairs = params[:widths].split('|')
+    settings = container.children_settings
+    pairs.each do |pair|
+      id, width = pair.split(',')
+      settings[id.to_i] = {:width => width.to_i}
+    end
+    container.children_settings = settings
+    container.save!
+
+    render :text => _('Block successfully saved.')
+  end
+
+end
@@ -0,0 +1,5 @@
+class ContainerBlockPluginMyprofileController < MyProfileController
+  
+  include ContainerBlockPluginController
+
+end
@@ -0,0 +1,19 @@
+class ContainerBlockPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Container Block Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that add a container block.")
+  end
+
+  def self.extra_blocks
+    { ContainerBlockPlugin::ContainerBlock => {} }
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,59 @@
+class ContainerBlockPlugin::ContainerBlock < Block
+
+  after_create :create_box
+  after_destroy :destroy_children
+  after_destroy :destroy_box
+
+  settings_items :container_box_id, :type => Integer, :default => nil
+  settings_items :children_settings, :type => Hash, :default => {}
+
+  def self.description
+    _('Container')
+  end
+
+  def help
+    _('This block acts as a container for another blocks')
+  end
+
+  def layout_template
+    nil
+  end
+
+  def destroy_children
+    blocks.destroy_all
+  end
+
+  def create_box
+    box = Box.create!(:owner => owner)
+    settings[:container_box_id] = box.id
+    save!
+  end
+
+  def destroy_box
+    container_box.destroy
+  end
+
+  def container_box
+    owner.boxes.find(container_box_id)
+  end
+
+  def block_classes=(classes)
+    classes.each { |c| block = c.constantize.create!(:box => container_box) } if classes
+  end
+
+  def blocks
+    container_box.blocks
+  end
+
+  def child_width(child_id)
+    children_settings[child_id][:width] if children_settings[child_id]
+  end
+
+  def content(args={})
+    block = self
+    lambda do
+      render :file => 'blocks/container.rhtml', :locals => {:block => block}
+    end
+  end
+
+end
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="Novo documento 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="1290.448"
+     inkscape:cy="359.98856"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="825"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#b7b7b7;fill-opacity:0.8627451;stroke:#040400;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 188,288.93362 154.85715,0 c 0,0 -49.16601,97.1789 -54.28571,225.99999 -4.76678,119.94091 53.75423,244.90317 54.28571,241.71431 l -154.85715,0 z"
+       id="rect2988"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsccc"
+       inkscape:export-filename="/home/00838716598/participa/noosfero/plugins/container_block/public/images/handle_e.png"
+       inkscape:export-xdpi="5.2851791"
+       inkscape:export-ydpi="5.2851791" />
+    <path
+       style="fill:#737373;fill-opacity:0.8627451;stroke:#040400;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 448.57143,289.79464 c 0,0 -49.16155,97.17891 -54.28125,226 -1.03249,25.97926 0.92026,52.18412 4.59375,77.28125 8.75453,44.36315 22.00361,91.09021 31.90625,123.375 9.12115,24.76788 16.62682,40.25755 17.65625,41.0625 l 0.125,0 96.84375,0 0,-467.71875 -96.84375,0 z"
+       id="use3761"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="5"
+       inkscape:export-ydpi="5"
+       inkscape:export-filename="/home/00838716598/participa/noosfero/plugins/container_block/public/images/handle_w.png" />
+  </g>
+</svg>
@@ -0,0 +1,42 @@
+#content .boxes .container-block-plugin_container-block .container_block_child, .container-block-plugin_container-block .block-outer {
+  display: inline-block;
+  vertical-align: top;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+
+.container-block-plugin_container-block .block-target {
+  clear: both;
+}
+
+#content .boxes .container-block-plugin_container-block .block .icon-down, #content .boxes .container-block-plugin_container-block .block .icon-down-disabled {
+  background-image: url(/designs/icons/default/Tango/16x16/actions/go-next.png);
+}
+
+#content .boxes .container-block-plugin_container-block .block .icon-up, #content .boxes .container-block-plugin_container-block .block .icon-up-disabled {
+  background-image: url(/designs/icons/default/Tango/16x16/actions/go-previous.png);
+}
+
+#content .boxes .container-block-plugin_container-block .block {
+  outline-offset: -2px;
+}
+
+#content .boxes .container-block-plugin_container-block .block .ui-resizable-handle {
+  width: 10px;
+  height: 28px;
+  z-index: 0;
+}
+
+#content .boxes .container-block-plugin_container-block .block .ui-resizable-e {
+  right: -2px;
+  background-image: url(/plugins/container_block/images/handle_e.png);
+}
+
+#content .boxes .container-block-plugin_container-block .block .ui-resizable-w {
+  left: -2px;
+  background-image: url(/plugins/container_block/images/handle_w.png);
+}
+
+.container-block-plugin_container-block .button-bar .icon-resize {
+  background-image: url(/designs/icons/default/Tango/16x16/actions/view-fullscreen.png);
+}
@@ -0,0 +1,83 @@
+require 'test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e) 
+    raise e 
+  end 
+end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['ContainerBlockPlugin::ContainerBlock']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => @environment.boxes.first)
+  end
+
+  should 'be able to edit ContainerBlock' do
+    get :edit, :id => @block.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save ContainerBlock' do
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:title => 'Container' }
+    @block.reload
+    assert_equal 'Container', @block.title
+  end
+
+  should 'display container children' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    get :index
+    assert_tag :div, :attributes => { :id => "block-#{c1.id}" }
+  end
+
+  should 'display hidden children of container block' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content', :display => 'never')
+    get :index
+    assert_tag :div, :attributes => { :id => "block-#{c1.id}", :class => 'block raw-html-block invisible-block' }
+  end
+
+  should 'display button to save widths of container children' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    get :index
+    assert_tag :a, :attributes => { :class => "button icon-save container_block_save" }
+  end
+
+  should 'move child of container block to another box' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    get :move_block, :id => c1.id, :target => "end-of-box-#{@environment.boxes.last.id}"
+    assert_equal @environment.boxes.last, c1.reload.box
+  end
+
+  should 'move block to inside of a container block' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box => @environment.boxes.last, :html => 'child2 content')
+    get :move_block, :id => c2.id, :target => "before-block-#{c1.id}"
+    assert_equal @block.container_box, c2.reload.box
+  end
+
+  should 'move down a container block child' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')
+    get :move_block_down, :id => c1.id
+    assert_equal [c2, c1], @block.blocks
+  end
+
+  should 'move up a container block child' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')
+    get :move_block_up, :id => c2.id
+    assert_equal [c2, c1], @block.blocks
+  end
+
+end
@@ -0,0 +1,61 @@
+require 'test_helper'
+
+# Re-raise errors caught by the controller.
+class HomeController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e) 
+    raise e 
+  end 
+end
+
+class HomeControllerTest < ActionController::TestCase
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['ContainerBlockPlugin::ContainerBlock']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    box = Box.create!(:owner => @environment)
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => box)
+    
+    @environment.boxes = [box]
+  end
+
+  should 'display ContainerBlock' do
+    get :index
+    assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }
+  end
+
+  should 'display container children' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')
+    get :index
+    assert_tag :div, :attributes => { :id => "block-#{c1.id}" }
+    assert_tag :div, :attributes => { :id => "block-#{c2.id}" }
+  end
+
+  should 'display style tags for container children' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    @block.children_settings = { c1.id => {:width => "123"} }
+    @block.save!
+    get :index
+    assert_match /#block-#{c1.id} \{ width: 123px; \}/, @response.body
+  end
+
+  should 'do not display hidden children of container' do
+    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content', :display => 'never')
+    get :index
+    assert_no_tag :div, :attributes => { :id => "block-#{c1.id}" }
+  end
+
+  should 'do not display button to save widths of container children' do
+    get :index
+    assert_no_tag :a, :attributes => { :class => "button icon-save container_block_save" }
+  end
+
+end
@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class ContainerBlockPluginAdminControllerTest < ActionController::TestCase
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['ContainerBlockPlugin::ContainerBlock']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => @environment.boxes.first)
+    @child1 = Block.create!(:box => @block.container_box)
+    @child2 = Block.create!(:box => @block.container_box)
+  end
+
+  should 'save widths of container block children' do
+    xhr :post, :saveWidths, :id => @block.id, :widths => "#{@child1.id},100|#{@child2.id},200"
+    assert_response 200
+    assert_equal 'Block successfully saved.', @response.body
+    @block.reload
+    assert_equal 100, @block.child_width(@child1.id)
+    assert_equal 200, @block.child_width(@child2.id)
+  end
+
+end
@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class ContainerBlockPluginControllerTest < ActionController::TestCase
+
+  include ContainerBlockPluginController
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['ContainerBlockPlugin::ContainerBlock']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => @environment.boxes.first)
+    @child1 = Block.create!(:box => @block.container_box)
+    @child2 = Block.create!(:box => @block.container_box)
+    @environment = Environment.find(@environment.id)
+    stubs(:boxes_holder).returns(@environment)
+    @params = {}
+  end
+
+  attr_reader :params
+
+  should 'save widths of container block children' do
+    @params = {:id => @block.id, :widths => "#{@child1.id},100|#{@child2.id},200"}
+    expects(:render).with(:text => 'Block successfully saved.')
+    saveWidths
+    @block.reload
+    assert_equal 100, @block.child_width(@child1.id)
+    assert_equal 200, @block.child_width(@child2.id)
+  end
+
+  should 'do not change child width that is not passed in widths param' do
+    @block.children_settings = {@child2.id => {:width => 200}}
+    @block.save!
+    @params = {:id => @block.id, :widths => "#{@child1.id},100"}
+    expects(:render).with(:text => 'Block successfully saved.')
+    saveWidths
+    @block.reload
+    assert_equal 100, @block.child_width(@child1.id)
+    assert_equal 200, @block.child_width(@child2.id)
+  end
+
+end
@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class ContainerBlockPluginMyprofileControllerTest < ActionController::TestCase
+
+  def setup
+    user = create_user('testinguser')
+    login_as(user.login)
+
+    @profile = fast_create(Community)
+    @profile.add_admin(user.person)
+    @box = Box.new(:owner => @profile)
+
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+    @child1 = Block.create!(:box => @block.container_box)
+    @child2 = Block.create!(:box => @block.container_box)
+  end
+
+  should 'save widths of container block children' do
+    xhr :post, :saveWidths, :profile => @profile.identifier, :id => @block.id, :widths => "#{@child1.id},100|#{@child2.id},200"
+    assert_response 200
+    assert_equal 'Block successfully saved.', @response.body
+    @block.reload
+    assert_equal 100, @block.child_width(@child1.id)
+    assert_equal 200, @block.child_width(@child2.id)
+  end
+
+end
@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class BlockTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = fast_create(Environment)
+    @box = Box.create!(:owner => @environment)
+    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+  end
+
+  should 'return environment box if block owner is not a ContainerBlock' do
+    block = Block.create!(:box => @box)
+    assert_equal @box, block.box
+  end
+
+  should 'return container box if block owner is a ContainerBlock' do
+    block = Block.create!(:box => @container.container_box)
+    assert_equal @container.container_box, block.box
+  end
+
+  should 'return block owner if block onwer is not a ContainerBlock' do
+    block = Block.create!(:box => @box)
+    assert_equal @environment, block.owner
+  end
+
+  should 'return environment as owner if block onwer is a ContainerBlock' do
+    block = Block.create!(:box => @container.container_box)
+    assert_equal @environment, block.owner
+  end
+
+end
@@ -0,0 +1,92 @@
+require 'test_helper'
+
+class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
+
+  def setup
+    @block = ContainerBlockPlugin::ContainerBlock.new
+    @block.stubs(:owner).returns(Environment.default)
+  end
+
+  should 'describe yourself' do
+    assert !ContainerBlockPlugin::ContainerBlock.description.blank?
+  end
+
+  should 'has a help' do
+    assert !@block.help.blank?
+  end
+
+  should 'create a box on save' do
+    @block.save!
+    assert @block.container_box_id
+  end
+
+  should 'return created box' do
+    @block.save!
+    assert @block.container_box
+  end
+
+  should 'create new blocks when receive block classes' do
+    @block.save!
+    assert_difference Block, :count, 1 do
+      @block.block_classes = ['Block']
+    end
+    assert_equal Block, Block.last.class
+  end
+
+  should 'do not create blocks when nothing is passed as block classes' do
+    @block.save!
+    assert_no_difference Block, :count do
+      @block.block_classes = []
+    end
+  end
+
+  should 'do not create blocks when nil is passed as block classes' do
+    @block.save!
+    assert_no_difference Block, :count do
+      @block.block_classes = nil
+    end
+  end
+
+  should 'return a list of blocks associated with the container block' do
+    @block.save!
+    @block.block_classes = ['Block', 'Block']
+    assert_equal [Block, Block], @block.blocks.map(&:class)
+  end
+
+  should 'return child width' do
+    @block.children_settings = {1 => {:width => 10} }
+    @block.save!
+    assert_equal 10, @block.child_width(1)
+  end
+
+  should 'return nil in width if child do not exists' do
+    @block.children_settings = {2 => {:width => 10} }
+    @block.save!
+    assert_equal nil, @block.child_width(1)
+  end
+
+  should 'return nil at layout_template' do
+    assert_equal nil, @block.layout_template
+  end
+
+  should 'return children blocks that have container_box as box' do
+    @block.save!
+    child = Block.create!(:box_id => @block.container_box.id)
+    assert_equal [child], @block.blocks
+  end
+
+  should 'destroy chilrend when container is removed' do
+    @block.save!
+    child = Block.create!(:box_id => @block.container_box.id)
+    @block.destroy
+    assert !Block.exists?(child.id)
+  end
+
+  should 'destroy box when container is removed' do
+    @block.save!
+    assert_difference Box, :count, -1 do
+      @block.destroy
+    end
+  end
+
+end
@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class ContainerBlockPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = ContainerBlockPlugin.new
+  end
+
+  should 'has a name' do
+    assert !ContainerBlockPlugin.plugin_name.blank?
+  end
+
+  should 'has a description' do
+    assert !ContainerBlockPlugin.plugin_description.blank?
+  end
+  
+  should 'add a block' do
+    assert_equal [ContainerBlockPlugin::ContainerBlock], ContainerBlockPlugin.extra_blocks.keys
+  end
+
+  should 'has stylesheet' do
+    assert @plugin.stylesheet?
+  end
+
+end
@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class EnvironmentTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = fast_create(Environment)
+
+    @box = Box.create!(:owner => @environment)
+    @block = Block.create!(:box => @box)
+
+    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+  end
+
+  should 'return blocks as usual' do
+    assert_equal [@block, @container], @environment.blocks
+  end
+
+  should 'return blocks with container children' do
+    child = Block.create!(:box => @container.container_box)
+    assert_equal [@block, @container, child], @environment.blocks
+  end
+
+  should 'return block with id at find method' do
+    assert_equal @block, @environment.blocks.find(@block.id)
+  end
+
+  should 'return child block with id at find method' do
+    child = Block.create!(:box => @container.container_box)
+    assert_equal child, @environment.blocks.find(child.id)
+  end
+
+end
@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class ProfileTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Profile)
+
+    @box = Box.create!(:owner => @profile)
+    @block = Block.create!(:box => @box)
+
+    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+  end
+
+  should 'return blocks as usual' do
+    assert_equal [@block, @container], @profile.blocks
+  end
+
+  should 'return blocks with container children' do
+    child = Block.create!(:box => @container.container_box)
+    assert_equal [@block, @container, child], @profile.blocks
+  end
+
+  should 'return block with id at find method' do
+    assert_equal @block, @profile.blocks.find(@block.id)
+  end
+
+  should 'return child block with id at find method' do
+    child = Block.create!(:box => @container.container_box)
+    assert_equal child, @profile.blocks.find(child.id)
+  end
+
+end
@@ -0,0 +1,60 @@
+<% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>
+<% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
+
+
+<div class="box" id="box-<%= block.container_box.id %>">
+  <%= display_box_content(block.container_box, nil) %>
+  <div class="clear"></div>
+</div>
+<div class="clear"></div>
+
+<style>
+  <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %>
+    #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
+  <% end %>
+</style>
+
+<% if edit_mode %>
+  <div class="button-bar">
+    <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
+    <%= link_to_remote '', :url => { :controller => @controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id }, 
+                           :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})", 
+    :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
+                           :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
+                           :loaded => "close_loading();",
+                           :complete => "display_notice(request.responseText);"%>
+  </div>
+
+  <script>
+    function toggleMoveContainerChildren(container, box) {
+      var div = jQuery('#box-'+box+' > .block-outer > .block');
+      var targetDiv = jQuery('#box-'+box+' .block-outer .block-target');
+      if(div.is('.ui-resizable')) {
+        targetDiv.show();
+        div.find("a").die("click");
+        div.resizable('destroy');
+      } else {
+        targetDiv.hide();
+        div.find("a").live("click", function(e) {
+          e.preventDefault();
+        });
+        div.resizable({
+          handles: 'e, w',
+          containment: '#block-'+container+' .block-inner-2',
+          resize: function( event, ui ) {
+            ui.element.height('auto');
+          }
+        });
+      }
+    }
+
+    function containerChildrenWidth(container, box) {
+      widths = "";
+      jQuery('#box-'+box+' > .block-outer > .block').each(function(i) { 
+        childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
+        widths+=childId+","+jQuery(this).width()+"|";
+      });
+      return "widths="+widths;
+    }
+  </script>
+<% end %>
@@ -120,12 +120,12 @@ class DisplayContentBlock &lt; Block
   protected
  
   def holder
-    return nil if self.box.nil? || self.box.owner.nil?
-    if self.box.owner.kind_of?(Environment)
-      return nil if self.box.owner.portal_community.nil?
-      self.box.owner.portal_community
+    return nil if self.box.nil? || self.owner.nil?
+    if self.owner.kind_of?(Environment) 
+      return nil if self.owner.portal_community.nil?
+      self.owner.portal_community
     else
-      self.box.owner
+      self.owner
     end
   end
  
 require File.dirname(__FILE__) + '/../test_helper'
  
 class BoxTest < ActiveSupport::TestCase
+
+  def setup
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+  end
+
   should 'retrieve environment based on owner' do
     profile = fast_create(Profile)
     box = fast_create(Box, :owner_id => profile.id, :owner_type => 'Profile')
@@ -84,4 +89,34 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert blocks.include?('tags-block')
   end
  
+  should 'list plugin block as allowed for box at position 1' do
+    class SomePlugin < Noosfero::Plugin
+      def self.extra_blocks
+        { PluginBlock => {:position => 1} }
+      end
+    end
+    class PluginBlock < Block
+      def self.to_s; 'plugin-block'; end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
+
+    blocks = Box.new(:position => 1).acceptable_blocks
+    assert blocks.include?('plugin-block')
+  end
+
+  should 'list plugin block as allowed for box at position 2' do
+    class SomePlugin < Noosfero::Plugin
+      def self.extra_blocks
+        { PluginBlock => {:position => 2} }
+      end
+    end
+    class PluginBlock < Block
+      def self.to_s; 'plugin-block'; end
+    end
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
+
+    blocks = Box.new(:position => 2).acceptable_blocks
+    assert blocks.include?('plugin-block')
+  end
+
 end
@@ -96,11 +96,6 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
     assert_tag_in_string insert_boxes('main content'), :tag => "div", :attributes => { :id => 'profile-footer' }, :content => 'my custom footer'
   end
  
-  should 'calculate CSS class names correctly' do
-    assert_equal 'slideshow-block', block_css_class_name(SlideshowBlock.new)
-    assert_equal 'main-block', block_css_class_name(MainBlock.new)
-  end
-
   should 'add invisible CSS class name for invisible blocks' do
     assert !block_css_classes(Block.new(:display => 'always')).split.any? { |item| item == 'invisible-block'}
     assert block_css_classes(Block.new(:display => 'never')).split.any? { |item| item == 'invisible-block'}
@@ -33,4 +33,8 @@ class StringCoreExtTest &lt; ActiveSupport::TestCase
     assert_equal 'aaaaaaAAAAAeeeeEEOOoocaaaiIIiuuyYnNcC', 'ªáàäâåÁÀÄÂÅéèëêÊËÖÔöôçäàâîÏÎïûüÿŸñÑçÇ'.transliterate
   end
  
+  should 'convert to css class' do
+    assert_equal 'spaceship-propulsion_warp-core', "SpaceshipPropulsion::WarpCore".to_css_class
+  end
+
 end
...	...	@@ -102,14 +102,16 @@ module BoxesHelper
102	102
103	103	result = filter_html(result, block)
104	104
105		- box_decorator.block_target(block.box, block) +
106		- content_tag('div',
107		- content_tag('div',
	105	+ content_tag('div',
	106	+ box_decorator.block_target(block.box, block) +
	107	+ content_tag('div',
108	108	content_tag('div',
109		- result + footer_content + box_decorator.block_edit_buttons(block),
110		- :class => 'block-inner-2'),
111		- :class => 'block-inner-1'),
112		- options) +
	109	+ content_tag('div',
	110	+ result + footer_content + box_decorator.block_edit_buttons(block),
	111	+ :class => 'block-inner-2'),
	112	+ :class => 'block-inner-1'),
	113	+ options),
	114	+ :class => 'block-outer') +
113	115	box_decorator.block_handle(block)
114	116	end
115	117
...	...	@@ -225,15 +227,11 @@ module BoxesHelper
225	227
226	228	# DEPRECATED. Do not use this.
227	229	def import_blocks_stylesheets(options = {})
228		- @blocks_css_files \|\|= current_blocks.map{\|b\|'blocks/' + block_css_class_name(b)}.uniq
	230	+ @blocks_css_files \|\|= current_blocks.map{\|b\|'blocks/' + block.class.name.to_css_class}.uniq
229	231	stylesheet_import(@blocks_css_files, options)
230	232	end
231		-
232		- def block_css_class_name(block)
233		- block.class.name.underscore.gsub('_', '-')
234		- end
235	233	def block_css_classes(block)
236		- classes = block_css_class_name(block)
	234	+ classes = block.class.name.to_css_class
237	235	classes += ' invisible-block' if block.display == 'never'
238	236	classes
239	237	end
...	...
...	...	@@ -157,7 +157,7 @@ class Article < ActiveRecord::Base
157	157	end
158	158
159	159	def css_class_list
160		- [self.class.name.underscore.dasherize]
	160	+ [self.class.name.to_css_class]
161	161	end
162	162
163	163	def css_class_name
...	...
...	...	@@ -49,8 +49,8 @@ class ArticleBlock < Block
49	49	end
50	50
51	51	def available_articles
52		- return [] if self.box.nil? or self.box.owner.nil?
53		- self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
	52	+ return [] if self.owner.nil?
	53	+ self.owner.kind_of?(Environment) ? self.owner.portal_community.articles : self.owner.articles
54	54	end
55	55
56	56	def posts_per_page
...	...
...	...	@@ -3,12 +3,15 @@ class Box < ActiveRecord::Base
3	3	acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
4	4	has_many :blocks, :dependent => :destroy, :order => 'position'
5	5
	6	+ include Noosfero::Plugin::HotSpot
	7	+
6	8	def environment
7	9	owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
8	10	end
9	11
10	12	def acceptable_blocks
11		- to_css_class_name central? ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
	13	+ blocks_classes = central? ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :position => [2, 3])
	14	+ to_css_class_name(blocks_classes)
12	15	end
13	16
14	17	def central?
...	...	@@ -74,8 +77,8 @@ class Box < ActiveRecord::Base
74	77
75	78	private
76	79
77		- def to_css_class_name(blocks)
78		- blocks.map{ \|block\| block.to_s.underscore.tr('_', '-') }
	80	+ def to_css_class_name(blocks_classes)
	81	+ blocks_classes.map{ \|block_class\| block_class.name.to_css_class }
79	82	end
80	83
81	84	end
...	...
1	1	<div class="article-block-edition">
2		-<% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
	2	+<% if @block.owner.kind_of?(Environment) and @block.owner.portal_community.nil? %>
3	3	<p id="no_portal_community">
4	4	<%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>
5	5	</p>
...	...
...	...	@@ -80,6 +80,10 @@ class String
80	80	transliterate.downcase.gsub(/[^\w~\s:;+=_."'`-]/, '').gsub(/[\s:;+=_"'`-]+/, '-').gsub(/-$/, '').gsub(/^-/, '').to_s
81	81	end
82	82
	83	+ def to_css_class
	84	+ underscore.dasherize.gsub('/','_')
	85	+ end
	86	+
83	87	def fix_i18n
84	88	self.sub('{fn} ', '')
85	89	end
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class ContainerBlockPluginAdminController < AdminController
	2	+
	3	+ include ContainerBlockPluginController
	4	+
	5	+end
...	...
...	...	@@ -0,0 +1,17 @@
	1	+module ContainerBlockPluginController
	2	+
	3	+ def saveWidths
	4	+ container = boxes_holder.blocks.find(params[:id])
	5	+ pairs = params[:widths].split('\|')
	6	+ settings = container.children_settings
	7	+ pairs.each do \|pair\|
	8	+ id, width = pair.split(',')
	9	+ settings[id.to_i] = {:width => width.to_i}
	10	+ end
	11	+ container.children_settings = settings
	12	+ container.save!
	13	+
	14	+ render :text => _('Block successfully saved.')
	15	+ end
	16	+
	17	+end
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class ContainerBlockPluginMyprofileController < MyProfileController
	2	+
	3	+ include ContainerBlockPluginController
	4	+
	5	+end
...	...
...	...	@@ -0,0 +1,19 @@
	1	+class ContainerBlockPlugin < Noosfero::Plugin
	2	+
	3	+ def self.plugin_name
	4	+ "Container Block Plugin"
	5	+ end
	6	+
	7	+ def self.plugin_description
	8	+ _("A plugin that add a container block.")
	9	+ end
	10	+
	11	+ def self.extra_blocks
	12	+ { ContainerBlockPlugin::ContainerBlock => {} }
	13	+ end
	14	+
	15	+ def stylesheet?
	16	+ true
	17	+ end
	18	+
	19	+end
...	...