revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 05:50:55 +01:00
Code Issues Releases Wiki Activity

Move PhabricatorTagView to PHUITagView

Browse source 
Summary: For consistency and great justice.

Test Plan: tested audit, uiexamples, action headers

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D7967
This commit is contained in:
Chad Little 2014-01-14 14:09:52 -08:00
parent a716fe99f3
commit 31a2bebf63
31 changed files with 186 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
resources/celerity/map.php
View file

@ -7,7 +7,7 @@
return array(
'names' =>
array(
'core.pkg.css' => 'a35f9047',
'core.pkg.css' => 'cc7229ab',
'core.pkg.js' => 'c907bd96',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '827749c1',
@ -117,14 +117,13 @@ return array(
'rsrc/css/core/syntax.css' => '3c18c1cb',
'rsrc/css/core/z-index.css' => '1bbbd4f1',
'rsrc/css/diviner/diviner-shared.css' => 'be90f718',
'rsrc/css/layout/phabricator-action-header-view.css' => 'b6e919a4',
'rsrc/css/layout/phabricator-action-header-view.css' => 'cc654b91',
'rsrc/css/layout/phabricator-action-list-view.css' => '81383e25',
'rsrc/css/layout/phabricator-crumbs-view.css' => '2d9db584',
'rsrc/css/layout/phabricator-filetree-view.css' => 'a8c86ace',
'rsrc/css/layout/phabricator-hovercard-view.css' => '67c12b16',
'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0',
'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814',
'rsrc/css/layout/phabricator-tag-view.css' => '4c983c74',
'rsrc/css/layout/phabricator-timeline-view.css' => 'f4f846c4',
'rsrc/css/phui/phui-box.css' => '21da4d8c',
'rsrc/css/phui/phui-button.css' => '8106a67a',
@ -132,17 +131,18 @@ return array(
'rsrc/css/phui/phui-feed-story.css' => '3a59c2cf',
'rsrc/css/phui/phui-form-view.css' => '3179980c',
'rsrc/css/phui/phui-form.css' => 'b78ec020',
'rsrc/css/phui/phui-header-view.css' => '1a93f1d9',
'rsrc/css/phui/phui-header-view.css' => '472a6003',
'rsrc/css/phui/phui-icon.css' => '29e83226',
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-list.css' => '2edb76cf',
'rsrc/css/phui/phui-object-box.css' => '4f916b80',
'rsrc/css/phui/phui-object-item-list-view.css' => 'e8192ada',
'rsrc/css/phui/phui-pinboard-view.css' => '53c5fca0',
'rsrc/css/phui/phui-property-list-view.css' => '354465ae',
'rsrc/css/phui/phui-property-list-view.css' => 'dbf53b12',
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => '2f562399',
'rsrc/css/phui/phui-tag-view.css' => '428d5017',
'rsrc/css/phui/phui-text.css' => '23e9b4b7',
'rsrc/css/phui/phui-workboard-view.css' => 'bf70dd2e',
'rsrc/css/phui/phui-workpanel-view.css' => 'ffb31e99',
@ -665,7 +665,7 @@ return array(
'paste-css' => 'aa1767d1',
'path-typeahead' => 'f7fc67ec',
'people-profile-css' => 'd0bababe',
'phabricator-action-header-view-css' => 'b6e919a4',
'phabricator-action-header-view-css' => 'cc654b91',
'phabricator-action-list-view-css' => '81383e25',
'phabricator-application-launch-view-css' => '6f8453d9',
'phabricator-busy' => '6453c869',
@ -707,7 +707,6 @@ return array(
'phabricator-slowvote-css' => '266df6a1',
'phabricator-source-code-view-css' => '62a99814',
'phabricator-standard-page-view' => '517cdfb1',
'phabricator-tag-view-css' => '4c983c74',
'phabricator-textareautils' => 'b3ec3cfc',
'phabricator-timeline-view-css' => 'f4f846c4',
'phabricator-tooltip' => '0a81ea29',
@ -738,17 +737,18 @@ return array(
'phui-feed-story-css' => '3a59c2cf',
'phui-form-css' => 'b78ec020',
'phui-form-view-css' => '3179980c',
'phui-header-view-css' => '1a93f1d9',
'phui-header-view-css' => '472a6003',
'phui-icon-view-css' => '29e83226',
'phui-info-panel-css' => '27ea50a1',
'phui-list-view-css' => '2edb76cf',
'phui-object-box-css' => '4f916b80',
'phui-object-item-list-view-css' => 'e8192ada',
'phui-pinboard-view-css' => '53c5fca0',
'phui-property-list-view-css' => '354465ae',
'phui-property-list-view-css' => 'dbf53b12',
'phui-remarkup-preview-css' => '19ad512b',
'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => '2f562399',
'phui-tag-view-css' => '428d5017',
'phui-text-css' => '23e9b4b7',
'phui-workboard-view-css' => 'bf70dd2e',
'phui-workpanel-view-css' => 'ffb31e99',
@ -2045,7 +2045,7 @@ return array(
38 => 'phabricator-application-launch-view-css',
39 => 'phabricator-action-list-view-css',
40 => 'phui-property-list-view-css',
41 => 'phabricator-tag-view-css',
41 => 'phui-tag-view-css',
42 => 'phui-list-view-css',
),
'core.pkg.js' =>

2
resources/celerity/packages.php
View file

@ -112,7 +112,7 @@ return array(
'phabricator-application-launch-view-css',
'phabricator-action-list-view-css',
'phui-property-list-view-css',
'phabricator-tag-view-css',
'phui-tag-view-css',
'phui-list-view-css',
),
'differential.pkg.css' => array(

8
src/__phutil_library_map__.php
View file

@ -1001,6 +1001,8 @@ phutil_register_library_map(array(
'PHUIRemarkupPreviewPanel' => 'view/phui/PHUIRemarkupPreviewPanel.php',
'PHUIStatusItemView' => 'view/phui/PHUIStatusItemView.php',
'PHUIStatusListView' => 'view/phui/PHUIStatusListView.php',
'PHUITagExample' => 'applications/uiexample/examples/PHUITagExample.php',
'PHUITagView' => 'view/phui/PHUITagView.php',
'PHUITextExample' => 'applications/uiexample/examples/PHUITextExample.php',
'PHUITextView' => 'view/phui/PHUITextView.php',
'PHUIWorkboardExample' => 'applications/uiexample/examples/PHUIWorkboardExample.php',
@ -1998,8 +2000,6 @@ phutil_register_library_map(array(
'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php',
'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
'PhabricatorSyntaxHighlightingConfigOptions' => 'applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php',
'PhabricatorTagExample' => 'applications/uiexample/examples/PhabricatorTagExample.php',
'PhabricatorTagView' => 'view/layout/PhabricatorTagView.php',
'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php',
'PhabricatorTestController' => 'applications/base/controller/__tests__/PhabricatorTestController.php',
@ -3542,6 +3542,8 @@ phutil_register_library_map(array(
'PHUIRemarkupPreviewPanel' => 'AphrontTagView',
'PHUIStatusItemView' => 'AphrontTagView',
'PHUIStatusListView' => 'AphrontTagView',
'PHUITagExample' => 'PhabricatorUIExample',
'PHUITagView' => 'AphrontView',
'PHUITextExample' => 'PhabricatorUIExample',
'PHUITextView' => 'AphrontTagView',
'PHUIWorkboardExample' => 'PhabricatorUIExample',
@ -4643,8 +4645,6 @@ phutil_register_library_map(array(
'PhabricatorSubscriptionsUIEventListener' => 'PhabricatorEventListener',
'PhabricatorSymbolNameLinter' => 'ArcanistXHPASTLintNamingHook',
'PhabricatorSyntaxHighlightingConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorTagExample' => 'PhabricatorUIExample',
'PhabricatorTagView' => 'AphrontView',
'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
'PhabricatorTestController' => 'PhabricatorController',

4
src/applications/auth/controller/config/PhabricatorAuthEditController.php
View file

@ -212,8 +212,8 @@ final class PhabricatorAuthEditController
'existing Phabricator accounts. If you disable this, Phabricator '.
'accounts will be permanently bound to provider accounts.'));
$status_tag = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE);
$status_tag = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE);
if ($is_new) {
$status_tag
->setName(pht('New Provider'))

14
src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
View file

@ -31,29 +31,29 @@ final class PhabricatorDaemonLogViewController
$header = id(new PHUIHeaderView())
->setHeader($log->getDaemon());
$tag = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE);
$tag = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE);
$status = $log->getStatus();
switch ($status) {
case PhabricatorDaemonLog::STATUS_UNKNOWN:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_ORANGE);
$tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
$tag->setName(pht('Unknown'));
break;
case PhabricatorDaemonLog::STATUS_RUNNING:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_GREEN);
$tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
$tag->setName(pht('Running'));
break;
case PhabricatorDaemonLog::STATUS_DEAD:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_RED);
$tag->setBackgroundColor(PHUITagView::COLOR_RED);
$tag->setName(pht('Dead'));
break;
case PhabricatorDaemonLog::STATUS_WAIT:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_BLUE);
$tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
$tag->setName(pht('Waiting'));
break;
case PhabricatorDaemonLog::STATUS_EXITED:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_GREY);
$tag->setBackgroundColor(PHUITagView::COLOR_GREY);
$tag->setName(pht('Exited'));
break;
}

4
src/applications/differential/field/specification/DifferentialAsanaRepresentationFieldSpecification.php
View file

@ -65,11 +65,11 @@ final class DifferentialAsanaRepresentationFieldSpecification
),
));
return id(new PhabricatorTagView())
return id(new PHUITagView())
->setID($tag_id)
->setName($href)
->setHref($href)
->setType(PhabricatorTagView::TYPE_OBJECT)
->setType(PHUITagView::TYPE_OBJECT)
->setExternal(true);
}

4
src/applications/differential/view/DifferentialRevisionDetailView.php
View file

@ -169,8 +169,8 @@ final class DifferentialRevisionDetailView extends AphrontView {
$status_name =
ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);
return id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
return id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setName($status_name);
}

12
src/applications/diffusion/controller/DiffusionCommitController.php
View file

@ -487,22 +487,22 @@ final class DiffusionCommitController extends DiffusionController {
if ($commit->getAuditStatus()) {
$status = PhabricatorAuditCommitStatusConstants::getStatusName(
$commit->getAuditStatus());
$tag = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
$tag = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setName($status);
switch ($commit->getAuditStatus()) {
case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_ORANGE);
$tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
break;
case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_RED);
$tag->setBackgroundColor(PHUITagView::COLOR_RED);
break;
case PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_BLUE);
$tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
break;
case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
$tag->setBackgroundColor(PhabricatorTagView::COLOR_GREEN);
$tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
break;
}

