ActionItem152: removed design plugin; adding a home-made block manager

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

ActionItem152: removed design plugin; adding a home-made block manager
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1202 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 438ab96e
Showing 39 changed files with 592 additions and 58 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/edit_template_controller.rb
app/controllers/application.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/category_controller.rb
app/controllers/public/home_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/models/block.rb
app/models/box.rb
app/models/environment.rb
app/models/link_block.rb
app/models/main_block.rb
app/models/profile.rb
app/models/recent_documents_block.rb
app/views/box_organizer/index.rhtml
@@ -8,7 +8,9 @@ class AdminPanelController &lt; AdminController
   # as the default holder
   before_filter :load_default_enviroment
  
-  design :holder => 'environment'
+  def boxes_holder
+    environment
+  end
  
   protected
  
 class EditTemplateController < AdminController
  
-  design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
+  #FIXME
+  #design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
  
   def block_types
     %w[
@@ -5,7 +5,14 @@ class ApplicationController &lt; ActionController::Base
   helper :document
   helper :language
  
-  design :holder => 'environment'
+  def boxes_holder
+    environment
+  end
+
+  def boxes_editor?
+    false
+  end
+  protected :boxes_editor?
  
   def self.no_design_blocks
     @no_design_blocks = true
@@ -0,0 +1,52 @@
+class BoxOrganizerController < ApplicationController
+
+  def move_block
+    @block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
+
+    @source_box = @block.box
+
+    target_position = nil
+
+    if (params[:target] =~ /before-block-([0-9]+)/)
+      block_before = boxes_holder.blocks.find($1)
+      target_position = block_before.position
+
+      @target_box = block_before.box
+    else
+      (params[:target] =~ /end-of-box-([0-9])+/)
+
+      @target_box = boxes_holder.boxes.find($1)
+    end
+
+    if (@source_box != @target_box)
+      @block.remove_from_list
+      @block.box = @target_box
+    end
+
+    if target_position.nil?
+      # insert in the end of the box
+      @block.insert_at(@target_box.blocks.size + 1)
+      @block.move_to_bottom
+    else
+      # insert the block in the given position
+      @block.insert_at(@block.position && @block.position < target_position ? target_position - 1 : target_position)
+    end
+
+    @block.save!
+
+    @target_box.reload
+  end
+
+  def move_block_down
+    @block = boxes_holder.blocks.find(params[:id])
+    @block.move_lower
+    redirect_to :back
+  end
+
+  def move_block_up
+    @block = boxes_holder.blocks.find(params[:id])
+    @block.move_higher
+    redirect_to :back
+  end
+
+end
@@ -2,7 +2,9 @@ class CmsController &lt; MyProfileController
  
   protect 'post_content', :profile, :only => [:edit, :new, :reorder, :delete]
  
-  design :holder => :profile
+  def boxes_holder
+    profile
+  end
  
   include CmsHelper
  
@@ -11,6 +13,7 @@ class CmsController &lt; MyProfileController
     TextileArticle,
     RssFeed,
     UploadedFile,
+    ImageGallery,
   ]
  
   def view
@@ -0,0 +1,14 @@
+class ProfileDesignController < BoxOrganizerController
+
+  needs_profile
+
+  def index
+    render :text => '...', :layout => true
+  end
+
+  def boxes_editor?
+    true
+  end
+  protected :boxes_editor?
+
+end
@@ -4,7 +4,8 @@ class ProfileEditorController &lt; MyProfileController
  
   helper :profile
  
-  design_editor :holder => 'profile',:autosave => true, :block_types => :block_types
+  # FIXME
+  #design_editor :holder => 'profile',:autosave => true, :block_types => :block_types
  
  
    def block_types
@@ -2,8 +2,6 @@ class AccountController &lt; PublicController
  
   before_filter :load_default_environment
  
-  design :holder => 'environment'
-
   # say something nice, you goof!  something sweet.
   def index
     unless logged_in?
@@ -5,7 +5,9 @@ class CategoryController &lt; ApplicationController
   #FIXME This is not necessary because the application controller define the envrioment 
   # as the default holder
  
