From fd1ffa3ad1b81f05320c2043a77888fdb3a9240e Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 23 Jan 2014 13:17:50 -0300 Subject: [PATCH] container_block: toggle move of children on hover --- plugins/container_block/public/container_block.js | 15 ++++++++++----- plugins/container_block/public/style.css | 1 + plugins/container_block/views/blocks/container.rhtml | 12 +++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/plugins/container_block/public/container_block.js b/plugins/container_block/public/container_block.js index f3670b5..5d6f914 100644 --- a/plugins/container_block/public/container_block.js +++ b/plugins/container_block/public/container_block.js @@ -1,9 +1,6 @@ -function toggleMoveContainerChildren(container, box) { +function enableMoveContainerChildren(container, box) { var div = jQuery('#box-'+box+' > .block-outer > .block'); - if(div.is('.ui-resizable')) { - div.find("a").die("click"); - div.resizable('destroy'); - } else { + if(!div.is('.ui-resizable')) { div.find("a").live("click", function(e) { e.preventDefault(); }); @@ -17,6 +14,14 @@ function toggleMoveContainerChildren(container, box) { } } +function disableMoveContainerChildren(container, box) { + var div = jQuery('#box-'+box+' > .block-outer > .block'); + if(div.is('.ui-resizable')) { + div.find("a").die("click"); + div.resizable('destroy'); + } +} + function containerChildrenWidth(container, box) { widths = ""; jQuery('#box-'+box+' > .block-outer > .block').each(function(i) { diff --git a/plugins/container_block/public/style.css b/plugins/container_block/public/style.css index 94d8714..44e1741 100644 --- a/plugins/container_block/public/style.css +++ b/plugins/container_block/public/style.css @@ -46,6 +46,7 @@ #box-organizer .block .container-block-button-bar { right: 0px; bottom: 0px; + height: auto; } #box-organizer .container-block-plugin_container-block:hover .block { diff --git a/plugins/container_block/views/blocks/container.rhtml b/plugins/container_block/views/blocks/container.rhtml index 8fb3f53..b5abc6b 100644 --- a/plugins/container_block/views/blocks/container.rhtml +++ b/plugins/container_block/views/blocks/container.rhtml @@ -15,8 +15,18 @@ <% if edit_mode %> + + +
- > <%= 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') }, -- libgit2 0.21.2