From 6f746463158b407becfe8b45d9ba5e227a85c7d7 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Fri, 1 Nov 2013 09:13:03 -0300
Subject: [PATCH] Fix javascript for container block edition and enable move left/right

---
 plugins/container_block/public/style.css             |  8 ++++++--
 plugins/container_block/views/blocks/container.rhtml | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/plugins/container_block/public/style.css b/plugins/container_block/public/style.css
index a5c1b17..b02dd34 100644
--- a/plugins/container_block/public/style.css
+++ b/plugins/container_block/public/style.css
@@ -2,8 +2,12 @@
   float: left;
 }
 
-#content .boxes .container-block .block .icon-down, #content .boxes .container-block .block .icon-down-disabled, #content .boxes .container-block .block .icon-up, #content .boxes .container-block .block .icon-up-disabled {
-  display: none;
+#content .boxes .container-block .block .icon-down, #content .boxes .container-block .block .icon-down-disabled {
+  background-image: url(/designs/icons/default/Tango/16x16/actions/go-next.png);
+}
+
+#content .boxes .container-block .block .icon-up, #content .boxes .container-block .block .icon-up-disabled {
+  background-image: url(/designs/icons/default/Tango/16x16/actions/go-previous.png);
 }
 
 #content .boxes .container-block .block {
diff --git a/plugins/container_block/views/blocks/container.rhtml b/plugins/container_block/views/blocks/container.rhtml
index a69dc5f..2cabf62 100644
--- a/plugins/container_block/views/blocks/container.rhtml
+++ b/plugins/container_block/views/blocks/container.rhtml
@@ -2,7 +2,7 @@
 <% box_decorator = edit_mode ? self : BoxesHelper::DontMoveBlocks %>
 
 <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %>
-  <div class="container_block_child">
+  <div class="container_block_child" id="container_block_child_<%= block.id %>">
     <%= display_block(child, '') %>
   </div>
   <style>#block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }</style>
@@ -15,20 +15,23 @@
     <%= 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})", 
                            :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}" },
-                           :loading => "",
-                           :loaded => "" %>
+                           :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
+                           :loaded => "close_loading();" %>
   </div>
 
   <script>
-    function saveWidth(container) {
-    }
-
     function toggleMoveContainerChildren(container) {
-      var containerDiv = jQuery('#block-'+container+' .container_block_child .block');
+      var containerDiv = jQuery('#block-'+container+' #container_block_child_'+container+' > .block');
       if(containerDiv.is('.ui-resizable')) {
         containerDiv.resizable('destroy');
       } else {
-        containerDiv.resizable({handles: 'e, w'});
+        containerDiv.resizable({
+          handles: 'e, w',
+          containment: '#block-'+container+' .block-inner-2',
+          resize: function( event, ui ) {
+            ui.element.height('auto');
+          }
+        });
       }
     }
 
--
libgit2 0.21.2