@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
[Redesign] Remove remaining barColor callsites
Summary: Ref T8099, Fixes T8341. Switches all remaining callsites to setBarColor to use setStatusIcon (sans workboards).
Test Plan: Test each of the applications I changed as I could (not Releeph).
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T8341, T8099
Differential Revision: https://secure.phabricator.com/D13059
+30
-14
+4
-4
src/applications/audit/view/PhabricatorAuditListView.php
+4
-4
src/applications/audit/view/PhabricatorAuditListView.php
···
157
157
->setObjectName($commit_name)
158
158
->setHeader($commit_desc)
159
159
->setHref($commit_link)
160
-
->addAttribute($status_text)
160
+
->addAttribute(pht('Author: %s', $author_name))
161
161
->addAttribute($reasons)
162
-
->addIcon('none', $committed)
163
-
->setSubHead(pht('Author: %s', $author_name));
162
+
->addIcon('none', $committed);
164
163
165
164
if (!empty($auditors)) {
166
165
$item->addByLine(pht('Auditors: %s', $auditors));
167
166
}
168
167
169
168
if ($status_color) {
170
-
$item->setStatusIcon('fa-exclamation-triangle '.$status_color);
169
+
$item->setStatusIcon(
170
+
'fa-exclamation-triangle '.$status_color, $status_text);
171
171
}
172
172
173
173
$list->addItem($item);
+2
-1
src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+2
-1
src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
···
206
206
$item->addIcon('fa-wrench grey', pht('Manual'));
207
207
}
208
208
209
-
$item->setBarColor(HarbormasterBuildable::getBuildableStatusColor(
209
+
$item->setStatusIcon('fa-wrench '.
210
+
HarbormasterBuildable::getBuildableStatusColor(
210
211
$buildable->getBuildableStatus()));
211
212
$item->addByline(HarbormasterBuildable::getBuildableStatusName(
212
213
$buildable->getBuildableStatus()));
+2
-1
src/applications/phortune/controller/PhortuneAccountViewController.php
+2
-1
src/applications/phortune/controller/PhortuneAccountViewController.php
···
143
143
144
144
switch ($method->getStatus()) {
145
145
case PhortunePaymentMethod::STATUS_ACTIVE:
146
-
$item->setBarColor('green');
146
+
$item->setStatusIcon('fa-check green');
147
147
148
148
$disable_uri = $this->getApplicationURI('card/'.$id.'/disable/');
149
149
$item->addAction(
···
154
154
->setWorkflow(true));
155
155
break;
156
156
case PhortunePaymentMethod::STATUS_DISABLED:
157
+
$item->setStatusIcon('fa-ban lightbluetext');
157
158
$item->setDisabled(true);
158
159
break;
159
160
}
+2
-2
src/applications/phortune/controller/PhortuneMerchantViewController.php
+2
-2
src/applications/phortune/controller/PhortuneMerchantViewController.php
···
229
229
230
230
if ($provider->isEnabled()) {
231
231
if ($provider->isAcceptingLivePayments()) {
232
-
$item->setBarColor('green');
232
+
$item->setStatusIcon('fa-check green');
233
233
} else {
234
-
$item->setBarColor('yellow');
234
+
$item->setStatusIcon('fa-warning yellow');
235
235
$item->addIcon('fa-exclamation-triangle', pht('Test Mode'));
236
236
}
237
237
+1
-1
src/applications/phrequent/query/PhrequentSearchEngine.php
+1
-1
src/applications/phrequent/query/PhrequentSearchEngine.php
+10
src/applications/ponder/constants/PonderQuestionStatus.php
+10
src/applications/ponder/constants/PonderQuestionStatus.php
···
22
22
23
23
public static function getQuestionStatusTagColor($status) {
24
24
$map = array(
25
+
self::STATUS_OPEN => PHUITagView::COLOR_BLUE,
25
26
self::STATUS_CLOSED => PHUITagView::COLOR_BLACK,
27
+
);
28
+
29
+
return idx($map, $status);
30
+
}
31
+
32
+
public static function getQuestionStatusIcon($status) {
33
+
$map = array(
34
+
self::STATUS_OPEN => 'fa-question-circle',
35
+
self::STATUS_CLOSED => 'fa-check-square-o',
26
36
);
27
37
28
38
return idx($map, $status);
+7
-3
src/applications/ponder/query/PonderQuestionSearchEngine.php
+7
-3
src/applications/ponder/query/PonderQuestionSearchEngine.php
···
144
144
->setUser($viewer);
145
145
146
146
foreach ($questions as $question) {
147
+
$color = PonderQuestionStatus::getQuestionStatusTagColor(
148
+
$question->getStatus());
149
+
$icon = PonderQuestionStatus::getQuestionStatusIcon(
150
+
$question->getStatus());
151
+
$full_status = PonderQuestionStatus::getQuestionStatusFullName(
152
+
$question->getStatus());
147
153
$item = new PHUIObjectItemView();
148
154
$item->setObjectName('Q'.$question->getID());
149
155
$item->setHeader($question->getTitle());
150
156
$item->setHref('/Q'.$question->getID());
151
157
$item->setObject($question);
152
-
$item->setBarColor(
153
-
PonderQuestionStatus::getQuestionStatusTagColor(
154
-
$question->getStatus()));
158
+
$item->setStatusIcon($icon.' '.$color, $full_status);
155
159
156
160
$created_date = phabricator_date($question->getDateCreated(), $viewer);
157
161
$item->addIcon('none', $created_date);
+1
-1
src/applications/releeph/controller/product/ReleephProductViewController.php
+1
-1
src/applications/releeph/controller/product/ReleephProductViewController.php
···
112
112
113
113
$open_count = count(idx($requests, $branch->getID(), array()));
114
114
if ($open_count) {
115
-
$item->setBarColor('orange');
115
+
$item->setStatusIcon('fa-code-fork orange');
116
116
$item->addIcon(
117
117
'fa-code-fork',
118
118
pht('%d Open Pull Request(s)', new PhutilNumber($open_count)));
+1
-1
src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php
+1
-1
src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php