rails3: fix container_block plugin

Victor Costa
1 parent 0e4d4a79
Showing 12 changed files with 109 additions and 109 deletions Show diff stats
plugins/container_block/lib/container_block_plugin/container_block.rb
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
plugins/container_block/test/unit/block_test.rb
plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
plugins/container_block/test/unit/environment_test.rb
plugins/container_block/test/unit/profile_test.rb
plugins/container_block/views/blocks/container.html.erb
plugins/container_block/views/blocks/container.rhtml
@@ -38,7 +38,7 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   end
   def block_classes=(classes)
-    classes.each { |c| block = c.constantize.create!(:box => container_box) } if classes
+    classes.each { |c| block = c.constantize.create!(:box_id => container_box.id) } if classes
   end
   def blocks
@@ -51,8 +51,8 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   def content(args={})
     block = self
-    lambda do
-      render :file => 'blocks/container.rhtml', :locals => {:block => block}
+    proc do
+      render :file => 'blocks/container', :locals => {:block => block}
     end
   end
@@ -20,7 +20,7 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     @environment.add_admin(user.person)
     login_as(user.login)
-    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => @environment.boxes.first)
+    @block = create(ContainerBlockPlugin::ContainerBlock, :box => @environment.boxes.first)
   end
   should 'be able to edit ContainerBlock' do
@@ -36,46 +36,46 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
   end
   should 'display container children' do
-    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box_id => @environment.boxes.last.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child2 content')
     get :move_block_up, :id => c2.id
     assert_equal [c2, c1], @block.blocks
   end
@@ -20,8 +20,8 @@ class HomeControllerTest &lt; ActionController::TestCase
     @environment.add_admin(user.person)
     login_as(user.login)
-    box = Box.create!(:owner => @environment)
-    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => box)
+    box = create(Box, :owner => @environment)
+    @block = create(ContainerBlockPlugin::ContainerBlock, :box => box)
     @environment.boxes = [box]
   end
@@ -32,15 +32,15 @@ class HomeControllerTest &lt; ActionController::TestCase
   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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child1 content')
+    c2 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :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')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child1 content')
     @block.children_settings = { c1.id => {:width => "123"} }
     @block.save!
     get :index
@@ -48,7 +48,7 @@ class HomeControllerTest &lt; ActionController::TestCase
   end
   should 'do not display hidden children of container' do
-    c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content', :display => 'never')
+    c1 = RawHTMLBlock.create!(:box_id => @block.container_box.id, :html => 'child1 content', :display => 'never')
     get :index
     assert_no_tag :div, :attributes => { :id => "block-#{c1.id}" }
   end
@@ -12,9 +12,9 @@ class ContainerBlockPluginAdminControllerTest &lt; ActionController::TestCase
     @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)
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box_id => @environment.boxes.first.id)
+    @child1 = Block.create!(:box_id => @block.container_box.id)
+    @child2 = Block.create!(:box_id => @block.container_box.id)
   end
   should 'save widths of container block children' do
@@ -14,9 +14,9 @@ class ContainerBlockPluginControllerTest &lt; ActionController::TestCase
     @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)
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box_id => @environment.boxes.first.id)
+    @child1 = Block.create!(:box_id => @block.container_box.id)
+    @child2 = Block.create!(:box_id => @block.container_box.id)
     @environment = Environment.find(@environment.id)
     stubs(:boxes_holder).returns(@environment)
     @params = {}
@@ -8,11 +8,11 @@ class ContainerBlockPluginMyprofileControllerTest &lt; ActionController::TestCase
     @profile = fast_create(Community)
     @profile.add_admin(user.person)
-    @box = Box.new(:owner => @profile)
+    @box = Box.create!(:owner => @profile)
-    @block = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
-    @child1 = Block.create!(:box => @block.container_box)
-    @child2 = Block.create!(:box => @block.container_box)
+    @block = ContainerBlockPlugin::ContainerBlock.create!(:box_id => @box.id)
+    @child1 = Block.create!(:box_id => @block.container_box.id)
+    @child2 = Block.create!(:box_id => @block.container_box.id)
   end
   should 'save widths of container block children' do
