diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php --- a/src/applications/audit/view/PhabricatorAuditListView.php +++ b/src/applications/audit/view/PhabricatorAuditListView.php @@ -157,17 +157,17 @@ ->setObjectName($commit_name) ->setHeader($commit_desc) ->setHref($commit_link) - ->addAttribute($status_text) + ->addAttribute(pht('Author: %s', $author_name)) ->addAttribute($reasons) - ->addIcon('none', $committed) - ->setSubHead(pht('Author: %s', $author_name)); + ->addIcon('none', $committed); if (!empty($auditors)) { $item->addByLine(pht('Auditors: %s', $auditors)); } if ($status_color) { - $item->setStatusIcon('fa-exclamation-triangle '.$status_color); + $item->setStatusIcon( + 'fa-exclamation-triangle '.$status_color, $status_text); } $list->addItem($item); diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php --- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php +++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php @@ -206,7 +206,8 @@ $item->addIcon('fa-wrench grey', pht('Manual')); } - $item->setBarColor(HarbormasterBuildable::getBuildableStatusColor( + $item->setStatusIcon('fa-wrench '. + HarbormasterBuildable::getBuildableStatusColor( $buildable->getBuildableStatus())); $item->addByline(HarbormasterBuildable::getBuildableStatusName( $buildable->getBuildableStatus())); diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php --- a/src/applications/phortune/controller/PhortuneAccountViewController.php +++ b/src/applications/phortune/controller/PhortuneAccountViewController.php @@ -143,7 +143,7 @@ switch ($method->getStatus()) { case PhortunePaymentMethod::STATUS_ACTIVE: - $item->setBarColor('green'); + $item->setStatusIcon('fa-check green'); $disable_uri = $this->getApplicationURI('card/'.$id.'/disable/'); $item->addAction( @@ -154,6 +154,7 @@ ->setWorkflow(true)); break; case PhortunePaymentMethod::STATUS_DISABLED: + $item->setStatusIcon('fa-ban lightbluetext'); $item->setDisabled(true); break; } diff --git a/src/applications/phortune/controller/PhortuneMerchantViewController.php b/src/applications/phortune/controller/PhortuneMerchantViewController.php --- a/src/applications/phortune/controller/PhortuneMerchantViewController.php +++ b/src/applications/phortune/controller/PhortuneMerchantViewController.php @@ -229,9 +229,9 @@ if ($provider->isEnabled()) { if ($provider->isAcceptingLivePayments()) { - $item->setBarColor('green'); + $item->setStatusIcon('fa-check green'); } else { - $item->setBarColor('yellow'); + $item->setStatusIcon('fa-warning yellow'); $item->addIcon('fa-exclamation-triangle', pht('Test Mode')); } diff --git a/src/applications/phrequent/query/PhrequentSearchEngine.php b/src/applications/phrequent/query/PhrequentSearchEngine.php --- a/src/applications/phrequent/query/PhrequentSearchEngine.php +++ b/src/applications/phrequent/query/PhrequentSearchEngine.php @@ -183,7 +183,7 @@ '/phrequent/track/stop/'. $usertime->getObjectPHID().'/')); } - $item->setBarColor('green'); + $item->setStatusIcon('fa-clock-o green'); } $view->addItem($item); diff --git a/src/applications/ponder/constants/PonderQuestionStatus.php b/src/applications/ponder/constants/PonderQuestionStatus.php --- a/src/applications/ponder/constants/PonderQuestionStatus.php +++ b/src/applications/ponder/constants/PonderQuestionStatus.php @@ -22,10 +22,20 @@ public static function getQuestionStatusTagColor($status) { $map = array( + self::STATUS_OPEN => PHUITagView::COLOR_BLUE, self::STATUS_CLOSED => PHUITagView::COLOR_BLACK, ); return idx($map, $status); } + public static function getQuestionStatusIcon($status) { + $map = array( + self::STATUS_OPEN => 'fa-question-circle', + self::STATUS_CLOSED => 'fa-check-square-o', + ); + + return idx($map, $status); + } + } diff --git a/src/applications/ponder/query/PonderQuestionSearchEngine.php b/src/applications/ponder/query/PonderQuestionSearchEngine.php --- a/src/applications/ponder/query/PonderQuestionSearchEngine.php +++ b/src/applications/ponder/query/PonderQuestionSearchEngine.php @@ -144,14 +144,18 @@ ->setUser($viewer); foreach ($questions as $question) { + $color = PonderQuestionStatus::getQuestionStatusTagColor( + $question->getStatus()); + $icon = PonderQuestionStatus::getQuestionStatusIcon( + $question->getStatus()); + $full_status = PonderQuestionStatus::getQuestionStatusFullName( + $question->getStatus()); $item = new PHUIObjectItemView(); $item->setObjectName('Q'.$question->getID()); $item->setHeader($question->getTitle()); $item->setHref('/Q'.$question->getID()); $item->setObject($question); - $item->setBarColor( - PonderQuestionStatus::getQuestionStatusTagColor( - $question->getStatus())); + $item->setStatusIcon($icon.' '.$color, $full_status); $created_date = phabricator_date($question->getDateCreated(), $viewer); $item->addIcon('none', $created_date); diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php --- a/src/applications/releeph/controller/product/ReleephProductViewController.php +++ b/src/applications/releeph/controller/product/ReleephProductViewController.php @@ -112,7 +112,7 @@ $open_count = count(idx($requests, $branch->getID(), array())); if ($open_count) { - $item->setBarColor('orange'); + $item->setStatusIcon('fa-code-fork orange'); $item->addIcon( 'fa-code-fork', pht('%d Open Pull Request(s)', new PhutilNumber($open_count))); diff --git a/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php b/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php --- a/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php +++ b/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php @@ -79,7 +79,7 @@ ->addSigil('field-spec-toggle') ->setIcon('fa-plus')); - $enabled_item->setBarColor('green'); + $enabled_item->setStatusIcon('fa-check green'); if (!$field->canDisableField()) { $enabled_item->addAction(