Download as
Browse Code »

Commit e946430b1ffe176de13c6fe05694134ad892683e

Authored by Victor Costa
1 parent 6f6eed62
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

container_block: fix add/move layout in box organizer

Showing 2 changed files with 3 additions and 9 deletions   Show diff stats
plugins/container_block/public/style.css
  Diff comments   View file @e946430
... ... @@ -11,10 +11,6 @@
11 11 margin-right: -2px;
12 12 }
13 13  
14   -.container-block-plugin_container-block .block-target {
15   - clear: both;
16   -}
17   -
18 14 #content .boxes .container-block-plugin_container-block .block .icon-down, #content .boxes .container-block-plugin_container-block .block .icon-down-disabled {
19 15 background-image: url(/designs/icons/default/Tango/16x16/actions/go-next.png);
20 16 }
... ...
plugins/container_block/views/blocks/container.html.erb
  Diff comments   View file @e946430
... ... @@ -5,12 +5,10 @@
5 5  
6 6 <div class="box" id="box-<%= block.container_box.id %>">
7 7 <%= display_box_content(block.container_box, nil) %>
8   - <div class="clear"></div>
9 8 </div>
10   -<div class="clear"></div>
11 9  
12 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 12 #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
15 13 <% end %>
16 14 </style>
... ... @@ -28,8 +26,8 @@
28 26 </script>
29 27  
30 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 31 :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => c_('Save') },
34 32 :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
35 33 :loaded => "close_loading();",
... ...