Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15413058
D9157.id21751.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
27 KB
Referenced Files
None
Subscribers
None
D9157.id21751.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -113,7 +113,7 @@
'rsrc/css/diviner/diviner-shared.css' => '38813222',
'rsrc/css/font/font-awesome.css' => '4c160eb7',
'rsrc/css/font/font-source-sans-pro.css' => '91d53463',
- 'rsrc/css/font/phui-font-icon-base.css' => '104caddd',
+ 'rsrc/css/font/phui-font-icon-base.css' => '74cfb6a9',
'rsrc/css/layout/phabricator-action-header-view.css' => 'c14dfc57',
'rsrc/css/layout/phabricator-action-list-view.css' => 'dcd9875f',
'rsrc/css/layout/phabricator-crumbs-view.css' => '6a23399c',
@@ -763,7 +763,7 @@
'phui-calendar-month-css' => 'a92e47d2',
'phui-document-view-css' => '3b078dc0',
'phui-feed-story-css' => '3a59c2cf',
- 'phui-font-icon-base-css' => '104caddd',
+ 'phui-font-icon-base-css' => '74cfb6a9',
'phui-fontkit-css' => 'de84aa4a',
'phui-form-css' => 'b78ec020',
'phui-form-view-css' => '867463b4',
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -43,49 +43,59 @@
switch ($reviewer->getStatus()) {
case DifferentialReviewerStatus::STATUS_ADDED:
- $item->setIcon('open', pht('Review Requested'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_OPEN,
+ 'bluegrey',
+ pht('Review Requested'));
break;
case DifferentialReviewerStatus::STATUS_ACCEPTED:
if ($is_current) {
$item->setIcon(
- 'accept-green',
+ PHUIStatusItemView::ICON_ACCEPT,
+ 'green',
pht('Accepted'));
} else {
$item->setIcon(
- 'accept-dark',
+ PHUIStatusItemView::ICON_ACCEPT,
+ 'dark',
pht('Accepted Prior Diff'));
}
break;
case DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER:
$item->setIcon(
- 'accept-dark',
+ PHUIStatusItemView::ICON_ACCEPT,
+ 'dark',
pht('Accepted Prior Diff'));
break;
case DifferentialReviewerStatus::STATUS_REJECTED:
if ($is_current) {
$item->setIcon(
- 'reject-red',
+ PHUIStatusItemView::ICON_REJECT,
+ 'red',
pht('Requested Changes'));
} else {
$item->setIcon(
- 'reject-dark',
+ PHUIStatusItemView::ICON_REJECT,
+ 'dark',
pht('Requested Changes to Prior Diff'));
}
break;
case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
$item->setIcon(
- 'reject-dark',
+ PHUIStatusItemView::ICON_REJECT,
+ 'dark',
pht('Rejected Prior Diff'));
break;
case DifferentialReviewerStatus::STATUS_COMMENTED:
if ($is_current) {
$item->setIcon(
- 'info',
+ PHUIStatusItemView::ICON_INFO,
+ 'bluegrey',
pht('Commented'));
} else {
$item->setIcon(
@@ -95,11 +105,17 @@
break;
case DifferentialReviewerStatus::STATUS_BLOCKING:
- $item->setIcon('minus-red', pht('Blocking Review'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_MINUS,
+ 'red',
+ pht('Blocking Review'));
break;
default:
- $item->setIcon('question', pht('%s?', $reviewer->getStatus()));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_QUESTION,
+ 'bluegrey',
+ pht('%s?', $reviewer->getStatus()));
break;
}
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -1073,32 +1073,57 @@
switch ($request->getAuditStatus()) {
case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
- $item->setIcon('open-blue', pht('Commented'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_OPEN,
+ 'blue',
+ pht('Commented'));
break;
case PhabricatorAuditStatusConstants::AUDIT_REQUIRED:
- $item->setIcon('warning-blue', pht('Audit Required'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_WARNING,
+ 'blue',
+ pht('Audit Required'));
break;
case PhabricatorAuditStatusConstants::CONCERNED:
- $item->setIcon('reject-red', pht('Concern Raised'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_REJECT,
+ 'red',
+ pht('Concern Raised'));
break;
case PhabricatorAuditStatusConstants::ACCEPTED:
- $item->setIcon('accept-green', pht('Accepted'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_ACCEPT,
+ 'green',
+ pht('Accepted'));
break;
case PhabricatorAuditStatusConstants::AUDIT_REQUESTED:
- $item->setIcon('warning-dark', pht('Audit Requested'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_WARNING,
+ 'dark',
+ pht('Audit Requested'));
break;
case PhabricatorAuditStatusConstants::RESIGNED:
- $item->setIcon('open-dark', pht('Resigned'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_OPEN,
+ 'dark',
+ pht('Resigned'));
break;
case PhabricatorAuditStatusConstants::CLOSED:
- $item->setIcon('accept-blue', pht('Closed'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_ACCEPT,
+ 'blue',
+ pht('Closed'));
break;
case PhabricatorAuditStatusConstants::CC:
- $item->setIcon('info-dark', pht('Subscribed'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_INFO,
+ 'dark',
+ pht('Subscribed'));
break;
default:
$item->setIcon(
- 'question-dark',
+ PHUIStatusItemView::ICON_QUESTION,
+ 'dark',
pht('%s?', $request->getAuditStatus()));
break;
}
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -684,12 +684,12 @@
if ($repository->isTracked()) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Repository Active')));
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'bluegrey')
->setTarget(pht('Repository Inactive'))
->setNote(
pht('Activate this repository to begin or resume import.')));
@@ -752,7 +752,7 @@
if (!$where) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(
pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
->setNote(pht(
@@ -762,7 +762,7 @@
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(
pht('Found Binary %s', phutil_tag('tt', array(), $binary)))
->setNote(phutil_tag('tt', array(), $where)));
@@ -787,7 +787,7 @@
if (!$in_path) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(
pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
->setNote(pht(
@@ -822,12 +822,12 @@
if ($pull_daemon) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Pull Daemon Running')));
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('Pull Daemon Not Running'))
->setNote($daemon_instructions));
}
@@ -842,12 +842,12 @@
if ($task_daemon) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Task Daemon Running')));
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('Task Daemon Not Running'))
->setNote($daemon_instructions));
}
@@ -857,13 +857,13 @@
if (Filesystem::pathExists($local_parent)) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Storage Directory OK'))
->setNote(phutil_tag('tt', array(), $local_parent)));
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('No Storage Directory'))
->setNote(
pht(
@@ -880,7 +880,7 @@
case PhabricatorRepositoryStatusMessage::CODE_ERROR:
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('Initialization Error'))
->setNote($message->getParameter('message')));
return $view;
@@ -888,13 +888,13 @@
if (Filesystem::pathExists($local_path)) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Working Copy OK'))
->setNote(phutil_tag('tt', array(), $local_path)));
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('Working Copy Error'))
->setNote(
pht(
@@ -909,14 +909,14 @@
case PhabricatorRepositoryStatusMessage::CODE_WORKING:
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('time-green')
+ ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
->setTarget(pht('Initializing Working Copy'))
->setNote(pht('Daemons are initializing the working copy.')));
return $view;
default:
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('Unknown Init Status'))
->setNote($message->getStatusCode()));
return $view;
@@ -924,7 +924,7 @@
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('time-orange')
+ ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange')
->setTarget(pht('No Working Copy Yet'))
->setNote(
pht('Waiting for daemons to build a working copy.')));
@@ -938,14 +938,14 @@
case PhabricatorRepositoryStatusMessage::CODE_ERROR:
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-red')
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
->setTarget(pht('Update Error'))
->setNote($message->getParameter('message')));
return $view;
case PhabricatorRepositoryStatusMessage::CODE_OKAY:
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Updates OK'))
->setNote(
pht(
@@ -956,7 +956,7 @@
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('time-orange')
+ ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange')
->setTarget(pht('Waiting For Update'))
->setNote(
pht('Waiting for daemons to read updates.')));
@@ -1005,21 +1005,21 @@
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('time-green')
+ ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
->setTarget(pht('Importing'))
->setNote(
pht('%s Complete', $percentage)));
} else {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green')
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
->setTarget(pht('Fully Imported')));
}
if (idx($messages, PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE)) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('up')
+ ->setIcon(PHUIStatusItemView::ICON_UP, 'indigo')
->setTarget(pht('Prioritized'))
->setNote(pht('This repository will be updated soon.')));
}
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -252,27 +252,33 @@
foreach ($targets as $target) {
switch ($target->getTargetStatus()) {
case HarbormasterBuildTarget::STATUS_PENDING:
- $icon = 'time-green';
+ $icon = PHUIStatusItemView::ICON_CLOCK;
+ $color = 'green';
$status_name = pht('Pending');
break;
case HarbormasterBuildTarget::STATUS_BUILDING:
- $icon = 'right-green';
+ $icon = PHUIStatusItemView::ICON_RIGHT;
+ $color = 'green';
$status_name = pht('Building');
break;
case HarbormasterBuildTarget::STATUS_WAITING:
- $icon = 'time-orange';
+ $icon = PHUIStatusItemView::ICON_CLOCK;
+ $color = 'orange';
$status_name = pht('Waiting');
break;
case HarbormasterBuildTarget::STATUS_PASSED:
- $icon = 'accept-green';
+ $icon = PHUIStatusItemView::ICON_ACCEPT;
+ $color = 'green';
$status_name = pht('Passed');
break;
case HarbormasterBuildTarget::STATUS_FAILED:
- $icon = 'reject-red';
+ $icon = PHUIStatusItemView::ICON_REJECT;
+ $color = 'red';
$status_name = pht('Failed');
break;
default:
- $icon = 'question';
+ $icon = PHUIStatusItemView::ICON_QUESTION;
+ $color = 'bluegrey';
$status_name = pht('Unknown');
break;
}
@@ -286,7 +292,7 @@
$target_list->addItem(
id(new PHUIStatusItemView())
- ->setIcon($icon, $status_name)
+ ->setIcon($icon, $color, $status_name)
->setTarget(pht('Target %d', $target->getID()))
->setNote($name));
}
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -314,14 +314,16 @@
$bound = phutil_tag('em', array(), pht('(null)'));
if ($is_input) {
// This is an unbound input. For now, all inputs are always required.
- $icon = 'warning-red';
+ $icon = PHUIStatusItemView::ICON_WARNING;
+ $color = 'red';
$icon_label = pht('Required Input');
$has_conflicts = true;
$error = pht('This input is required, but not configured.');
} else {
// This is an unnamed output. Outputs do not necessarily need to be
// named.
- $icon = 'open';
+ $icon = PHUIStatusItemView::ICON_OPEN;
+ $color = 'bluegrey';
$icon_label = pht('Unused Output');
}
} else {
@@ -329,10 +331,12 @@
if ($is_input) {
if (isset($available_artifacts[$key])) {
if ($available_artifacts[$key] == idx($artifact, 'type')) {
- $icon = 'accept-green';
+ $icon = PHUIStatusItemView::ICON_ACCEPT;
+ $color = 'green';
$icon_label = pht('Valid Input');
} else {
- $icon = 'warning-red';
+ $icon = PHUIStatusItemView::ICON_WARNING;
+ $color = 'red';
$icon_label = pht('Bad Input Type');
$has_conflicts = true;
$error = pht(
@@ -342,7 +346,8 @@
idx($artifact, 'type'));
}
} else {
- $icon = 'question-red';
+ $icon = PHUIStatusItemView::ICON_QUESTION;
+ $color = 'red';
$icon_label = pht('Unknown Input');
$has_conflicts = true;
$error = pht(
@@ -351,7 +356,8 @@
$key);
}
} else {
- $icon = 'down-green';
+ $icon = PHUIStatusItemView::ICON_DOWN;
+ $color = 'green';
$icon_label = pht('Valid Output');
}
}
@@ -367,7 +373,7 @@
$list->addItem(
id(new PHUIStatusItemView())
- ->setIcon($icon, $icon_label)
+ ->setIcon($icon, $color, $icon_label)
->setTarget($artifact['name'])
->setNote($note));
}
diff --git a/src/applications/harbormaster/event/HarbormasterUIEventListener.php b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
--- a/src/applications/harbormaster/event/HarbormasterUIEventListener.php
+++ b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
@@ -77,32 +77,40 @@
switch ($status) {
case HarbormasterBuild::STATUS_INACTIVE:
- $icon = 'open-dark';
+ $icon = PHUIStatusItemView::ICON_OPEN;
+ $color = 'dark';
break;
case HarbormasterBuild::STATUS_PENDING:
- $icon = 'open-blue';
+ $icon = PHUIStatusItemView::ICON_OPEN;
+ $color = 'blue';
break;
case HarbormasterBuild::STATUS_BUILDING:
- $icon = 'right-blue';
+ $icon = PHUIStatusItemView::ICON_RIGHT;
+ $color = 'blue';
break;
case HarbormasterBuild::STATUS_PASSED:
- $icon = 'accept-green';
+ $icon = PHUIStatusItemView::ICON_ACCEPT;
+ $color = 'green';
break;
case HarbormasterBuild::STATUS_FAILED:
- $icon = 'reject-red';
+ $icon = PHUIStatusItemView::ICON_REJECT;
+ $color = 'red';
break;
case HarbormasterBuild::STATUS_ERROR:
- $icon = 'minus-red';
+ $icon = PHUIStatusItemView::ICON_MINUS;
+ $color = 'red';
break;
case HarbormasterBuild::STATUS_STOPPED:
- $icon = 'minus-dark';
+ $icon = PHUIStatusItemView::ICON_MINUS;
+ $color = 'dark';
break;
default:
- $icon = 'question';
+ $icon = PHUIStatusItemView::ICON_QUESTION;
+ $color = 'bluegrey';
break;
}
- $item->setIcon($icon, $status_name);
+ $item->setIcon($icon, $color, $status_name);
$status_view->addItem($item);
diff --git a/src/applications/phrequent/event/PhrequentUIEventListener.php b/src/applications/phrequent/event/PhrequentUIEventListener.php
--- a/src/applications/phrequent/event/PhrequentUIEventListener.php
+++ b/src/applications/phrequent/event/PhrequentUIEventListener.php
@@ -117,13 +117,22 @@
switch ($state) {
case 'active':
- $item->setIcon('time-green', pht('Working Now'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_CLOCK,
+ 'green',
+ pht('Working Now'));
break;
case 'suspended':
- $item->setIcon('time-yellow', pht('Interrupted'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_CLOCK,
+ 'yellow',
+ pht('Interrupted'));
break;
case 'stopped':
- $item->setIcon('time-orange', pht('Not Working Now'));
+ $item->setIcon(
+ PHUIStatusItemView::ICON_CLOCK,
+ 'bluegrey',
+ pht('Not Working Now'));
break;
}
diff --git a/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php b/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
--- a/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
@@ -44,15 +44,18 @@
foreach ($intents as $phid => $intent) {
switch ($intent) {
case ReleephRequest::INTENT_WANT:
- $icon = 'accept-green';
+ $icon = PHUIStatusItemView::ICON_ACCEPT;
+ $color = 'green';
$label = pht('Want');
break;
case ReleephRequest::INTENT_PASS:
- $icon = 'reject-red';
+ $icon = PHUIStatusItemView::ICON_REJECT;
+ $color = 'red';
$label = pht('Pass');
break;
default:
- $icon = 'question';
+ $icon = PHUIStatusItemView::ICON_QUESTION;
+ $color = 'bluegrey';
$label = pht('Unknown Intent (%s)', $intent);
break;
}
@@ -64,7 +67,7 @@
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon($icon, $label)
+ ->setIcon($icon, $color, $label)
->setTarget($target));
}
diff --git a/src/applications/uiexample/examples/PhabricatorUIStatusExample.php b/src/applications/uiexample/examples/PhabricatorUIStatusExample.php
--- a/src/applications/uiexample/examples/PhabricatorUIStatusExample.php
+++ b/src/applications/uiexample/examples/PhabricatorUIStatusExample.php
@@ -19,26 +19,26 @@
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('accept-green', pht('Yum'))
+ ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green', pht('Yum'))
->setTarget(pht('Apple'))
->setNote(pht('You can eat them.')));
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('add-blue', pht('Has Peel'))
+ ->setIcon(PHUIStatusItemView::ICON_ADD, 'blue', pht('Has Peel'))
->setTarget(pht('Banana'))
->setNote(pht('Comes in bunches.'))
->setHighlighted(true));
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('warning-dark', pht('Caution'))
+ ->setIcon(PHUIStatusItemView::ICON_WARNING, 'dark', pht('Caution'))
->setTarget(pht('Pomegranite'))
->setNote(pht('Lots of seeds. Watch out.')));
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon('reject-red', pht('Bleh!'))
+ ->setIcon(PHUIStatusItemView::ICON_REJECT, 'red', pht('Bleh!'))
->setTarget(pht('Zucchini'))
->setNote(pht('Slimy and gross. Yuck!')));
@@ -54,15 +54,28 @@
$view = new PHUIStatusListView();
- $manifest = PHUIIconView::getSheetManifest(PHUIIconView::SPRITE_STATUS);
-
- foreach ($manifest as $sprite) {
- $name = substr($sprite['name'], strlen('status-'));
+ $manifest = array(
+ PHUIStatusItemView::ICON_ACCEPT => 'PHUIStatusItemView::ICON_ACCEPT',
+ PHUIStatusItemView::ICON_REJECT => 'PHUIStatusItemView::ICON_REJECT',
+ PHUIStatusItemView::ICON_LEFT => 'PHUIStatusItemView::ICON_LEFT',
+ PHUIStatusItemView::ICON_RIGHT => 'PHUIStatusItemView::ICON_RIGHT',
+ PHUIStatusItemView::ICON_UP => 'PHUIStatusItemView::ICON_UP',
+ PHUIStatusItemView::ICON_DOWN => 'PHUIStatusItemView::ICON_DOWN',
+ PHUIStatusItemView::ICON_QUESTION => 'PHUIStatusItemView::ICON_QUESTION',
+ PHUIStatusItemView::ICON_WARNING => 'PHUIStatusItemView::ICON_WARNING',
+ PHUIStatusItemView::ICON_INFO => 'PHUIStatusItemView::ICON_INFO',
+ PHUIStatusItemView::ICON_ADD => 'PHUIStatusItemView::ICON_ADD',
+ PHUIStatusItemView::ICON_MINUS => 'PHUIStatusItemView::ICON_MINUS',
+ PHUIStatusItemView::ICON_OPEN => 'PHUIStatusItemView::ICON_OPEN',
+ PHUIStatusItemView::ICON_CLOCK => 'PHUIStatusItemView::ICON_CLOCK',
+ );
+
+ foreach ($manifest as $icon => $label) {
$view->addItem(
id(new PHUIStatusItemView())
- ->setIcon($name)
- ->setTarget($name));
+ ->setIcon($icon, 'indigo')
+ ->setTarget($label));
}
$out[] = id(new PHUIHeaderView())
diff --git a/src/view/phui/PHUIStatusItemView.php b/src/view/phui/PHUIStatusItemView.php
--- a/src/view/phui/PHUIStatusItemView.php
+++ b/src/view/phui/PHUIStatusItemView.php
@@ -4,13 +4,30 @@
private $icon;
private $iconLabel;
+ private $iconColor;
private $target;
private $note;
private $highlighted;
- public function setIcon($icon, $label = null) {
+ const ICON_ACCEPT = 'fa-check-circle';
+ const ICON_REJECT = 'fa-times-circle';
+ const ICON_LEFT = 'fa-chevron-circle-left';
+ const ICON_RIGHT = 'fa-chevron-circle-right';
+ const ICON_UP = 'fa-chevron-circle-up';
+ const ICON_DOWN = 'fa-chevron-circle-down';
+ const ICON_QUESTION = 'fa-question-circle';
+ const ICON_WARNING = 'fa-exclamation-circle';
+ const ICON_INFO = 'fa-info-circle';
+ const ICON_ADD = 'fa-plus-circle';
+ const ICON_MINUS = 'fa-minus-circle';
+ const ICON_OPEN = 'fa-circle-o';
+ const ICON_CLOCK = 'fa-clock-o';
+
+ /* render_textarea */
+ public function setIcon($icon, $color = null, $label = null) {
$this->icon = $icon;
$this->iconLabel = $label;
+ $this->iconColor = $color;
return $this;
}
@@ -53,8 +70,7 @@
$icon = null;
if ($this->icon) {
$icon = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_STATUS)
- ->setSpriteIcon($this->icon);
+ ->setIconFont($this->icon.' '.$this->iconColor);
if ($this->iconLabel) {
Javelin::initBehavior('phabricator-tooltips');
diff --git a/webroot/rsrc/css/font/phui-font-icon-base.css b/webroot/rsrc/css/font/phui-font-icon-base.css
--- a/webroot/rsrc/css/font/phui-font-icon-base.css
+++ b/webroot/rsrc/css/font/phui-font-icon-base.css
@@ -104,6 +104,9 @@
}
}
+.phui-icon-view.dark {
+ color: {$darkgreytext};
+}
.phui-icon-view.bluegrey {
color: #7787a6;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Mar 20, 4:48 PM (5 d, 19 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7713459
Default Alt Text
D9157.id21751.diff (27 KB)
Attached To
Mode
D9157: Update PHUIStatusItemView to FontAwesome
Attached
Detach File
Event Timeline
Log In to Comment