Merge branch 'AI2943_container_block_fixes' into 'stable'

Ai2943 Container Block Fixes Fix broken edition for container block with the new css for sideboxes view.

Merge branch 'AI2943_container_block_fixes' into 'stable'
Ai2943 Container Block Fixes Fix broken edition for container block with the new css for sideboxes view.
Daniela Feitosa
2 parents a508d544 5cd7e54d
Showing 16 changed files with 137 additions and 144 deletions Show diff stats
app/controllers/box_organizer_controller.rb
app/helpers/boxes_helper.rb
app/models/box.rb
plugins/container_block/lib/container_block_plugin.rb
plugins/container_block/lib/container_block_plugin/container_block.rb
plugins/container_block/public/container_block.js
plugins/container_block/public/style.css
plugins/container_block/test/functional/container_block_home_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.rhtml
public/stylesheets/application.css
test/unit/box_test.rb
test/unit/boxes_helper_test.rb
@@ -70,7 +70,7 @@ class BoxOrganizerController &lt; ApplicationController
     else
       @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
       @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
-      @boxes = boxes_holder.boxes
+      @boxes = boxes_holder.boxes.with_position
       render :action => 'add_block', :layout => false
     end
   end
@@ -39,7 +39,7 @@ module BoxesHelper
   end
   def display_boxes(holder, main_content)
-    boxes = holder.boxes.first(holder.boxes_limit)
+    boxes = holder.boxes.with_position.first(holder.boxes_limit)
     content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
     content = main_content if (content.blank?)
@@ -5,6 +5,8 @@ class Box &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
+  named_scope :with_position, :conditions => ['boxes.position > 0']
+
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
@@ -16,4 +16,8 @@ class ContainerBlockPlugin &lt; Noosfero::Plugin
     true
   end
+  def js_files
+    'container_block.js'
+  end
+
 end
@@ -7,6 +7,16 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   settings_items :container_box_id, :type => Integer, :default => nil
   settings_items :children_settings, :type => Hash, :default => {}
+  validate :no_cyclical_reference, :if => 'container_box_id.present?'
+
+  def no_cyclical_reference
+    errors.add(:box_id, _('cyclical reference is not allowed.')) if box_id == container_box_id
+  end
+
+  before_save do |b|
+    raise "cyclical reference is not allowed" if b.box_id == b.container_box_id && !b.container_box_id.blank?
+  end
+
   def self.description
     _('Container')
   end
@@ -15,6 +25,10 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
     _('This block acts as a container for another blocks')
   end
+  def cacheable?
+    false
+  end
+
   def layout_template
     nil
   end
@@ -24,8 +38,9 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   end
   def create_box
-    box = Box.create!(:owner => owner)
-    settings[:container_box_id] = box.id
+    container_box = Box.create!(:owner => owner)
+    container_box.update_attribute(:position, nil)
+    settings[:container_box_id] = container_box.id
     save!
   end
@@ -0,0 +1,28 @@
+function enableMoveContainerChildren(container, box) {
+  var div = jQuery('#box-'+box+' > .block-outer > .block');
+  if(!div.is('.ui-resizable')) {
+    div.resizable({
+      handles: 'e, w',
+      containment: '#block-'+container+' .block-inner-2',
+      resize: function( event, ui ) {
+        ui.element.height('auto');
+      }
+    });
+  }
+}
+
+function disableMoveContainerChildren(container, box) {
+  var div = jQuery('#box-'+box+' > .block-outer > .block');
+  if(div.is('.ui-resizable')) {
+    div.resizable('destroy');
+  }
+}
+
+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;
+}
+#box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar {
+  height: 22px;
+  padding-bottom: 0px;
+  width: auto;
+}
+
 #content .boxes .container-block-plugin_container-block .container_block_child, .container-block-plugin_container-block .block-outer {
   display: inline-block;
   vertical-align: top;
@@ -17,14 +23,10 @@
   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;
+  z-index: 1000;
 }
 #content .boxes .container-block-plugin_container-block .block .ui-resizable-e {
@@ -37,6 +39,21 @@
   background-image: url(/plugins/container_block/images/handle_w.png);
 }