16
src/applications/diviner/controller/DivinerAtomController.php
View file

@ -72,9 +72,9 @@ final class DivinerAtomController extends DivinerController {
$header = id(new PHUIHeaderView())
->setHeader($this->renderFullSignature($symbol))
->addTag(
id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLUE)
id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLUE)
->setName(DivinerAtom::getAtomTypeNameString($atom->getType())));
$properties = id(new PHUIPropertyListView());
@ -206,9 +206,9 @@ final class DivinerAtomController extends DivinerController {
$inherited = $spec['inherited'];
if ($inherited) {
$method_header->addTag(
id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_GREY)
id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_GREY)
->setName(pht('Inherited')));
}
@ -291,8 +291,8 @@ final class DivinerAtomController extends DivinerController {
}
private function renderAtomTag(DivinerLiveSymbol $symbol) {
return id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_OBJECT)
return id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setName($symbol->getName())
->setHref($symbol->getURI());
}

4
src/applications/doorkeeper/controller/DoorkeeperTagsController.php
View file

@ -45,11 +45,11 @@ final class DoorkeeperTagsController extends PhabricatorController {
$id = $id_map[$key];
$tag = id(new PhabricatorTagView())
$tag = id(new PHUITagView())
->setID($id)
->setName($ref->getFullName())
->setHref($uri)
->setType(PhabricatorTagView::TYPE_OBJECT)
->setType(PHUITagView::TYPE_OBJECT)
->setExternal(true)
->render();

4
src/applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php
View file

@ -46,11 +46,11 @@ abstract class DoorkeeperRemarkupRule
if ($this->getEngine()->isTextMode()) {
$view = $spec['href'];
} else {
$view = id(new PhabricatorTagView())
$view = id(new PHUITagView())
->setID($tag_id)
->setName($spec['href'])
->setHref($spec['href'])
->setType(PhabricatorTagView::TYPE_OBJECT)
->setType(PHUITagView::TYPE_OBJECT)
->setExternal(true);
}

4
src/applications/doorkeeper/view/DoorkeeperTagView.php
View file

@ -31,11 +31,11 @@ final class DoorkeeperTagView extends AphrontView {
Javelin::initBehavior('doorkeeper-tag', array('tags' => array($spec)));
return id(new PhabricatorTagView())
return id(new PHUITagView())
->setID($tag_id)
->setHref($href)
->setName($href)
->setType(PhabricatorTagView::TYPE_OBJECT)
->setType(PHUITagView::TYPE_OBJECT)
->setExternal(true);
}

4
src/applications/files/controller/PhabricatorFileInfoController.php
View file

@ -39,8 +39,8 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
$ttl = $file->getTTL();
if ($ttl !== null) {
$ttl_tag = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_OBJECT)
$ttl_tag = id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setName(pht("Temporary"));
$header->addTag($ttl_tag);
}