-  design :holder => 'environment'
+  def boxes_holder
+    environment
+  end
  
   def load_default_enviroment
     @environment = Environment.default
 class HomeController < PublicController
  
-  design :holder => 'environment'
-
   def index
     @articles = TextArticle.recent(nil, 10)
   end
@@ -5,6 +5,8 @@ module ApplicationHelper
   include PermissionName
  
   include LightboxHelper
+
+  include BoxesHelper
  
   # Displays context help. You can pass the content of the help message as the
   # first parameter or using template code inside a block passed to this
@@ -144,14 +146,6 @@ module ApplicationHelper
     end
   end
  
-  def search_box
-    [form_tag({:controller => 'search', :action => 'index'}, :method => 'get'),
-      design_display_button_submit('find', '', :title => _('Search')),
-      text_field_tag( 'query', _('your search here'), :id => "input_search", :onfocus => 'javascript: if (this.value == %s) { this.value = ""; }' % _('your search here').inspect, :onblur => "javascript: if (this.value == '') { this.value = %s}" % _('your search here').inspect),
-       '</form>',
-    ].join("\n") 
-  end
-
   def footer
     # FIXME: add some information from the environment
     [
@@ -267,7 +261,11 @@ module ApplicationHelper
   end
  
   def button(type, label, url, html_options = {})
-    design_display_button(type, label, url, { :class => 'with_text' }.merge(html_options))
+    the_class = "button #{type}"
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    link_to(content_tag('span', label), url, html_options.merge(:class => the_class ))
   end
  
   def submit_button(type, label, html_options = {})
@@ -275,20 +273,28 @@ module ApplicationHelper
  
     html_options[:class] = [html_options[:class], 'submit'].compact.join(' ')
  
-    bt_submit = design_display_button_submit(type, label, { :class => 'with_text' }.merge(html_options))
-    content_tag('p', bt_submit + bt_cancel, :class => 'submitline') 
+    the_class = "button with_text #{type}"
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+
+    bt_submit = submit_tag(label, html_options.merge(:class => the_class))
  
+    content_tag('p', bt_submit + bt_cancel, :class => 'submitline') 
   end
  
   def button_to_function(type, label, js_code, html_options = {})
-    #design_display_function_button(type, label, js_code, { :class => 'with_text' }.merge(html_options))
     html_options[:class] = "" unless html_options[:class]
     html_options[:class] << " button #{type}"
     link_to_function(label, js_code, html_options)
   end
  
-  def icon(icon_name)
-    design_display_icon(icon_name)
+  def icon(icon_name, html_options = {})
+    the_class = "button #{icon_name}"
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    content_tag('div', '', html_options.merge(:class => the_class))
   end
  
   def button_bar(options = {}, &block)
@@ -0,0 +1,109 @@
+module BoxesHelper
+
+  def box_decorator
+    @box_decorator || DontMoveBlocks
+  end
+
+  def with_box_decorator(dec, &block)
+    @box_decorator = dec
+    result = block.call
+    @box_decorator = DontMoveBlocks
+
+    result
+  end
+
+  def display_boxes_editor(holder)
+    with_box_decorator self do
+      content_tag('div', display_boxes(holder, '&lt;' + _('Main content') + '&gt;'), :id => 'box-organizer')
+    end
+  end
+
+  def display_boxes(holder, main_content)
+    boxes = holder.boxes.first(holder.boxes_limit)
+    content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
+    content = main_content if (content.blank?)
+    content_tag('div', content, :class => 'boxes', :id => 'boxes' )
+  end
+
+  def display_box(box, main_content)
+    content_tag('div', content_tag('div', display_box_content(box, main_content), :class => 'blocks'), :class => 'box', :id => "box-#{box.position}" )
+  end
+
+  def display_updated_box(box)
+    with_box_decorator self do
+      display_box_content(box, '&lt;' + _('Main content') + '&gt;')
+    end
+  end
+
+  def display_box_content(box, main_content)
+    box.blocks.map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
+  end
+
+  def display_block(block, main_content = nil)
+    content = block.content(main_content)
+    result = 
+      case content
+      when Hash
+        content_tag('iframe', '', :src => url_for(content))
+      when String
+        if content =~ /^https?:\/\//
+          content_tag('iframe', '', :src => content)
+        else
+          content
+        end
+      end
+
+    classes = ['block', block.class.name.underscore.gsub('_', '-') ].uniq.join(' ')
+
+    box_decorator.block_target(block.box, block) + content_tag('div', result + box_decorator.block_move_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block)
+  end
+
+  module DontMoveBlocks
+    # does nothing
+    def self.block_target(box, block = nil)
+      ''
+    end
+    # does nothing
+    def self.block_handle(block)
+      ''
+    end
+    def self.block_move_buttons(block)
+      ''
+    end
+  end
+
+  # generates a place where you can drop a block and get the block moved to
+  # there.
+  #
+  # If +block+ is not nil, then it means "place the dropped block before this
+  # one.". Otherwise, it means "place the dropped block at the end of the
+  # list"
+  #
+  # +box+ is always needed
+  def block_target(box, block = nil)
+    id =
+      if block.nil?
+        "end-of-box-#{box.id}"
+      else
+        "before-block-#{block.id}"
+      end
+
+    content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => 'block', :hoverclass => 'block-target-hover')
+  end
+
+  # makes the given block draggable so it can be moved away.
+  def block_handle(block)
+    draggable_element("block-#{block.id}", :revert => true)
+  end
+
+  def block_move_buttons(block)
+    buttons = []
+
+    # FIXME hardcoded paths !!!
+    buttons << link_to(image_tag('/designs/icons/default/gtk-go-up.png', :alt => _('Move block up')), { :action => 'move_block_up', :id => block.id }, { :method => 'post' }) unless block.first?
+    buttons << link_to(image_tag('/designs/icons/default/gtk-go-down.png', :alt => _('Move block down')), { :action => 'move_block_down' ,:id => block.id }, { :method => 'post'}) unless block.last?
+
+    content_tag('div', buttons.join("\n"), :class => 'block-move-buttons')
+  end
+
+end
@@ -0,0 +1,13 @@
+class Block < ActiveRecord::Base
+  acts_as_list :scope => :box
+  belongs_to :box
+
+  def content(main_content = nil)
+    "This is block number %d" % self.id
+  end
+
+  def editor
+    { :controller => 'block_editor', :id => self.id }
+  end
+
+end
@@ -0,0 +1,5 @@
+class Box < ActiveRecord::Base
+  belongs_to :owner, :polymorphic => true
+  acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
+  has_many :blocks, :dependent => :destroy, :order => 'position'
+end
@@ -25,7 +25,14 @@ class Environment &lt; ActiveRecord::Base
   # Relationships and applied behaviour
   # #################################################
  
