From db778cb3e3952b9984f18a80078a089d0732bc8a Mon Sep 17 00:00:00 2001 From: Bob Trahan Date: Mon, 6 Jan 2014 16:07:47 -0800 Subject: [PATCH] Audit - tweak colors Summary: See github issue 413. This diff adds color to the commit view as the user expects *AND* adds green to both audit and commit views. I looked in the history (D6184) and I can't tell how expected green was, but it feels nice to me given differential color coding. Test Plan: looked at lists of audits and commits with pretty colors. Reviewers: epriestley, chad Reviewed By: epriestley CC: Korvin, epriestley, aran Differential Revision: https://secure.phabricator.com/D7900 --- .../PhabricatorAuditCommitStatusConstants.php | 19 +++++++++++++++++++ .../PhabricatorAuditStatusConstants.php | 3 +++ .../view/PhabricatorAuditCommitListView.php | 6 +++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php index 1f6164733a..aef3c7e224 100644 --- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php +++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php @@ -31,4 +31,23 @@ public static function getOpenStatusConstants() { ); } + public static function getStatusColor($code) { + switch ($code) { + case self::CONCERN_RAISED: + $color = 'red'; + break; + case self::NEEDS_AUDIT: + case self::PARTIALLY_AUDITED: + $color = 'orange'; + break; + case self::FULLY_AUDITED: + $color = 'green'; + break; + default: + $color = null; + break; + } + return $color; + } + } diff --git a/src/applications/audit/constants/PhabricatorAuditStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditStatusConstants.php index 8d8ce45e68..f80760d614 100644 --- a/src/applications/audit/constants/PhabricatorAuditStatusConstants.php +++ b/src/applications/audit/constants/PhabricatorAuditStatusConstants.php @@ -40,6 +40,9 @@ public static function getStatusColor($code) { case self::AUDIT_REQUIRED: $color = 'orange'; break; + case self::ACCEPTED: + $color = 'green'; + break; default: $color = null; break; diff --git a/src/applications/audit/view/PhabricatorAuditCommitListView.php b/src/applications/audit/view/PhabricatorAuditCommitListView.php index cc3cc0e1ea..f654efcbe2 100644 --- a/src/applications/audit/view/PhabricatorAuditCommitListView.php +++ b/src/applications/audit/view/PhabricatorAuditCommitListView.php @@ -88,10 +88,14 @@ public function render() { $auditors = phutil_implode_html(', ', $auditors); } $committed = phabricator_datetime($commit->getEpoch(), $this->user); + $audit_status = $commit->getAuditStatus(); $commit_status = PhabricatorAuditCommitStatusConstants::getStatusName( - $commit->getAuditStatus()); + $audit_status); + $status_color = PhabricatorAuditCommitStatusConstants::getStatusColor( + $audit_status); $item = id(new PHUIObjectItemView()) + ->setBarColor($status_color) ->setObjectName($commit_name) ->setHeader($commit_desc) ->setHref($commit_link)