From 1e47ba2481e1f696b280081bf35d2bb621f46520 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 15 May 2017 21:41:47 -0700
Subject: [PATCH] Use setDrag UI for reordering workboard columns

Summary: This UI can use the setDrag call to reduce clutter on the reodering dialog.

Test Plan:
Reorder some columns, save.

{F4959906}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17898
---
 resources/celerity/map.php                           | 12 ++++++------
 .../PhabricatorProjectBoardReorderController.php     |  8 ++------
 .../rsrc/css/phui/object-item/phui-oi-drag-ui.css    |  8 ++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 13f0f6bc61..b457445caa 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => 'd1bf3405',
+    'core.pkg.css' => 'ee5f28cd',
     'core.pkg.js' => '2ff7879f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '58712637',
@@ -129,7 +129,7 @@ return array(
     'rsrc/css/phui/calendar/phui-calendar.css' => '477acfaa',
     'rsrc/css/phui/object-item/phui-oi-big-ui.css' => '19f9369b',
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
-    'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => 'f12cbc9f',
+    'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
     'rsrc/css/phui/object-item/phui-oi-list-view.css' => '7c8ec27a',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
@@ -873,7 +873,7 @@ return array(
     'phui-object-box-css' => '9cff003c',
     'phui-oi-big-ui-css' => '19f9369b',
     'phui-oi-color-css' => 'cd2b9b77',
-    'phui-oi-drag-ui-css' => 'f12cbc9f',
+    'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
     'phui-oi-list-view-css' => '7c8ec27a',
     'phui-oi-simple-ui-css' => 'a8beebea',
@@ -977,6 +977,9 @@ return array(
       'javelin-stratcom',
       'javelin-vector',
     ),
+    '08f4ccc3' => array(
+      'phui-oi-list-view-css',
+    ),
     '0a0b10e9' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2170,9 +2173,6 @@ return array(
     'f10fd7a3' => array(
       'javelin-install',
     ),
-    'f12cbc9f' => array(
-      'phui-oi-list-view-css',
-    ),
     'f50152ad' => array(
       'phui-timeline-view-css',
     ),
diff --git a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
index fc348bb02f..8cf75ab2a4 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
@@ -94,7 +94,8 @@ final class PhabricatorProjectBoardReorderController
     $list = id(new PHUIObjectItemListView())
       ->setUser($viewer)
       ->setID($list_id)
-      ->setFlush(true);
+      ->setFlush(true)
+      ->setDrag(true);
 
     foreach ($columns as $column) {
       // Don't allow milestone columns to be reordered.
@@ -134,14 +135,9 @@ final class PhabricatorProjectBoardReorderController
         'reorderURI' => $reorder_uri,
       ));
 
-    $note = id(new PHUIInfoView())
-      ->appendChild(pht('Drag and drop columns to reorder them.'))
-      ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
-
     return $this->newDialog()
       ->setTitle(pht('Reorder Columns'))
       ->setWidth(AphrontDialogView::WIDTH_FORM)
-      ->appendChild($note)
       ->appendChild($list)
       ->addSubmitButton(pht('Done'));
   }
diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-drag-ui.css b/webroot/rsrc/css/phui/object-item/phui-oi-drag-ui.css
index caf9ff8dd0..5f24e2b983 100644
--- a/webroot/rsrc/css/phui/object-item/phui-oi-drag-ui.css
+++ b/webroot/rsrc/css/phui/object-item/phui-oi-drag-ui.css
@@ -23,6 +23,10 @@
   margin-top: 4px;
 }
 
+.phui-oi-drag .phui-oi-name {
+  padding-left: 0;
+}
+
 .phui-oi-drag.phui-oi-with-image-icon .phui-oi-frame,
 .phui-oi-drag.phui-oi-with-image .phui-oi-frame,
 .phui-oi-drag .phui-oi-frame {
@@ -57,3 +61,7 @@
 .phui-oi-list-drag .drag-ghost {
   margin-top: 4px;
 }
+
+.phui-oi-list-drag .phui-object-icon-pane {
+  padding-right: 8px;
+}