From f1616b1c48600f4e5090079e411fc19c9ebcc399 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 13 Oct 2015 10:34:04 -0400
Subject: [PATCH] CRM-16415 Grips for moving

----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415
---
 css/civicrm.css                                  | 4 ++++
 templates/CRM/Admin/Form/Preferences/Display.tpl | 4 ++--
 templates/CRM/Custom/Page/Option.tpl             | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index dbef827a94..41259af0f1 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -4042,3 +4042,7 @@ span.crm-status-icon {
 .crm-container .crm-ui-datetime.ng-dirty input.incomplete {
   border: 1px solid red;
 }
+
+.crm-container .crm-grip {
+  cursor: move;
+}
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 505aa385ff..8a3427051d 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -75,7 +75,7 @@
                 {foreach from=$contactBlocks item="title" key="opId"}
                   <li id="preference-{$opId}-contactedit" class="ui-state-default ui-corner-all"
                       style="padding-left:1px;">
-                    <span class='ui-icon ui-icon-arrowthick-2-n-s' style="float:left;"></span>
+                    <i class='crm-i fa-arrows crm-grip' style="float:left;"></i>
                     <span>{$form.contact_edit_options.$opId.html}</span>
                   </li>
                 {/foreach}
@@ -87,7 +87,7 @@
                 {foreach from=$editOptions item="title" key="opId"}
                   <li id="preference-{$opId}-contactedit" class="ui-state-default ui-corner-all"
                       style="padding-left:1px;">
-                    <span class='ui-icon ui-icon-arrowthick-2-n-s' style="float:left;"></span>
+                    <i class='crm-i fa-arrows crm-grip' style="float:left;"></i>
                     <span>{$form.contact_edit_options.$opId.html}</span>
                   </li>
                 {/foreach}
diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index 526b5e5b3e..5577e078cc 100644
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -99,8 +99,8 @@
                 var id = $('td:last', nRow).text().split(',')[0];
                 var cl = $('td:last', nRow).text().split(',')[1];
                 $(nRow).addClass(cl).attr({id: 'OptionValue-' + id});
-                $('td:eq(0)', nRow).wrapInner('<div style="margin-left: 10px;" class="crm-editable crmf-label" />');
-                $('td:eq(0)', nRow).prepend('<div style="cursor:move; position: relative; left: -7px;" class="icon ui-icon-arrowthick-2-n-s" />');
+                $('td:eq(0)', nRow).wrapInner('<span class="crm-editable crmf-label" />');
+                $('td:eq(0)', nRow).prepend('<span class="crm-i fa-arrows crm-grip" />');
                 $('td:eq(2)', nRow).addClass('crmf-default_value');
                 return nRow;
               },
@@ -127,7 +127,7 @@
         var gid = {/literal}'{$optionGroupID}'{literal};
 
         $("table.crm-option-selector tbody").sortable({
-          handle: ".ui-icon-arrowthick-2-n-s",
+          handle: ".fa-arrows",
           cursor: "move",
           start:function(event, ui) {
             var oSettings = $('table.crm-option-selector').dataTable().fnSettings();
-- 
2.25.1