From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 8 Jul 2015 17:44:06 +0000 (-0400)
Subject: Profile editor - Sort/drag usability fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f74718b1969a77868ff936bc7dee231748b71098;p=civicrm-core.git

Profile editor - Sort/drag usability fix
---

diff --git a/css/crm.designer.css b/css/crm.designer.css
index 755c1820b3..2b5e8c1dc8 100644
--- a/css/crm.designer.css
+++ b/css/crm.designer.css
@@ -57,10 +57,6 @@
   cursor: move;
 }
 
-.crm-designer-palette .crm-designer-palette-field.disabled a {
-  cursor: default;
-}
-
 .crm-designer-palette .crm-designer-palette-field:hover,
 .crm-designer-fields-region .crm-designer-row:hover,
 .crm-designer-open .crm-designer-row,
@@ -70,6 +66,11 @@
   background-color: #E9E9F5;
 }
 
+.crm-designer-palette .crm-designer-palette-field.disabled a,
+.crm-designer-open .crm-designer-row:hover {
+  cursor: default;
+}
+
 .crm-container .crm-designer-palette .crm-designer-palette-tree a {
   color: #222;
   font-style: normal;
diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js
index 5614e5222c..1dc087c6b0 100644
--- a/js/view/crm.designer.js
+++ b/js/view/crm.designer.js
@@ -535,6 +535,7 @@
       this.$(".crm-designer-fields").sortable({
         placeholder: 'crm-designer-row-placeholder',
         forcePlaceholderSize: true,
+        cancel: 'input,textarea,button,select,option,a,.crm-designer-open',
         receive: function(event, ui) {
           var paletteFieldModel = ufFieldCanvasView.model.getRel('paletteFieldCollection').get(ui.item.attr('data-plm-cid'));
           var ufFieldModel = paletteFieldModel.addToUFCollection(