@@ -5,26 +5,26 @@ class BlockTest &lt; ActiveSupport::TestCase
   def setup
     @environment = fast_create(Environment)
     @box = Box.create!(:owner => @environment)
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+    @container = ContainerBlockPlugin::ContainerBlock.create!(:box_id => @box.id)
   end
   should 'return environment box if block owner is not a ContainerBlock' do
-    block = Block.create!(:box => @box)
+    block = Block.create!(:box_id => @box.id)
     assert_equal @box, block.box
   end
   should 'return container box if block owner is a ContainerBlock' do
-    block = Block.create!(:box => @container.container_box)
+    block = Block.create!(:box_id => @container.container_box.id)
     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)
+    block = Block.create!(:box_id => @box.id)
     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)
+    block = Block.create!(:box_id => @container.container_box.id)
     assert_equal @environment, block.owner
   end
@@ -27,7 +27,7 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
   should 'create new blocks when receive block classes' do
     @block.save!
-    assert_difference Block, :count, 1 do
+    assert_difference 'Block.count', 1 do
       @block.block_classes = ['Block']
     end
     assert_equal Block, Block.last.class
@@ -35,14 +35,14 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
   should 'do not create blocks when nothing is passed as block classes' do
     @block.save!
-    assert_no_difference Block, :count do
+    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
+    assert_no_difference 'Block.count' do
       @block.block_classes = nil
     end
   end
@@ -84,7 +84,7 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
   should 'destroy box when container is removed' do
     @block.save!
-    assert_difference Box, :count, -1 do
+    assert_difference 'Box.count', -1 do
       @block.destroy
     end
   end
@@ -5,10 +5,10 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   def setup
     @environment = fast_create(Environment)
-    @box = Box.create!(:owner => @environment)
-    @block = Block.create!(:box => @box)
+    @box = create(Box, :owner => @environment)
+    @block = create(Block, :box => @box)
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+    @container = create(ContainerBlockPlugin::ContainerBlock, :box => @box)
   end
   should 'return blocks as usual' do
@@ -16,7 +16,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   end
   should 'return blocks with container children' do
-    child = Block.create!(:box => @container.container_box)
+    child = Block.create!(:box_id => @container.container_box.id)
     assert_equal [@block, @container, child], @environment.blocks
   end
@@ -25,7 +25,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   end
   should 'return child block with id at find method' do
-    child = Block.create!(:box => @container.container_box)
+    child = Block.create!(:box_id => @container.container_box.id)
     assert_equal child, @environment.blocks.find(child.id)
   end
@@ -5,10 +5,10 @@ class ProfileTest &lt; ActiveSupport::TestCase
   def setup
     @profile = fast_create(Profile)
-    @box = Box.create!(:owner => @profile)
-    @block = Block.create!(:box => @box)
+    @box = create(Box, :owner => @profile)
+    @block = create(Block, :box => @box)
-    @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
+    @container = create(ContainerBlockPlugin::ContainerBlock, :box => @box)
   end
   should 'return blocks as usual' do
@@ -16,7 +16,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   end
   should 'return blocks with container children' do
-    child = Block.create!(:box => @container.container_box)
+    child = Block.create!(:box_id => @container.container_box.id)
     assert_equal [@block, @container, child], @profile.blocks
   end
@@ -25,7 +25,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   end
   should 'return child block with id at find method' do
-    child = Block.create!(:box => @container.container_box)
+    child = Block.create!(:box_id => @container.container_box.id)
     assert_equal child, @profile.blocks.find(child.id)
   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 %>
@@ -1,60 +0,0 @@
-<% 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 %>
	@@ -5,26 +5,26 @@ class BlockTest < ActiveSupport::TestCase		@@ -5,26 +5,26 @@ class BlockTest < ActiveSupport::TestCase