-  acts_as_design
+  acts_as_having_boxes
+
+  after_create do |env|
+    3.times do
+      env.boxes << Box.new
+    end
+    env.boxes.first.blocks << MainBlock.new
+  end
  
   # One Environment can be reached by many domains
   has_many :domains, :as => :owner
-class LinkBlock < Design::Block
+class LinkBlock < Block
  
   def content
     Profile.find(:all).map{|p| p.name}
@@ -0,0 +1,7 @@
+class MainBlock < Block
+
+  def content(main_content = nil)
+    main_content
+  end
+
+end
@@ -14,7 +14,7 @@ class Profile &lt; ActiveRecord::Base
  
   acts_as_accessible
  
-  acts_as_design
+  acts_as_having_boxes
  
   acts_as_searchable :fields => [ :name, :identifier ]
  
@@ -81,6 +81,13 @@ class Profile &lt; ActiveRecord::Base
     self.environment ||= Environment.default
   end
  
+  after_create do |profile|
+    3.times do
+      profile.boxes << Box.new
+    end
+    profile.boxes.first.blocks << MainBlock.new
+  end
+
   # Returns information about the profile's owner that was made public by
   # him/her.
   #
-class RecentDocumentsBlock < Design::Block
+class RecentDocumentsBlock < Block
  
   def content
     lambda do