6
src/applications/macro/controller/PhabricatorMacroViewController.php
View file

@ -75,10 +75,10 @@ final class PhabricatorMacroViewController
if ($macro->getIsDisabled()) {
$header->addTag(
id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setName(pht('Macro Disabled'))
->setBackgroundColor(PhabricatorTagView::COLOR_BLACK));
->setBackgroundColor(PHUITagView::COLOR_BLACK));
}
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

4
src/applications/maniphest/view/ManiphestView.php
View file

@ -9,8 +9,8 @@ abstract class ManiphestView extends AphrontView {
$status = $task->getStatus();
$status_name = ManiphestTaskStatus::getTaskStatusFullName($status);
return id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
return id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setName($status_name);
}

10
src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
View file

@ -101,22 +101,22 @@ final class PhabricatorRemarkupRuleMention
$user = $actual_users[$username];
Javelin::initBehavior('phabricator-hovercards');
$tag = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_PERSON)
$tag = id(new PHUITagView())
->setType(PHUITagView::TYPE_PERSON)
->setPHID($user->getPHID())
->setName('@'.$user->getUserName())
->setHref('/p/'.$user->getUserName().'/');
if (!$user->isUserActivated()) {
$tag->setDotColor(PhabricatorTagView::COLOR_GREY);
$tag->setDotColor(PHUITagView::COLOR_GREY);
} else {
$status = idx($user_statuses, $user->getPHID());
if ($status) {
$status = $status->getStatus();
if ($status == PhabricatorUserStatus::STATUS_AWAY) {
$tag->setDotColor(PhabricatorTagView::COLOR_RED);
$tag->setDotColor(PHUITagView::COLOR_RED);
} else if ($status == PhabricatorUserStatus::STATUS_AWAY) {
$tag->setDotColor(PhabricatorTagView::COLOR_ORANGE);
$tag->setDotColor(PHUITagView::COLOR_ORANGE);
}
}
}

