Commit e946430b1ffe176de13c6fe05694134ad892683e

Authored by Victor Costa
1 parent 6f6eed62

container_block: fix add/move layout in box organizer

plugins/container_block/public/style.css
@@ -11,10 +11,6 @@ @@ -11,10 +11,6 @@
11 margin-right: -2px; 11 margin-right: -2px;
12 } 12 }
13 13
14 -.container-block-plugin_container-block .block-target {  
15 - clear: both;  
16 -}  
17 -  
18 #content .boxes .container-block-plugin_container-block .block .icon-down, #content .boxes .container-block-plugin_container-block .block .icon-down-disabled { 14 #content .boxes .container-block-plugin_container-block .block .icon-down, #content .boxes .container-block-plugin_container-block .block .icon-down-disabled {
19 background-image: url(/designs/icons/default/Tango/16x16/actions/go-next.png); 15 background-image: url(/designs/icons/default/Tango/16x16/actions/go-next.png);
20 } 16 }
plugins/container_block/views/blocks/container.html.erb
@@ -5,12 +5,10 @@ @@ -5,12 +5,10 @@
5 5
6 <div class="box" id="box-<%= block.container_box.id %>"> 6 <div class="box" id="box-<%= block.container_box.id %>">
7 <%= display_box_content(block.container_box, nil) %> 7 <%= display_box_content(block.container_box, nil) %>
8 - <div class="clear"></div>  
9 </div> 8 </div>
10 -<div class="clear"></div>  
11 9
12 <style> 10 <style>
13 - <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %> 11 + <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %>
14 #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; } 12 #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
15 <% end %> 13 <% end %>
16 </style> 14 </style>
@@ -28,8 +26,8 @@ @@ -28,8 +26,8 @@
28 </script> 26 </script>
29 27
30 <div class="container-block-button-bar button-bar"> 28 <div class="container-block-button-bar button-bar">
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 },  
32 - :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})", 29 + <%= link_to_remote '', :url => { :controller => controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id },
  30 + :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})",
33 :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => c_('Save') }, 31 :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => c_('Save') },
34 :loading => "open_loading(DEFAULT_LOADING_MESSAGE);", 32 :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
35 :loaded => "close_loading();", 33 :loaded => "close_loading();",