@@ -0,0 +1,3 @@
+<h1>testing</h1>
+
+This is a test ... and this is a sample text.
@@ -0,0 +1,8 @@
+from = "box-#{@source_box.position}"
+to = "box-#{@target_box.position}"
+
+page.replace_html(from, display_updated_box(@source_box))
+page.replace_html(to, display_updated_box(@target_box))
+
+page.visual_effect(:highlight, from)
+page.visual_effect(:highlight, to) unless (from == to)
@@ -10,12 +10,17 @@
     </title>
     <meta name="description" content="FIXME: Descriptions of Noosfero" />
     <meta name="keywords" content="Noosfero, Community, Open Source" />
-    <%= design_all_header_tags %>
     <%= stylesheet_link_tag 'common' %>
     <%= stylesheet_link_tag 'help' %>
     <%= stylesheet_link_tag 'menu' %>
     <%= stylesheet_link_tag 'button' %>
     <%= stylesheet_link_tag 'search' %>
+    <%= stylesheet_link_tag 'blocks' %>
+
+    <%# FIXME %>
+    <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
+
+    <%= javascript_include_tag(:defaults) %>
     <%= javascript_include_tag 'menu' %>
     <%= include_lightbox_header %>
     <%# cms stuff %>
@@ -70,10 +75,15 @@
           <div id='header_content'>
           </div>
  
-          <% if uses_design_blocks?  %>
-            <%= design_display(yield) %>
-          <% else %>
+          <% if @controller.send(:boxes_editor?) %>
             <%= yield %>
+            <%= display_boxes_editor(@controller.boxes_holder) %>
+          <% else %>
+            <% if uses_design_blocks?  %>
+              <%= display_boxes(@controller.boxes_holder, yield) %>
+            <% else %>
+              <%= yield %>
+            <% end %>
           <% end %>
  
         </div><!-- id="content" -->
@@ -0,0 +1 @@
+box_organizer/
 \ No newline at end of file
@@ -80,6 +80,7 @@ require &#39;noosfero/transliterations&#39;
  
 require 'acts_as_filesystem'
 require 'acts_as_searchable'
+require 'acts_as_having_boxes'
  
 # to the hell, I want all my models loaded before the application run anything
 Dir.glob("#{RAILS_ROOT}/app/models/*.rb").each do |model|
 class AddDesignSupport < ActiveRecord::Migration
   def self.up
-    create_table :design_boxes do |t|
-      t.column :name,       :string
-      t.column :title,      :string
-      t.column :number,     :integer
+
+    create_table :boxes do |t|
       t.column :owner_type, :string
       t.column :owner_id,   :integer
+
+      # acts_as_list
+      t.column :position, :integer
     end
  
-    create_table :design_blocks do |t|
+    create_table :blocks do |t|
       t.column :title,    :string
       t.column :box_id,   :integer
-      t.column :position, :integer
       t.column :type,     :string
       t.column :settings,     :text
+
+      # acts_as_list
+      t.column :position, :integer
     end
  
   end
  
   def self.down
-    drop_table :design_boxes
-    drop_table :design_blocks
+    drop_table :boxes
+    drop_table :blocks
   end
  
 end
@@ -0,0 +1,36 @@
+module ActsAsHavingBoxes
+
+  module ClassMethods
+    def  acts_as_having_boxes
+      has_many :boxes, :as => :owner, :dependent => :destroy, :order => 'position'
+      self.send(:include, ActsAsHavingBoxes)
+    end
+  end
+
+  module BlockArray
+    def find(id)
+      select { |item| item.id == id.to_i }.first
+    end
+  end
+
+  def blocks(reload = false)
+    if (reload)
+      @blocks = nil
+    end
+    if @blocks.nil?
+      @blocks = boxes.inject([]) do |acc,obj|
+        acc.concat(obj.blocks)
+      end
+      @blocks.send(:extend, BlockArray)
+    end
+    @blocks
+  end
+
+  # returns 3 unless the class table has a boxes_limit column. In that case
+  # return the value of the column. 
+  def boxes_limit
+    self[:boxes_limit] || 3
+  end
+end
+
+ActiveRecord::Base.extend(ActsAsHavingBoxes::ClassMethods)
@@ -3,7 +3,9 @@ module NeedsProfile
   module ClassMethods
     def needs_profile
       before_filter :load_profile