2
src/applications/ponder/constants/PonderQuestionStatus.php
View file

@ -25,7 +25,7 @@ final class PonderQuestionStatus extends PonderConstants {
public static function getQuestionStatusTagColor($status) {
$map = array(
self::STATUS_CLOSED => PhabricatorTagView::COLOR_BLACK,
self::STATUS_CLOSED => PHUITagView::COLOR_BLACK,
);
return idx($map, $status);

6
src/applications/releeph/controller/branch/ReleephBranchViewController.php
View file

@ -103,9 +103,9 @@ final class ReleephBranchViewController extends ReleephProjectController
if (!$branch->getIsActive()) {
$header->addTag(
id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLACK)
id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLACK)
->setName(pht('Closed')));
}

6
src/applications/releeph/controller/project/ReleephProjectViewController.php
View file

@ -160,9 +160,9 @@ final class ReleephProjectViewController extends ReleephProjectController
if (!$project->getIsActive()) {
$header->addTag(
id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLACK)
id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLACK)
->setName(pht('Deactivated')));
}

115
src/applications/uiexample/examples/PhabricatorTagExample.php → src/applications/uiexample/examples/PHUITagExample.php
View file

@ -1,21 +1,21 @@
<?php
final class PhabricatorTagExample extends PhabricatorUIExample {
final class PHUITagExample extends PhabricatorUIExample {
public function getName() {
return 'Tags';
}
public function getDescription() {
return hsprintf('Use <tt>PhabricatorTagView</tt> to render various tags.');
return hsprintf('Use <tt>PHUITagView</tt> to render various tags.');
}
public function renderExample() {
$intro = array();
$intro[] = 'Hey, ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_PERSON)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_PERSON)
->setName('@alincoln')
->setHref('#');
$intro[] = ' how is stuff?';
@ -23,58 +23,58 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
$intro[] = 'Did you hear that ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_PERSON)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_PERSON)
->setName('@gwashington')
->setDotColor(PhabricatorTagView::COLOR_RED)
->setDotColor(PHUITagView::COLOR_RED)
->setHref('#');
$intro[] = ' is away, ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_PERSON)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_PERSON)
->setName('@tjefferson')
->setDotColor(PhabricatorTagView::COLOR_ORANGE)
->setDotColor(PHUITagView::COLOR_ORANGE)
->setHref('#');
$intro[] = ' has some errands, and ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_PERSON)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_PERSON)
->setName('@rreagan')
->setDotColor(PhabricatorTagView::COLOR_GREY)
->setDotColor(PHUITagView::COLOR_GREY)
->setHref('#');
$intro[] = ' is gone?';
$intro[] = hsprintf('<br /><br />');
$intro[] = 'Take a look at ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_OBJECT)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setName('D123')
->setHref('#');
$intro[] = ' when you get a chance.';
$intro[] = hsprintf('<br /><br />');
$intro[] = 'Hmm? ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_OBJECT)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setName('D123')
->setClosed(true)
->setHref('#');
$intro[] = ' is ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLACK)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLACK)
->setName('Abandoned');
$intro[] = '.';
$intro[] = hsprintf('<br /><br />');
$intro[] = 'I hope someone is going to ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_OBJECT)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setName('T123: Water The Dog')
->setBarColor(PhabricatorTagView::COLOR_RED)
->setBarColor(PHUITagView::COLOR_RED)
->setHref('#');
$intro[] = ' -- that task is ';
$intro[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_RED)
$intro[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_RED)
->setName('High Priority');
$intro[] = '!';
@ -85,11 +85,11 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
$header1 = id(new PHUIHeaderView())
->setHeader('Colors');
$colors = PhabricatorTagView::getColors();
$colors = PHUITagView::getColors();
$tags = array();
foreach ($colors as $color) {
$tags[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
$tags[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor($color)
->setName(ucwords($color));
$tags[] = hsprintf('<br /><br />');
@ -100,25 +100,22 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
->addPadding(PHUI::PADDING_LARGE);
$tags = array();
$tags[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_GREEN)
->setDotColor(PhabricatorTagView::COLOR_RED)
->setBarColor(PhabricatorTagView::COLOR_RED)
$tags[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_GREEN)
->setDotColor(PHUITagView::COLOR_RED)
->setName('Christmas');
$tags[] = hsprintf('<br /><br />');
$tags[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_OBJECT)
->setBackgroundColor(PhabricatorTagView::COLOR_ORANGE)
->setDotColor(PhabricatorTagView::COLOR_BLACK)
->setBarColor(PhabricatorTagView::COLOR_BLACK)
$tags[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_OBJECT)
->setBackgroundColor(PHUITagView::COLOR_ORANGE)
->setDotColor(PHUITagView::COLOR_BLACK)
->setName('Halloween');
$tags[] = hsprintf('<br /><br />');
$tags[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_INDIGO)
->setDotColor(PhabricatorTagView::COLOR_YELLOW)
->setBarColor(PhabricatorTagView::COLOR_BLUE)
$tags[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_INDIGO)
->setDotColor(PHUITagView::COLOR_YELLOW)
->setName('Easter');
$content2 = id(new PHUIBoxView())
@ -126,33 +123,33 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
->addPadding(PHUI::PADDING_LARGE);
$icons = array();
$icons[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_GREEN)
$icons[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_GREEN)
->setIcon('check-white')
->setName('Passed');
$icons[] = hsprintf('<br /><br />');
$icons[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_RED)
$icons[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_RED)
->setIcon('delete-white')
->setName('Failed');
$icons[] = hsprintf('<br /><br />');
$icons[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLUE)
$icons[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLUE)
->setIcon('refresh-white')
->setName('Running');
$icons[] = hsprintf('<br /><br />');
$icons[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_GREY)
$icons[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_GREY)
->setIcon('pause-white')
->setName('Paused');
$icons[] = hsprintf('<br /><br />');
$icons[] = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLACK)
$icons[] = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLACK)
->setIcon('stop-white')
->setName('Stopped');

12
src/applications/uiexample/examples/PhabricatorActionHeaderExample.php
View file

@ -189,14 +189,14 @@ final class PhabricatorActionHeaderExample extends PhabricatorUIExample {
$title4 = id(new PHUIHeaderView())
->setHeader(pht('With Tags'));
$tag1 = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_RED)
$tag1 = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_RED)
->setName('Open');
$tag2 = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
->setBackgroundColor(PhabricatorTagView::COLOR_BLUE)
$tag2 = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setBackgroundColor(PHUITagView::COLOR_BLUE)
->setName('Closed');
$action1 = new PHUIIconView();

4
src/applications/uiexample/examples/PhabricatorHovercardExample.php
View file

@ -36,8 +36,8 @@ final class PhabricatorHovercardExample extends PhabricatorUIExample {
ManiphestPHIDTypeTask::TYPECONST,
"Improve Mobile Experience for Phabricator");
$tag = id(new PhabricatorTagView())
->setType(PhabricatorTagView::TYPE_STATE)
$tag = id(new PHUITagView())
->setType(PHUITagView::TYPE_STATE)
->setName('Closed, Resolved');
$panel = $this->createPanel("Maniphest Hovercard");
$panel->appendChild(id(new PhabricatorHovercardView())

4
src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php
View file

@ -85,10 +85,10 @@ abstract class PhabricatorRemarkupRuleObject
}
protected function renderHovertag($name, $href, array $attr = array()) {
return id(new PhabricatorTagView())
return id(new PHUITagView())
->setName($name)
->setHref($href)
->setType(PhabricatorTagView::TYPE_OBJECT)
->setType(PHUITagView::TYPE_OBJECT)
->setPHID(idx($attr, 'phid'))
->setClosed(idx($attr, 'closed'))
->render();

2
src/view/layout/PhabricatorActionHeaderView.php
View file

@ -32,7 +32,7 @@ final class PhabricatorActionHeaderView extends AphrontView {
return $this;
}
public function setTag(PhabricatorTagView $tag) {
public function setTag(PHUITagView $tag) {
$this->actions[] = $tag;
return $this;
}

2
src/view/phui/PHUIHeaderView.php
View file

@ -31,7 +31,7 @@ final class PHUIHeaderView extends AphrontView {
return $this;
}
public function addTag(PhabricatorTagView $tag) {
public function addTag(PHUITagView $tag) {
$this->tags[] = $tag;
return $this;
}

26
src/view/layout/PhabricatorTagView.php → src/view/phui/PHUITagView.php
View file

@ -1,6 +1,6 @@
<?php
final class PhabricatorTagView extends AphrontView {
final class PHUITagView extends AphrontView {
const TYPE_PERSON = 'person';
const TYPE_OBJECT = 'object';
@ -102,27 +102,27 @@ final class PhabricatorTagView extends AphrontView {
throw new Exception(pht("You must call setType() before render()!"));
}
require_celerity_resource('phabricator-tag-view-css');
require_celerity_resource('phui-tag-view-css');
$classes = array(
'phabricator-tag-view',
'phabricator-tag-type-'.$this->type,
'phui-tag-view',
'phui-tag-type-'.$this->type,
);
if ($this->closed) {
$classes[] = 'phabricator-tag-state-closed';
$classes[] = 'phui-tag-state-closed';
}
$color = null;
if ($this->backgroundColor) {
$color = 'phabricator-tag-color-'.$this->backgroundColor;
$color = 'phui-tag-color-'.$this->backgroundColor;
}
if ($this->dotColor) {
$dotcolor = 'phabricator-tag-color-'.$this->dotColor;
$dotcolor = 'phui-tag-color-'.$this->dotColor;
$dot = phutil_tag(
'span',
array(
'class' => 'phabricator-tag-dot '.$dotcolor,
'class' => 'phui-tag-dot '.$dotcolor,
),
'');
} else {
@ -131,7 +131,7 @@ final class PhabricatorTagView extends AphrontView {
if ($this->icon) {
$icon = $this->icon;
$classes[] = 'phabricator-tag-icon-view';
$classes[] = 'phui-tag-icon-view';
} else {
$icon = null;
}
@ -139,19 +139,19 @@ final class PhabricatorTagView extends AphrontView {
$content = phutil_tag(
'span',
array(
'class' => 'phabricator-tag-core '.$color,
'class' => 'phui-tag-core '.$color,
),
array($dot, $this->name));
if ($this->barColor) {
$barcolor = 'phabricator-tag-color-'.$this->barColor;
$barcolor = 'phui-tag-color-'.$this->barColor;
$bar = phutil_tag(
'span',
array(
'class' => 'phabricator-tag-bar '.$barcolor,
'class' => 'phui-tag-bar '.$barcolor,
),
'');
$classes[] = 'phabricator-tag-view-has-bar';
$classes[] = 'phui-tag-view-has-bar';
} else {
$bar = null;
}

2
src/view/widget/hovercard/PhabricatorHovercardView.php
View file

@ -51,7 +51,7 @@ final class PhabricatorHovercardView extends AphrontView {
return $this;
}
public function addTag(PhabricatorTagView $tag) {
public function addTag(PHUITagView $tag) {
$this->tags[] = $tag;
return $this;
}

4
webroot/rsrc/css/layout/phabricator-action-header-view.css
View file

@ -32,7 +32,7 @@
display: inline-block;
}
.phabricator-action-header-icon-item .phabricator-tag-view {
.phabricator-action-header-icon-item .phui-tag-view {
margin: 4px 2px 0;
}
@ -52,7 +52,7 @@
text-shadow: 0 -1px 1px rgba(0,0,0,.7);
}
.phabricator-action-header-icon-list .phabricator-tag-view {
.phabricator-action-header-icon-list .phui-tag-view {
font-weight: normal;
}

2
webroot/rsrc/css/phui/phui-header-view.css
View file

@ -76,7 +76,7 @@ body.device-phone .phui-header-view {
font-size: 13px;
}
.phui-header-tags .phabricator-tag-view {
.phui-header-tags .phui-tag-view {
margin-left: 4px;
}

2
webroot/rsrc/css/phui/phui-property-list-view.css
View file

@ -137,7 +137,7 @@
/* When tags appear in property lists, give them a little more vertical
spacing. */
.phui-property-list-view .phabricator-tag-view {
.phui-property-list-view .phui-tag-view {
margin: 2px 0;
}

66
webroot/rsrc/css/layout/phabricator-tag-view.css → webroot/rsrc/css/phui/phui-tag-view.css
View file

@ -1,50 +1,50 @@
/**
* @provides phabricator-tag-view-css
* @provides phui-tag-view-css
*/
.phabricator-tag-view {
.phui-tag-view {
font-weight: bold;
text-decoration: none;
display: inline-block;
position: relative;
}
a.phabricator-tag-view:hover {
a.phui-tag-view:hover {
text-decoration: none;
}
.phabricator-tag-state-closed .phabricator-tag-core {
.phui-tag-state-closed .phui-tag-core {
text-decoration: line-through;
}
.phabricator-tag-core {
.phui-tag-core {
color: inherit;
border: 1px solid transparent;
border-radius: 3px;
padding: 0 4px;
}
.phabricator-tag-type-state .phabricator-tag-core {
padding: 0 6px;
.phui-tag-type-state .phui-tag-core {
padding: 1px 6px;
}
.phabricator-tag-view .phui-icon-view {
.phui-tag-view .phui-icon-view {
position: absolute;
display: inline-block;
top: 1px;
left: 5px;
}
.phabricator-tag-icon-view .phabricator-tag-core {
.phui-tag-icon-view .phui-tag-core {
padding-left: 22px;
}
.phabricator-tag-view-has-bar .phabricator-tag-core {
.phui-tag-view-has-bar .phui-tag-core {
border-radius: 0 3px 3px 0;
border-width: 1px 1px 1px 0;
}
.phabricator-tag-dot {
.phui-tag-dot {
position: relative;
display: inline-block;
width: 6px;
@ -56,93 +56,93 @@ a.phabricator-tag-view:hover {
box-shadow: 0 0 2px rgba(255, 255, 255, 0.8);
}
.phabricator-tag-type-state {
.phui-tag-type-state {
color: #ffffff;
text-shadow: rgba(100, 100, 100, 0.40) 0px -1px 1px;
}
.phabricator-tag-type-object,
a.phabricator-tag-type-object,
a.phabricator-tag-type-object:link {
.phui-tag-type-object,
a.phui-tag-type-object,
a.phui-tag-type-object:link {
color: #000000;
}
.phabricator-tag-type-person {
.phui-tag-type-person {
white-space: nowrap;
color: #19558d;
}
.phabricator-tag-color-red {
.phui-tag-color-red {
background-color: {$red};
border-color: {$red};
}
.phabricator-tag-color-orange {
.phui-tag-color-orange {
background-color: {$orange};
border-color: {$orange};
}
.phabricator-tag-color-yellow {
.phui-tag-color-yellow {
background-color: {$yellow};
border-color: {$yellow};
}
.phabricator-tag-color-blue {
.phui-tag-color-blue {
background-color: {$blue};
border-color: {$blue};
}
.phabricator-tag-color-indigo {
.phui-tag-color-indigo {
background-color: {$indigo};
border-color: {$indigo};
}
.phabricator-tag-color-green {
.phui-tag-color-green {
background-color: {$green};
border-color: {$green};
}
.phabricator-tag-color-violet {
.phui-tag-color-violet {
background-color: {$violet};
border-color: {$violet};
}
.phabricator-tag-color-black {
.phui-tag-color-black {
background-color: #333333;
border-color: #333333;
}
.phabricator-tag-color-grey {
.phui-tag-color-grey {
background-color: {$lightgreytext};
border-color: {$lightgreytext};
}
.phabricator-tag-color-white {
.phui-tag-color-white {
background-color: #f7f7f7;
border-color: #f7f7f7;
}
.phabricator-tag-color-object {
.phui-tag-color-object {
background-color: #e7e7e7;
border-color: #e7e7e7;
}
.phabricator-tag-color-person {
.phui-tag-color-person {
background-color: #f1f7ff;
border-color: #f1f7ff;
}
a.phabricator-tag-view:hover
.phabricator-tag-core.phabricator-tag-color-person {
a.phui-tag-view:hover
.phui-tag-core.phui-tag-color-person {
border-color: #d9ebfd;
}
a.phabricator-tag-view:hover
.phabricator-tag-core.phabricator-tag-color-object {
a.phui-tag-view:hover
.phui-tag-core.phui-tag-color-object {
border-color: #d7d7d7;
}
.phabricator-tag-bar {
.phui-tag-bar {
padding-left: 4px;
border-width: 1px;
border-style: solid;