-.container-block-plugin_container-block .button-bar .icon-resize {
+.container-block-plugin_container-block .container-block-button-bar .icon-resize {
   background-image: url(/designs/icons/default/Tango/16x16/actions/view-fullscreen.png);
 }
+
+#box-organizer .block .container-block-button-bar {
+  right: 0px;
+  bottom: 0px;
+  height: auto;
+}
+
+#box-organizer .container-block-plugin_container-block:hover .block {
+  outline: 1px dashed black;
+  outline-offset: -1px;
+}
+
+.container-block-plugin_container-block .block-target {
+  background: #afd;
+}
@@ -31,6 +31,13 @@ class HomeControllerTest &lt; ActionController::TestCase
     assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }
   end
+  should 'display block title' do
+    @block.title = "Block Title"
+    @block.save!
+    get :index
+    assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }, :descendant => {:tag => 'h3', :attributes => { :class => "block-title"}, :content => @block.title }
+  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')
@@ -1,31 +0,0 @@
-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
@@ -20,6 +20,11 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
     assert @block.container_box_id
   end
+  should 'created box should have nil as position' do
+    @block.save!
+    assert_equal nil, @block.container_box.position
+  end
+
   should 'return created box' do
     @block.save!
     assert @block.container_box
@@ -89,4 +94,27 @@ class ContainerBlockPlugin::ContainerBlockTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'not mess up with boxes positions when destroyed' do
+    env = fast_create(Environment)
+    box1 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 1)
+    box2 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 2)
+    box3 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 3)
+    block = ContainerBlockPlugin::ContainerBlock.create!(:box => box1)
+    block.destroy
+    assert_equal [1, 2, 3], [box1.reload.position, box2.reload.position, box3.reload.position]
+  end
+
+  should 'be able to change box' do
+    @block.save!
+    @block.box = Box.new(:owner => Environment.default)
+    @block.save!
+  end
+
+  should 'not able to change box to be the same as container_box' do
+    @block.save!
+    @block.box = @block.container_box
+    @block.save
+    assert @block.errors.invalid?(:box_id)
+  end
+
 end
@@ -1,32 +0,0 @@
-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
@@ -1,32 +0,0 @@
-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
 <% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>
 <% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
+<%= block_title(block.title) %>
 <div class="box" id="box-<%= block.container_box.id %>">
   <%= display_box_content(block.container_box, nil) %>
@@ -15,8 +16,18 @@
 </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>
+
+  <script>
+    jQuery("#block-<%= block.id %>").hover(
+      function() {
+        enableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
+      }, function() {
+        disableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
+      }
+    );
+  </script>
+
+  <div class="container-block-button-bar button-bar">
     <%= 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') },
@@ -24,37 +35,4 @@
                            :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 %>
@@ -1735,8 +1735,8 @@ a.button.disabled, input.disabled {
   display: none;
 }
-#box-organizer .block:focus .button-bar,
-#box-organizer .block:hover .button-bar {
+#box-organizer .block-outer:focus .button-bar,
+#box-organizer .block-outer:hover .button-bar {
   display: block;
 }
@@ -140,4 +140,11 @@ class BoxTest &lt; ActiveSupport::TestCase
     assert !blocks.include?('box-test_plugin-block')
   end
+  should 'list only boxes with a postion greater than zero' do
+    profile = fast_create(Profile)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => 'Profile', :position => 0)
+    box2 = fast_create(Box, :owner_id => profile.id, :owner_type => 'Profile', :position => 1)
+    assert_equal [box2], profile.boxes.with_position
+  end
+
 end
@@ -13,7 +13,8 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
   should 'include profile-specific header' do
     holder = mock
-    holder.stubs(:boxes).returns([])
+    holder.stubs(:boxes).returns(boxes = [])
+    boxes.stubs(:with_position).returns([])
     holder.stubs(:boxes_limit).returns(0)
     holder.stubs(:custom_header_expanded).returns('my custom header')
     @controller.stubs(:boxes_holder).returns(holder)
@@ -23,7 +24,8 @@ class BoxesHelperTest &lt; ActiveSupport::TestCase
   should 'include profile-specific footer' do
     holder = mock
-    holder.stubs(:boxes).returns([])
+    holder.stubs(:boxes).returns(boxes = [])
+    boxes.stubs(:with_position).returns([])
     holder.stubs(:boxes_limit).returns(0)
     holder.stubs(:custom_footer_expanded).returns('my custom footer')
     @controller.stubs(:boxes_holder).returns(holder)
	@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController		@@ -70,7 +70,7 @@ class BoxOrganizerController < ApplicationController