-      design :holder => 'profile' 
+      def boxes_holder
+        profile
+      end
     end
   end
  
@@ -34,6 +34,8 @@ gtk-find.png              Nuovo        stock/
 gtk-go-back-ltr.png       Nuovo        stock/
 gtk-media-next-ltr.png    Nuovo        stock/
 gtk-add.png               Nuovo        stock/
+gtk-go-up.png             Nuovo        stock/
+gtk-go-down.png           Nuovo        stock/
 ### END OF ICONS LISTING ###
  
 Licensing of GNOME themes
@@ -14,3 +14,5 @@
 .button.back { background-image: url(gtk-go-back-ltr.png); }
 .button.next { background-image: url(gtk-media-next-ltr.png); }
 .button.add { background-image: url(gtk-add.png); }
+.button.up { background-image: url(gtk-go-up.png); }
+.button.down { background-image: url(gtk-go-down.png); }
@@ -0,0 +1,58 @@
+
+/* main box */
+#box-1 {
+  margin-left: 210px;
+  margin-right: 210px;
+}
+
+#box-2 {
+  float: left;
+  width: 200px;
+}
+
+#box-3 {
+  float: right;
+  width: 200px;
+}
+
+
+.block {
+  margin: 5px;
+  padding: 5px;
+}
+
+.block-target {
+  margin: 5px;
+  height: 2px;
+  height: 15px;
+  border: 1px dashed #e0e0e0;
+}
+
+.block-target-hover {
+  background: #ffd;
+  border: 1px solid red;
+  height: 30px;
+}
+
+.block iframe {
+  width: 100%;
+  border: none;
+}
+
+/***********************************************************
+ * put borders around boxes and blocks when organizing boxes
+ ***********************************************************/
+
+#box-organizer .box {
+  border: 1px solid #ccc;
+}
+
+#box-organizer #box-1 .block {
+  border: 2px dashed green;
+}
+#box-organizer #box-2 .block {
+  border: 2px dashed red;
+}
+#box-organizer #box-3 .block {
+  border: 2px dashed blue;
+}
@@ -107,7 +107,7 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
  
   should 'use design plugin to generate blocks' do
     get :index
-    assert_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'design_boxes' }
+    assert_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' }
   end
  
   should 'not use design plugin when tells so' do
@@ -116,6 +116,6 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
     end
     @controller = NoDesignBlocksTestController.new
     get :index
-    assert_no_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'design_boxes'  }
+    assert_no_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes'  }
   end
 end