5	def setup	5	def setup
6	@environment = fast_create(Environment)	6	@environment = fast_create(Environment)
7	@box = Box.create!(:owner => @environment)	7	@box = Box.create!(:owner => @environment)
8	- @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)	8	+ @container = ContainerBlockPlugin::ContainerBlock.create!(:box_id => @box.id)
9	end	9	end
10		10
11	should 'return environment box if block owner is not a ContainerBlock' do	11	should 'return environment box if block owner is not a ContainerBlock' do
12	- block = Block.create!(:box => @box)	12	+ block = Block.create!(:box_id => @box.id)
13	assert_equal @box, block.box	13	assert_equal @box, block.box
14	end	14	end
15		15
16	should 'return container box if block owner is a ContainerBlock' do	16	should 'return container box if block owner is a ContainerBlock' do
17	- block = Block.create!(:box => @container.container_box)	17	+ block = Block.create!(:box_id => @container.container_box.id)
18	assert_equal @container.container_box, block.box	18	assert_equal @container.container_box, block.box
19	end	19	end
20		20
21	should 'return block owner if block onwer is not a ContainerBlock' do	21	should 'return block owner if block onwer is not a ContainerBlock' do
22	- block = Block.create!(:box => @box)	22	+ block = Block.create!(:box_id => @box.id)
23	assert_equal @environment, block.owner	23	assert_equal @environment, block.owner
24	end	24	end
25		25
26	should 'return environment as owner if block onwer is a ContainerBlock' do	26	should 'return environment as owner if block onwer is a ContainerBlock' do
27	- block = Block.create!(:box => @container.container_box)	27	+ block = Block.create!(:box_id => @container.container_box.id)
28	assert_equal @environment, block.owner	28	assert_equal @environment, block.owner
29	end	29	end
30		30
	@@ -27,7 +27,7 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase		@@ -27,7 +27,7 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
27		27
28	should 'create new blocks when receive block classes' do	28	should 'create new blocks when receive block classes' do
29	@block.save!	29	@block.save!
30	- assert_difference Block, :count, 1 do	30	+ assert_difference 'Block.count', 1 do
31	@block.block_classes = ['Block']	31	@block.block_classes = ['Block']
32	end	32	end
33	assert_equal Block, Block.last.class	33	assert_equal Block, Block.last.class
	@@ -35,14 +35,14 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase		@@ -35,14 +35,14 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
35		35
36	should 'do not create blocks when nothing is passed as block classes' do	36	should 'do not create blocks when nothing is passed as block classes' do
37	@block.save!	37	@block.save!
38	- assert_no_difference Block, :count do	38	+ assert_no_difference 'Block.count' do
39	@block.block_classes = []	39	@block.block_classes = []
40	end	40	end
41	end	41	end
42		42
43	should 'do not create blocks when nil is passed as block classes' do	43	should 'do not create blocks when nil is passed as block classes' do
44	@block.save!	44	@block.save!
45	- assert_no_difference Block, :count do	45	+ assert_no_difference 'Block.count' do
46	@block.block_classes = nil	46	@block.block_classes = nil
47	end	47	end
48	end	48	end
	@@ -84,7 +84,7 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase		@@ -84,7 +84,7 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