70	else	70	else
71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)	71	@center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
72	@side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])	72	@side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
73	- @boxes = boxes_holder.boxes	73	+ @boxes = boxes_holder.boxes.with_position
74	render :action => 'add_block', :layout => false	74	render :action => 'add_block', :layout => false
75	end	75	end
76	end	76	end
	@@ -39,7 +39,7 @@ module BoxesHelper		@@ -39,7 +39,7 @@ module BoxesHelper
39	end	39	end
40		40
41	def display_boxes(holder, main_content)	41	def display_boxes(holder, main_content)
42	- boxes = holder.boxes.first(holder.boxes_limit)	42	+ boxes = holder.boxes.with_position.first(holder.boxes_limit)
43	content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")	43	content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")
44	content = main_content if (content.blank?)	44	content = main_content if (content.blank?)
45		45
	@@ -5,6 +5,8 @@ class Box < ActiveRecord::Base		@@ -5,6 +5,8 @@ class Box < ActiveRecord::Base
5		5
6	include Noosfero::Plugin::HotSpot	6	include Noosfero::Plugin::HotSpot
7		7
		8	+ named_scope :with_position, :conditions => ['boxes.position > 0']
		9	+
8	def environment	10	def environment
9	owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil	11	owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
10	end	12	end
	@@ -16,4 +16,8 @@ class ContainerBlockPlugin < Noosfero::Plugin		@@ -16,4 +16,8 @@ class ContainerBlockPlugin < Noosfero::Plugin
16	true	16	true
17	end	17	end
18		18
		19	+ def js_files
		20	+ 'container_block.js'
		21	+ end
		22	+
19	end	23	end
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+function enableMoveContainerChildren(container, box) {
	2	+ var div = jQuery('#box-'+box+' > .block-outer > .block');
	3	+ if(!div.is('.ui-resizable')) {
	4	+ div.resizable({
	5	+ handles: 'e, w',
	6	+ containment: '#block-'+container+' .block-inner-2',
	7	+ resize: function( event, ui ) {
	8	+ ui.element.height('auto');
	9	+ }
	10	+ });
	11	+ }
	12	+}
	13	+
	14	+function disableMoveContainerChildren(container, box) {
	15	+ var div = jQuery('#box-'+box+' > .block-outer > .block');
	16	+ if(div.is('.ui-resizable')) {
	17	+ div.resizable('destroy');
	18	+ }
	19	+}
	20	+
	21	+function containerChildrenWidth(container, box) {
	22	+ widths = "";
	23	+ jQuery('#box-'+box+' > .block-outer > .block').each(function(i) {
	24	+ childId = jQuery(this).attr('id').match(/block-(\d+)/)[1];
	25	+ widths+=childId+","+jQuery(this).width()+"\|";
	26	+ });
	27	+ return "widths="+widths;
	28	+}
	@@ -31,6 +31,13 @@ class HomeControllerTest < ActionController::TestCase		@@ -31,6 +31,13 @@ class HomeControllerTest < ActionController::TestCase
31	assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }	31	assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }
32	end	32	end
33		33
		34	+ should 'display block title' do
		35	+ @block.title = "Block Title"
		36	+ @block.save!
		37	+ get :index
		38	+ assert_tag :div, :attributes => { :class => 'block container-block-plugin_container-block' }, :descendant => {:tag => 'h3', :attributes => { :class => "block-title"}, :content => @block.title }
		39	+ end
		40	+
34	should 'display container children' do	41	should 'display container children' do
35	c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')	42	c1 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child1 content')
36	c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')	43	c2 = RawHTMLBlock.create!(:box => @block.container_box, :html => 'child2 content')
	@@ -1,31 +0,0 @@	@@ -1,31 +0,0 @@
1	-require 'test_helper'
2	-
3	-class BlockTest < ActiveSupport::TestCase
4	-
5	- def setup
6	- @environment = fast_create(Environment)
7	- @box = Box.create!(:owner => @environment)
8	- @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
9	- end
10	-
11	- should 'return environment box if block owner is not a ContainerBlock' do
12	- block = Block.create!(:box => @box)
13	- assert_equal @box, block.box
14	- end
15	-
16	- should 'return container box if block owner is a ContainerBlock' do
17	- block = Block.create!(:box => @container.container_box)
18	- assert_equal @container.container_box, block.box
19	- end
20	-
21	- should 'return block owner if block onwer is not a ContainerBlock' do
22	- block = Block.create!(:box => @box)
23	- assert_equal @environment, block.owner
24	- end
25	-
26	- should 'return environment as owner if block onwer is a ContainerBlock' do
27	- block = Block.create!(:box => @container.container_box)
28	- assert_equal @environment, block.owner
29	- end
30	-
31	-end
	@@ -20,6 +20,11 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase		@@ -20,6 +20,11 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