@@ -0,0 +1,135 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'profile_design_controller'
+
+class ProfileDesignController; def rescue_action(e) raise e end; end
+
+class ProfileDesignControllerTest < Test::Unit::TestCase
+  
+  def setup
+    @controller = ProfileDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    holder = create_user('designtestuser').person
+    holder.save!
+ 
+    @box1 = Box.new
+    @box2 = Box.new
+    @box3 = Box.new
+
+    holder.boxes << @box1
+    holder.boxes << @box2
+    holder.boxes << @box3
+
+    ###### BOX 1
+    @b1 = Block.new
+    @box1.blocks << @b1
+    @b1.save!
+
+    @b2 = Block.new
+    @box1.blocks << @b2
+    @b2.save!
+    
+    ###### BOX 2
+    @b3 = Block.new
+    @box2.blocks << @b3
+    @b3.save!
+
+    @b4 = MainBlock.new
+    @box2.blocks << @b4
+    @b4.save!
+
+    @b5 = Block.new
+    @box2.blocks << @b5
+    @b5.save!
+
+    @b6 = Block.new
+    @box2.blocks << @b6
+    @b6.save!
+    
+    ###### BOX 3
+    @b7 = Block.new
+    @box3.blocks << @b7
+    @b7.save!
+
+    @b8 = Block.new
+    @box3.blocks << @b8
+    @b8.save!
+
+    @request.env['HTTP_REFERER'] = '/editor'
+
+    @controller.expects(:boxes_holder).returns(holder).at_least_once
+  end
+
+  def test_should_move_block_to_the_end_of_another_block
+    get :move_block, :profile => 'ze', :id => "block-#{@b1.id}", :target => "end-of-box-#{@box2.id}"
+
+    assert_response :success
+
+    @b1.reload
+    @box2.reload
+
+    assert_equal @box2, @b1.box
+    assert @b1.in_list?
+    assert_equal @box2.blocks.size, @b1.position # i.e. assert @b1.last?
+  end
+
+  def test_should_move_block_to_the_middle_of_another_block
+    # block 4 is in box 2
+    get :move_block, :profile => 'ze', :id => "block-#{@b1.id}", :target => "before-block-#{@b4.id}"
+
+    assert_response :success
+
+    @b1.reload
+    @b4.reload
+
+    assert_equal @b4.box, @b1.box
+    assert @b1.in_list?
+    assert_equal @b4.position - 1, @b1.position
+  end
+
+  def test_block_can_be_moved_up
+    get :move_block, :profile => 'ze', :id => "block-#{@b4.id}", :target => "before-block-#{@b3.id}"
+
+    assert_response :success
+    @b4.reload
+    @b3.reload
+
+    assert_equal @b3.position - 1, @b4.position
+  end
+
+  def test_block_can_be_moved_down
+    assert_equal [1,2,3], [@b3,@b4,@b5].map {|item| item.position}
+
+    # b3 -> before b5
+    get :move_block, :profile => 'ze', :id => "block-#{@b3.id}", :target => "before-block-#{@b5.id}"
+
+    [@b3,@b4,@b5].each do |item|
+      item.reload
+    end
+
+    assert_equal [1,2,3],  [@b4, @b3, @b5].map {|item| item.position}
+  end
+
+  def test_should_be_able_to_move_block_directly_down
+    post :move_block_down, :profile => 'ze', :id => @b1.id
+    assert_response :redirect
+
+    @b1.reload
+    @b2.reload
+
+    assert_equal [1,2], [@b2,@b1].map {|item| item.position}
+  end
+
+  def test_should_be_able_to_move_block_directly_up
+    post :move_block_up, :profile => 'ze', :id => @b2.id
+    assert_response :redirect
+
+    @b1.reload
+    @b2.reload
+
+    assert_equal [1,2], [@b2,@b1].map {|item| item.position}
+  end
+
+end
+
@@ -27,7 +27,7 @@ class RegionValidatorsControllerTest &lt; Test::Unit::TestCase
     environment.regions << region
     assert !region.new_record?
  
-    @controller.expects(:environment).returns(environment)
+    @controller.expects(:environment).returns(environment).at_least_once
  
     get :region, :id => region.id
  
@@ -80,12 +80,13 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/cat', :controller => 'category', :action => 'index')
   end
  
-  def test_routing_to_controllers_inside_design_blocks_directory
-    assert_routing('/block/cojones/favorite_links_profile/show/1', :profile => 'cojones', :controller => 'favorite_links_profile', :action => 'show', :id => '1')
-    assert_routing('/block/cojones/favorite_links_profile/save', :profile => 'cojones', :controller => 'favorite_links_profile', :action => 'save')
+  #FIXME remove this if design_blocks is not going to be used; or uncomment otherwise;
+  #def test_routing_to_controllers_inside_design_blocks_directory
+  #  assert_routing('/block/cojones/favorite_links_profile/show/1', :profile => 'cojones', :controller => 'favorite_links_profile', :action => 'show', :id => '1')
+  #  assert_routing('/block/cojones/favorite_links_profile/save', :profile => 'cojones', :controller => 'favorite_links_profile', :action => 'save')
  
