From 2de06a5375c6b786d8f32d69bc98a695cdbed9ce Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 8 Mar 2018 11:52:48 -0800 Subject: [PATCH] Add some more UI reminder text about draft revisions Summary: See PHI433. This beefs up reminder texts for drafts a little bit since some users in the wild aren't always seeing/remembering the existing, fairly subtle hints. Test Plan: Created a reivsion with `--draft`, viewed it, saw richer reminders. Differential Revision: https://secure.phabricator.com/D19204 --- .../constants/DifferentialRevisionStatus.php | 6 ++--- .../customfield/DifferentialDraftField.php | 24 +++++++++++++++++-- .../editor/DifferentialRevisionEditEngine.php | 8 +++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php index 70f0e33b28..e3acace3f0 100644 --- a/src/applications/differential/constants/DifferentialRevisionStatus.php +++ b/src/applications/differential/constants/DifferentialRevisionStatus.php @@ -172,10 +172,10 @@ final class DifferentialRevisionStatus extends Phobject { 'name' => pht('Draft'), // For legacy clients, treat this as though it is "Needs Review". 'legacy' => 0, - 'icon' => 'fa-file-text-o', + 'icon' => 'fa-spinner', 'closed' => false, - 'color.icon' => 'grey', - 'color.tag' => 'grey', + 'color.icon' => 'pink', + 'color.tag' => 'pink', 'color.ansi' => null, ), ); diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php index 5d625e3ce9..8147708bca 100644 --- a/src/applications/differential/customfield/DifferentialDraftField.php +++ b/src/applications/differential/customfield/DifferentialDraftField.php @@ -37,9 +37,14 @@ final class DifferentialDraftField } // If the author has held this revision as a draft explicitly, don't - // show any misleading messages about it autosubmitting later. + // show any misleading messages about it autosubmitting later. We do show + // reminder text. if ($revision->getHoldAsDraft()) { - return array(); + return array( + pht( + 'This is a draft revision that has not yet been submitted for '. + 'review.'), + ); } $warnings = array(); @@ -93,4 +98,19 @@ final class DifferentialDraftField return $warnings; } + public function getWarningsForDetailView() { + $revision = $this->getObject(); + + if (!$revision->isDraft()) { + return array(); + } + + return array( + pht( + 'This revision is currently a draft. You can leave comments, but '. + 'no one will be notified until the revision is submitted for '. + 'review.'), + ); + } + } diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php index fe1b983f1a..d462fd7571 100644 --- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php +++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php @@ -71,6 +71,14 @@ final class DifferentialRevisionEditEngine return pht('Revision'); } + protected function getCommentViewButtonText($object) { + if ($object->isDraft()) { + return pht('Submit Quietly'); + } + + return parent::getCommentViewButtonText(); + } + protected function getObjectViewURI($object) { return $object->getURI(); }