20	assert @block.container_box_id	20	assert @block.container_box_id
21	end	21	end
22		22
		23	+ should 'created box should have nil as position' do
		24	+ @block.save!
		25	+ assert_equal nil, @block.container_box.position
		26	+ end
		27	+
23	should 'return created box' do	28	should 'return created box' do
24	@block.save!	29	@block.save!
25	assert @block.container_box	30	assert @block.container_box
	@@ -89,4 +94,27 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase		@@ -89,4 +94,27 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
89	end	94	end
90	end	95	end
91		96
		97	+ should 'not mess up with boxes positions when destroyed' do
		98	+ env = fast_create(Environment)
		99	+ box1 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 1)
		100	+ box2 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 2)
		101	+ box3 = fast_create(Box, :owner_id => env.id, :owner_type => 'Environment', :position => 3)
		102	+ block = ContainerBlockPlugin::ContainerBlock.create!(:box => box1)
		103	+ block.destroy
		104	+ assert_equal [1, 2, 3], [box1.reload.position, box2.reload.position, box3.reload.position]
		105	+ end
		106	+
		107	+ should 'be able to change box' do
		108	+ @block.save!
		109	+ @block.box = Box.new(:owner => Environment.default)
		110	+ @block.save!
		111	+ end
		112	+
		113	+ should 'not able to change box to be the same as container_box' do
		114	+ @block.save!
		115	+ @block.box = @block.container_box
		116	+ @block.save
		117	+ assert @block.errors.invalid?(:box_id)
		118	+ end
		119	+
92	end	120	end
	@@ -1,32 +0,0 @@	@@ -1,32 +0,0 @@
1	-require 'test_helper'
2	-
3	-class EnvironmentTest < ActiveSupport::TestCase
4	-
5	- def setup
6	- @environment = fast_create(Environment)
7	-
8	- @box = Box.create!(:owner => @environment)
9	- @block = Block.create!(:box => @box)
10	-
11	- @container = ContainerBlockPlugin::ContainerBlock.create!(:box => @box)
12	- end
13	-
14	- should 'return blocks as usual' do
15	- assert_equal [@block, @container], @environment.blocks
16	- end
17	-
18	- should 'return blocks with container children' do
19	- child = Block.create!(:box => @container.container_box)
20	- assert_equal [@block, @container, child], @environment.blocks
21	- end
22	-
23	- should 'return block with id at find method' do
24	- assert_equal @block, @environment.blocks.find(@block.id)
25	- end
26	-
27	- should 'return child block with id at find method' do
28	- child = Block.create!(:box => @container.container_box)
29	- assert_equal child, @environment.blocks.find(child.id)
30	- end
31	-
32	-end
1	<% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>	1	<% edit_mode = @controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) %>
2	<% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>	2	<% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
3		3
		4	+<%= block_title(block.title) %>
4		5
5	<div class="box" id="box-<%= block.container_box.id %>">	6	<div class="box" id="box-<%= block.container_box.id %>">
6	<%= display_box_content(block.container_box, nil) %>	7	<%= display_box_content(block.container_box, nil) %>
	@@ -15,8 +16,18 @@		@@ -15,8 +16,18 @@
15	</style>	16	</style>
16		17
17	<% if edit_mode %>	18	<% 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>	19	+
		20	+ <script>
		21	+ jQuery("#block-<%= block.id %>").hover(
		22	+ function() {
		23	+ enableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
		24	+ }, function() {
		25	+ disableMoveContainerChildren(<%= block.id %>, <%= block.container_box.id %>);
		26	+ }
		27	+ );
		28	+ </script>
		29	+
		30	+ <div class="container-block-button-bar button-bar">
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 },	31	<%= 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})",	32	: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') },	33	:html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
	@@ -24,37 +35,4 @@		@@ -24,37 +35,4 @@
24	:loaded => "close_loading();",	35	:loaded => "close_loading();",
25	:complete => "display_notice(request.responseText);"%>	36	:complete => "display_notice(request.responseText);"%>
26	</div>	37	</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 %>	38	<% end %>