-    assert_routing('/block/cojones/list_block/show/1', :profile => 'cojones', :controller => 'list_block', :action => 'show', :id => '1')
-  end
+  #  assert_routing('/block/cojones/list_block/show/1', :profile => 'cojones', :controller => 'list_block', :action => 'show', :id => '1')
+  #end
  
   def test_tag_viewing
     assert_routing('/tag', :controller => 'search', :action => 'tags')
@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActsAsHavingBoxesTest < Test::Unit::TestCase
+
+  should 'be able to find blocks by id' do
+    env = Environment.create!(:name => 'my test environment')
+    env.boxes.destroy_all
+
+    env.boxes << Box.new
+    block = Block.new
+    env.boxes.first.blocks << block
+
+    assert_equal block, env.blocks.find(block.id)
+  end
+
+end
@@ -199,13 +199,24 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert env_boxes > 0
     assert env_blocks > 0
  
-    boxes = Design::Box.count
-    blocks = Design::Block.count
+    boxes = Box.count
+    blocks = Block.count
  
     env.destroy
  
-    assert_equal boxes - env_boxes, Design::Box.count
-    assert_equal blocks - env_blocks, Design::Block.count
+    assert_equal boxes - env_boxes, Box.count
+    assert_equal blocks - env_blocks, Block.count
+  end
+  
+  should 'have boxes and blocks upon creation' do
+    environment = Environment.create!(:name => 'a test environment')
+    assert environment.boxes.size > 0
+    assert environment.blocks.size > 0
+  end
+
+  should 'have at least one MainBlock upon creation' do
+    environment = Environment.create!(:name => 'a test environment')
+    assert(environment.blocks.any? { |block| block.kind_of? MainBlock })
   end
  
 end
@@ -200,21 +200,34 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal profile, Profile['testprofile']
   end
  
+  should 'have boxes and blocks upon creation' do
+    profile = Profile.create!(:name => 'test profile', :identifier => 'testprofile')
+
+    assert profile.boxes.size > 0
+    assert profile.blocks.size > 0
+  end
+
+  should 'have at least one MainBlock upon creation' do
+    profile = Profile.create!(:name => 'test profile', :identifier => 'testprofile')
+    assert(profile.blocks.any? { |block| block.kind_of? MainBlock })
+  end
+
   should 'remove boxes and blocks when removing profile' do
-    profile = Profile.create!(:name => 'test environment', :identifier => 'testenv')
+    profile = Profile.create!(:name => 'test profile', :identifier => 'testprofile')
  
     profile_boxes = profile.boxes.size
     profile_blocks = profile.blocks.size
+    
     assert profile_boxes > 0
     assert profile_blocks > 0
  
-    boxes = Design::Box.count
-    blocks = Design::Block.count
+    boxes = Box.count
+    blocks = Block.count
  
     profile.destroy
  
-    assert_equal boxes - profile_boxes, Design::Box.count
-    assert_equal blocks - profile_blocks, Design::Block.count
+    assert_equal boxes - profile_boxes, Box.count
+    assert_equal blocks - profile_blocks, Block.count
   end
  
   should 'provide url to itself' do
...	...	@@ -8,7 +8,9 @@ class AdminPanelController < AdminController
8	8	# as the default holder
9	9	before_filter :load_default_enviroment
10	10
11		- design :holder => 'environment'
	11	+ def boxes_holder
	12	+ environment
	13	+ end
12	14
13	15	protected
14	16
...	...
1	1	class EditTemplateController < AdminController
2	2
3		- design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
	3	+ #FIXME
	4	+ #design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