84		84
85	should 'destroy box when container is removed' do	85	should 'destroy box when container is removed' do
86	@block.save!	86	@block.save!
87	- assert_difference Box, :count, -1 do	87	+ assert_difference 'Box.count', -1 do
88	@block.destroy	88	@block.destroy
89	end	89	end
90	end	90	end
@@ -0,0 +1,60 @@		@@ -0,0 +1,60 @@
	1	+<% edit_mode = controller.send(:boxes_editor?) && controller.send(:uses_design_blocks?) %>
	2	+<% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
	3	+
	4	+
	5	+<div class="box" id="box-<%= block.container_box.id %>">
	6	+ <%= display_box_content(block.container_box, nil) %>
	7	+ <div class="clear"></div>
	8	+</div>
	9	+<div class="clear"></div>
	10	+
	11	+<style>
	12	+ <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do \|child\| %>
	13	+ #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
	14	+ <% end %>
	15	+</style>
	16	+
	17	+<% if edit_mode %>
	18	+ <div class="button-bar">
	19	+ <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
	20	+ <%= link_to_remote '', :url => { :controller => controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id },
	21	+ :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})",
	22	+ :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
	23	+ :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
	24	+ :loaded => "close_loading();",
	25	+ :complete => "display_notice(request.responseText);"%>
	26	+ </div>
	27	+
	28	+ <script>
	29	+ function toggleMoveContainerChildren(container, box) {
	30	+ var div = jQuery('#box-'+box+' > .block-outer > .block');
	31	+ var targetDiv = jQuery('#box-'+box+' .block-outer .block-target');
	32	+ if(div.is('.ui-resizable')) {
	33	+ targetDiv.show();
	34	+ div.find("a").die("click");
	35	+ div.resizable('destroy');
	36	+ } else {
	37	+ targetDiv.hide();
	38	+ div.find("a").live("click", function(e) {
	39	+ e.preventDefault();
	40	+ });
	41	+ div.resizable({
	42	+ handles: 'e, w',
	43	+ containment: '#block-'+container+' .block-inner-2',
	44	+ resize: function( event, ui ) {
	45	+ ui.element.height('auto');
	46	+ }
	47	+ });
	48	+ }
	49	+ }
	50	+
	51	+ function containerChildrenWidth(container, box) {
	52	+ widths = "";
	53	+ jQuery('#box-'+box+' > .block-outer > .block').each(function(i) {
	54	+ childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
	55	+ widths+=childId+","+jQuery(this).width()+"\|";
	56	+ });
	57	+ return "widths="+widths;
	58	+ }
	59	+ </script>
	60	+<% end %>
	@@ -1,60 +0,0 @@	@@ -1,60 +0,0 @@
1	-<% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>
2	-<% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
3	-
4	-
5	-<div class="box" id="box-<%= block.container_box.id %>">
6	- <%= display_box_content(block.container_box, nil) %>
7	- <div class="clear"></div>
8	-</div>
9	-<div class="clear"></div>
10	-
11	-<style>
12	- <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do \|child\| %>
13	- #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
14	- <% end %>
15	-</style>
16	-
17	-<% if edit_mode %>
18	- <div class="button-bar">
19	- <a href="#" onclick="toggleMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>); return false;" class="button icon-resize" title=<%= _('Resize blocks').to_json %>></a>
20	- <%= link_to_remote '', :url => { :controller => @controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id },
21	- :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})",
22	- :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
23	- :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
24	- :loaded => "close_loading();",
25	- :complete => "display_notice(request.responseText);"%>
26	- </div>
27	-
28	- <script>
29	- function toggleMoveContainerChildren(container, box) {
30	- var div = jQuery('#box-'+box+' > .block-outer > .block');
31	- var targetDiv = jQuery('#box-'+box+' .block-outer .block-target');
32	- if(div.is('.ui-resizable')) {
33	- targetDiv.show();
34	- div.find("a").die("click");
35	- div.resizable('destroy');
36	- } else {
37	- targetDiv.hide();
38	- div.find("a").live("click", function(e) {
39	- e.preventDefault();
40	- });
41	- div.resizable({
42	- handles: 'e, w',
43	- containment: '#block-'+container+' .block-inner-2',
44	- resize: function( event, ui ) {
45	- ui.element.height('auto');
46	- }
47	- });
48	- }
49	- }
50	-
51	- function containerChildrenWidth(container, box) {
52	- widths = "";
53	- jQuery('#box-'+box+' > .block-outer > .block').each(function(i) {
54	- childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
55	- widths+=childId+","+jQuery(this).width()+"\|";
56	- });
57	- return "widths="+widths;
58	- }
59	- </script>
60	-<% end %>