4	5
5	6	def block_types
6	7	%w[
...	...
...	...	@@ -5,7 +5,14 @@ class ApplicationController < ActionController::Base
5	5	helper :document
6	6	helper :language
7	7
8		- design :holder => 'environment'
	8	+ def boxes_holder
	9	+ environment
	10	+ end
	11	+
	12	+ def boxes_editor?
	13	+ false
	14	+ end
	15	+ protected :boxes_editor?
9	16
10	17	def self.no_design_blocks
11	18	@no_design_blocks = true
...	...
...	...	@@ -0,0 +1,52 @@
	1	+class BoxOrganizerController < ApplicationController
	2	+
	3	+ def move_block
	4	+ @block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
	5	+
	6	+ @source_box = @block.box
	7	+
	8	+ target_position = nil
	9	+
	10	+ if (params[:target] =~ /before-block-([0-9]+)/)
	11	+ block_before = boxes_holder.blocks.find($1)
	12	+ target_position = block_before.position
	13	+
	14	+ @target_box = block_before.box
	15	+ else
	16	+ (params[:target] =~ /end-of-box-([0-9])+/)
	17	+
	18	+ @target_box = boxes_holder.boxes.find($1)
	19	+ end
	20	+
	21	+ if (@source_box != @target_box)
	22	+ @block.remove_from_list
	23	+ @block.box = @target_box
	24	+ end
	25	+
	26	+ if target_position.nil?
	27	+ # insert in the end of the box
	28	+ @block.insert_at(@target_box.blocks.size + 1)
	29	+ @block.move_to_bottom
	30	+ else
	31	+ # insert the block in the given position
	32	+ @block.insert_at(@block.position && @block.position < target_position ? target_position - 1 : target_position)
	33	+ end
	34	+
	35	+ @block.save!
	36	+
	37	+ @target_box.reload
	38	+ end
	39	+
	40	+ def move_block_down
	41	+ @block = boxes_holder.blocks.find(params[:id])
	42	+ @block.move_lower
	43	+ redirect_to :back
	44	+ end
	45	+
	46	+ def move_block_up
	47	+ @block = boxes_holder.blocks.find(params[:id])
	48	+ @block.move_higher
	49	+ redirect_to :back
	50	+ end
	51	+
	52	+end
...	...
...	...	@@ -2,7 +2,9 @@ class CmsController < MyProfileController
2	2
3	3	protect 'post_content', :profile, :only => [:edit, :new, :reorder, :delete]
4	4
5		- design :holder => :profile
	5	+ def boxes_holder
	6	+ profile
	7	+ end
6	8
7	9	include CmsHelper
8	10
...	...	@@ -11,6 +13,7 @@ class CmsController < MyProfileController
11	13	TextileArticle,
12	14	RssFeed,
13	15	UploadedFile,
	16	+ ImageGallery,
14	17	]
15	18
16	19	def view
...	...
...	...	@@ -0,0 +1,14 @@
	1	+class ProfileDesignController < BoxOrganizerController
	2	+
	3	+ needs_profile
	4	+
	5	+ def index
	6	+ render :text => '...', :layout => true
	7	+ end
	8	+
	9	+ def boxes_editor?
	10	+ true
	11	+ end
	12	+ protected :boxes_editor?
	13	+
	14	+end
...	...
...	...	@@ -4,7 +4,8 @@ class ProfileEditorController < MyProfileController
4	4
5	5	helper :profile
6	6
7		- design_editor :holder => 'profile',:autosave => true, :block_types => :block_types
	7	+ # FIXME
	8	+ #design_editor :holder => 'profile',:autosave => true, :block_types => :block_types
8	9
9	10
10	11	def block_types
...	...
...	...	@@ -2,8 +2,6 @@ class AccountController < PublicController
2	2
3	3	before_filter :load_default_environment
4	4
5		- design :holder => 'environment'
6		-
7	5	# say something nice, you goof! something sweet.
8	6	def index
9	7	unless logged_in?
...	...
...	...	@@ -5,7 +5,9 @@ class CategoryController < ApplicationController
5	5	#FIXME This is not necessary because the application controller define the envrioment
6	6	# as the default holder
7	7
8		- design :holder => 'environment'
	8	+ def boxes_holder
	9	+ environment
	10	+ end
9	11
10	12	def load_default_enviroment
11	13	@environment = Environment.default
...	...
1	1	class HomeController < PublicController
2	2
3		- design :holder => 'environment'
4		-
5	3	def index
6	4	@articles = TextArticle.recent(nil, 10)
7	5	end
...	...