Page MenuHomePhabricator

D15129.diff
No OneTemporary

D15129.diff

diff --git a/src/applications/almanac/application/PhabricatorAlmanacApplication.php b/src/applications/almanac/application/PhabricatorAlmanacApplication.php
--- a/src/applications/almanac/application/PhabricatorAlmanacApplication.php
+++ b/src/applications/almanac/application/PhabricatorAlmanacApplication.php
@@ -14,7 +14,7 @@
return pht('Service Directory');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-server';
}
diff --git a/src/applications/almanac/controller/AlmanacConsoleController.php b/src/applications/almanac/controller/AlmanacConsoleController.php
--- a/src/applications/almanac/controller/AlmanacConsoleController.php
+++ b/src/applications/almanac/controller/AlmanacConsoleController.php
@@ -16,21 +16,21 @@
id(new PHUIObjectItemView())
->setHeader(pht('Services'))
->setHref($this->getApplicationURI('service/'))
- ->setFontIcon('fa-plug')
+ ->setIcon('fa-plug')
->addAttribute(pht('Manage Almanac services.')));
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Devices'))
->setHref($this->getApplicationURI('device/'))
- ->setFontIcon('fa-server')
+ ->setIcon('fa-server')
->addAttribute(pht('Manage Almanac devices.')));
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Networks'))
->setHref($this->getApplicationURI('network/'))
- ->setFontIcon('fa-globe')
+ ->setIcon('fa-globe')
->addAttribute(pht('Manage Almanac networks.')));
$crumbs = $this->buildApplicationCrumbs();
diff --git a/src/applications/audit/application/PhabricatorAuditApplication.php b/src/applications/audit/application/PhabricatorAuditApplication.php
--- a/src/applications/audit/application/PhabricatorAuditApplication.php
+++ b/src/applications/audit/application/PhabricatorAuditApplication.php
@@ -6,7 +6,7 @@
return '/audit/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-check-circle-o';
}
diff --git a/src/applications/auth/application/PhabricatorAuthApplication.php b/src/applications/auth/application/PhabricatorAuthApplication.php
--- a/src/applications/auth/application/PhabricatorAuthApplication.php
+++ b/src/applications/auth/application/PhabricatorAuthApplication.php
@@ -10,7 +10,7 @@
return '/auth/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-key';
}
diff --git a/src/applications/badges/application/PhabricatorBadgesApplication.php b/src/applications/badges/application/PhabricatorBadgesApplication.php
--- a/src/applications/badges/application/PhabricatorBadgesApplication.php
+++ b/src/applications/badges/application/PhabricatorBadgesApplication.php
@@ -14,7 +14,7 @@
return pht('Achievements and Notority');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-trophy';
}
diff --git a/src/applications/badges/query/PhabricatorBadgesSearchEngine.php b/src/applications/badges/query/PhabricatorBadgesSearchEngine.php
--- a/src/applications/badges/query/PhabricatorBadgesSearchEngine.php
+++ b/src/applications/badges/query/PhabricatorBadgesSearchEngine.php
@@ -147,7 +147,7 @@
->setHref('/badges/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -155,7 +155,7 @@
return null;
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-puzzle-piece';
}
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -352,7 +352,7 @@
$application = $this->getCurrentApplication();
if ($application) {
- $icon = $application->getFontIcon();
+ $icon = $application->getIcon();
if (!$icon) {
$icon = 'fa-puzzle';
}
diff --git a/src/applications/calendar/application/PhabricatorCalendarApplication.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
--- a/src/applications/calendar/application/PhabricatorCalendarApplication.php
+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
@@ -18,7 +18,7 @@
return '/calendar/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-calendar';
}
diff --git a/src/applications/chatlog/application/PhabricatorChatLogApplication.php b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
--- a/src/applications/chatlog/application/PhabricatorChatLogApplication.php
+++ b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
@@ -14,7 +14,7 @@
return pht('(Deprecated)');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-coffee';
}
diff --git a/src/applications/conduit/application/PhabricatorConduitApplication.php b/src/applications/conduit/application/PhabricatorConduitApplication.php
--- a/src/applications/conduit/application/PhabricatorConduitApplication.php
+++ b/src/applications/conduit/application/PhabricatorConduitApplication.php
@@ -6,7 +6,7 @@
return '/conduit/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-tty';
}
diff --git a/src/applications/config/application/PhabricatorConfigApplication.php b/src/applications/config/application/PhabricatorConfigApplication.php
--- a/src/applications/config/application/PhabricatorConfigApplication.php
+++ b/src/applications/config/application/PhabricatorConfigApplication.php
@@ -6,7 +6,7 @@
return '/config/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-sliders';
}
diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php
--- a/src/applications/config/controller/PhabricatorConfigListController.php
+++ b/src/applications/config/controller/PhabricatorConfigListController.php
@@ -53,7 +53,7 @@
->setHeader($group->getName())
->setHref('/config/group/'.$group->getKey().'/')
->addAttribute($group->getDescription())
- ->setFontIcon($group->getFontIcon());
+ ->setIcon($group->getIcon());
$list->addItem($item);
}
}
diff --git a/src/applications/config/module/PhabricatorConfigPHIDModule.php b/src/applications/config/module/PhabricatorConfigPHIDModule.php
--- a/src/applications/config/module/PhabricatorConfigPHIDModule.php
+++ b/src/applications/config/module/PhabricatorConfigPHIDModule.php
@@ -23,7 +23,7 @@
$app = PhabricatorApplication::getByClass($class_name);
$app_name = $app->getName();
- $icon = $app->getFontIcon();
+ $icon = $app->getIcon();
if ($icon) {
$app_icon = id(new PHUIIconView())->setIcon($icon);
} else {
diff --git a/src/applications/config/option/PhabricatorAWSConfigOptions.php b/src/applications/config/option/PhabricatorAWSConfigOptions.php
--- a/src/applications/config/option/PhabricatorAWSConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAWSConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure integration with AWS (EC2, SES, S3, etc).');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-server';
}
diff --git a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
--- a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure the access logs, which log HTTP/SSH requests.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-list';
}
diff --git a/src/applications/config/option/PhabricatorApplicationConfigOptions.php b/src/applications/config/option/PhabricatorApplicationConfigOptions.php
--- a/src/applications/config/option/PhabricatorApplicationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorApplicationConfigOptions.php
@@ -7,7 +7,7 @@
abstract public function getGroup();
abstract public function getOptions();
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-sliders';
}
diff --git a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
--- a/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options relating to authentication.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-key';
}
diff --git a/src/applications/config/option/PhabricatorClusterConfigOptions.php b/src/applications/config/option/PhabricatorClusterConfigOptions.php
--- a/src/applications/config/option/PhabricatorClusterConfigOptions.php
+++ b/src/applications/config/option/PhabricatorClusterConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Phabricator to run on a cluster of hosts.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-sitemap';
}
diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure core options, including URIs.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-bullseye';
}
diff --git a/src/applications/config/option/PhabricatorDeveloperConfigOptions.php b/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
--- a/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
+++ b/src/applications/config/option/PhabricatorDeveloperConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options for Phabricator developers, including debugging.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-bug';
}
diff --git a/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php b/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
--- a/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
+++ b/src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Make Phabricator even cooler!');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-rocket';
}
diff --git a/src/applications/config/option/PhabricatorMailgunConfigOptions.php b/src/applications/config/option/PhabricatorMailgunConfigOptions.php
--- a/src/applications/config/option/PhabricatorMailgunConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMailgunConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Mailgun integration.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-send-o';
}
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Mail.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-send';
}
diff --git a/src/applications/config/option/PhabricatorMySQLConfigOptions.php b/src/applications/config/option/PhabricatorMySQLConfigOptions.php
--- a/src/applications/config/option/PhabricatorMySQLConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMySQLConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Database configuration.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-database';
}
diff --git a/src/applications/config/option/PhabricatorNotificationConfigOptions.php b/src/applications/config/option/PhabricatorNotificationConfigOptions.php
--- a/src/applications/config/option/PhabricatorNotificationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorNotificationConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure real-time notifications.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-bell';
}
diff --git a/src/applications/config/option/PhabricatorPHDConfigOptions.php b/src/applications/config/option/PhabricatorPHDConfigOptions.php
--- a/src/applications/config/option/PhabricatorPHDConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHDConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options relating to PHD (daemons).');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-pied-piper-alt';
}
diff --git a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
--- a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure PHPMailer.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-send-o';
}
diff --git a/src/applications/config/option/PhabricatorPhurlConfigOptions.php b/src/applications/config/option/PhabricatorPhurlConfigOptions.php
--- a/src/applications/config/option/PhabricatorPhurlConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPhurlConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options for Phurl.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-link';
}
diff --git a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
--- a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
+++ b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Recaptcha captchas.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-recycle';
}
diff --git a/src/applications/config/option/PhabricatorSMSConfigOptions.php b/src/applications/config/option/PhabricatorSMSConfigOptions.php
--- a/src/applications/config/option/PhabricatorSMSConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSMSConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure SMS.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-mobile';
}
diff --git a/src/applications/config/option/PhabricatorSecurityConfigOptions.php b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
--- a/src/applications/config/option/PhabricatorSecurityConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Security options.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-lock';
}
diff --git a/src/applications/config/option/PhabricatorSendGridConfigOptions.php b/src/applications/config/option/PhabricatorSendGridConfigOptions.php
--- a/src/applications/config/option/PhabricatorSendGridConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSendGridConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure SendGrid integration.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-send-o';
}
diff --git a/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php b/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
--- a/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options relating to syntax highlighting source code.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-code';
}
diff --git a/src/applications/config/option/PhabricatorTranslationsConfigOptions.php b/src/applications/config/option/PhabricatorTranslationsConfigOptions.php
--- a/src/applications/config/option/PhabricatorTranslationsConfigOptions.php
+++ b/src/applications/config/option/PhabricatorTranslationsConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options relating to translations.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-globe';
}
diff --git a/src/applications/config/option/PhabricatorUIConfigOptions.php b/src/applications/config/option/PhabricatorUIConfigOptions.php
--- a/src/applications/config/option/PhabricatorUIConfigOptions.php
+++ b/src/applications/config/option/PhabricatorUIConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure the Phabricator UI, including colors.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-magnet';
}
diff --git a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
--- a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
@@ -14,7 +14,7 @@
return pht('Chat with Others');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-comments';
}
diff --git a/src/applications/conpherence/config/ConpherenceConfigOptions.php b/src/applications/conpherence/config/ConpherenceConfigOptions.php
--- a/src/applications/conpherence/config/ConpherenceConfigOptions.php
+++ b/src/applications/conpherence/config/ConpherenceConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Conpherence messaging.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-comments';
}
diff --git a/src/applications/countdown/application/PhabricatorCountdownApplication.php b/src/applications/countdown/application/PhabricatorCountdownApplication.php
--- a/src/applications/countdown/application/PhabricatorCountdownApplication.php
+++ b/src/applications/countdown/application/PhabricatorCountdownApplication.php
@@ -6,7 +6,7 @@
return '/countdown/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-rocket';
}
diff --git a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
--- a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
+++ b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
@@ -152,7 +152,7 @@
->setHref('/countdown/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/daemon/application/PhabricatorDaemonsApplication.php b/src/applications/daemon/application/PhabricatorDaemonsApplication.php
--- a/src/applications/daemon/application/PhabricatorDaemonsApplication.php
+++ b/src/applications/daemon/application/PhabricatorDaemonsApplication.php
@@ -18,7 +18,7 @@
return "\xE2\x98\xAF";
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-pied-piper-alt';
}
diff --git a/src/applications/dashboard/application/PhabricatorDashboardApplication.php b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
--- a/src/applications/dashboard/application/PhabricatorDashboardApplication.php
+++ b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
@@ -14,7 +14,7 @@
return pht('Create Custom Pages');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-dashboard';
}
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php
--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php
@@ -55,7 +55,7 @@
->setHref('/dashboard/panel/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
--- a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
@@ -181,7 +181,7 @@
->setHref('/dashboard/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -14,7 +14,7 @@
return pht('Review Code');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-cog';
}
diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Differential code review.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-cog';
}
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -348,7 +348,7 @@
->setHref('/differential/diff/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -14,7 +14,7 @@
return '/diffusion/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-code';
}
diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
--- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
+++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Diffusion repository browsing.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-code';
}
diff --git a/src/applications/diviner/application/PhabricatorDivinerApplication.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php
--- a/src/applications/diviner/application/PhabricatorDivinerApplication.php
+++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php
@@ -6,7 +6,7 @@
return '/diviner/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-sun-o';
}
diff --git a/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php b/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php
--- a/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php
+++ b/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php
@@ -14,7 +14,7 @@
return pht('Doorkeeper');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-recycle';
}
diff --git a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
--- a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
+++ b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Asana integration options.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-exchange';
}
diff --git a/src/applications/drydock/application/PhabricatorDrydockApplication.php b/src/applications/drydock/application/PhabricatorDrydockApplication.php
--- a/src/applications/drydock/application/PhabricatorDrydockApplication.php
+++ b/src/applications/drydock/application/PhabricatorDrydockApplication.php
@@ -14,7 +14,7 @@
return pht('Allocate Software Resources');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-truck';
}
diff --git a/src/applications/drydock/controller/DrydockConsoleController.php b/src/applications/drydock/controller/DrydockConsoleController.php
--- a/src/applications/drydock/controller/DrydockConsoleController.php
+++ b/src/applications/drydock/controller/DrydockConsoleController.php
@@ -31,7 +31,7 @@
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Blueprints'))
- ->setFontIcon('fa-map-o')
+ ->setIcon('fa-map-o')
->setHref($this->getApplicationURI('blueprint/'))
->addAttribute(
pht(
@@ -41,7 +41,7 @@
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Resources'))
- ->setFontIcon('fa-map')
+ ->setIcon('fa-map')
->setHref($this->getApplicationURI('resource/'))
->addAttribute(
pht('View and manage resources Drydock has built, like hosts.')));
@@ -49,14 +49,14 @@
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Leases'))
- ->setFontIcon('fa-link')
+ ->setIcon('fa-link')
->setHref($this->getApplicationURI('lease/'))
->addAttribute(pht('Manage leases on resources.')));
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Repository Operations'))
- ->setFontIcon('fa-fighter-jet')
+ ->setIcon('fa-fighter-jet')
->setHref($this->getApplicationURI('operation/'))
->addAttribute(pht('Review the repository operation queue.')));
diff --git a/src/applications/fact/application/PhabricatorFactApplication.php b/src/applications/fact/application/PhabricatorFactApplication.php
--- a/src/applications/fact/application/PhabricatorFactApplication.php
+++ b/src/applications/fact/application/PhabricatorFactApplication.php
@@ -14,7 +14,7 @@
return '/fact/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-line-chart';
}
diff --git a/src/applications/feed/application/PhabricatorFeedApplication.php b/src/applications/feed/application/PhabricatorFeedApplication.php
--- a/src/applications/feed/application/PhabricatorFeedApplication.php
+++ b/src/applications/feed/application/PhabricatorFeedApplication.php
@@ -14,7 +14,7 @@
return pht('Review Recent Activity');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-newspaper-o';
}
diff --git a/src/applications/feed/config/PhabricatorFeedConfigOptions.php b/src/applications/feed/config/PhabricatorFeedConfigOptions.php
--- a/src/applications/feed/config/PhabricatorFeedConfigOptions.php
+++ b/src/applications/feed/config/PhabricatorFeedConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Feed options.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-newspaper-o';
}
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -14,7 +14,7 @@
return pht('Store and Share Files');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-file';
}
diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure files and file storage.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-file';
}
diff --git a/src/applications/files/query/PhabricatorFileSearchEngine.php b/src/applications/files/query/PhabricatorFileSearchEngine.php
--- a/src/applications/files/query/PhabricatorFileSearchEngine.php
+++ b/src/applications/files/query/PhabricatorFileSearchEngine.php
@@ -185,7 +185,7 @@
->setHref('/file/upload/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/flag/application/PhabricatorFlagsApplication.php b/src/applications/flag/application/PhabricatorFlagsApplication.php
--- a/src/applications/flag/application/PhabricatorFlagsApplication.php
+++ b/src/applications/flag/application/PhabricatorFlagsApplication.php
@@ -14,7 +14,7 @@
return '/flag/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-flag';
}
diff --git a/src/applications/fund/application/PhabricatorFundApplication.php b/src/applications/fund/application/PhabricatorFundApplication.php
--- a/src/applications/fund/application/PhabricatorFundApplication.php
+++ b/src/applications/fund/application/PhabricatorFundApplication.php
@@ -14,7 +14,7 @@
return pht('Donate');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-heart';
}
diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -14,7 +14,7 @@
return pht('Build/CI');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-ship';
}
diff --git a/src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php b/src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php
--- a/src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php
+++ b/src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Harbormaster build engine.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-ship';
}
diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
@@ -6,7 +6,7 @@
return '/herald/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-bullhorn';
}
diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php
--- a/src/applications/herald/query/HeraldRuleSearchEngine.php
+++ b/src/applications/herald/query/HeraldRuleSearchEngine.php
@@ -218,7 +218,7 @@
->setHref('/herald/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/home/application/PhabricatorHomeApplication.php b/src/applications/home/application/PhabricatorHomeApplication.php
--- a/src/applications/home/application/PhabricatorHomeApplication.php
+++ b/src/applications/home/application/PhabricatorHomeApplication.php
@@ -16,7 +16,7 @@
return pht('Command Center');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-home';
}
diff --git a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
--- a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
+++ b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
@@ -14,7 +14,7 @@
return pht('Agreements and Signatures');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-gavel';
}
diff --git a/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php b/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
--- a/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
+++ b/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Legalpad.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-gavel';
}
diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
@@ -223,7 +223,7 @@
->setHref('/legalpad/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php
--- a/src/applications/macro/application/PhabricatorMacroApplication.php
+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
@@ -14,7 +14,7 @@
return pht('Image Macros and Memes');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-file-image-o';
}
diff --git a/src/applications/macro/config/PhabricatorMacroConfigOptions.php b/src/applications/macro/config/PhabricatorMacroConfigOptions.php
--- a/src/applications/macro/config/PhabricatorMacroConfigOptions.php
+++ b/src/applications/macro/config/PhabricatorMacroConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Macro.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-file-image-o';
}
diff --git a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
--- a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
@@ -54,12 +54,12 @@
static $icon_names;
if (!$icon_names) {
- $icon_names = array_fuse(PHUIIconView::getFontIcons());
+ $icon_names = array_fuse(PHUIIconView::getIcons());
}
static $color_names;
if (!$color_names) {
- $color_names = array_fuse(PHUIIconView::getFontIconColors());
+ $color_names = array_fuse(PHUIIconView::getIconColors());
}
if (empty($icon_names['fa-'.$icon])) {
diff --git a/src/applications/macro/query/PhabricatorMacroSearchEngine.php b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
--- a/src/applications/macro/query/PhabricatorMacroSearchEngine.php
+++ b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
@@ -196,7 +196,7 @@
->setHref('/macro/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -14,7 +14,7 @@
return '/maniphest/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-anchor';
}
diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Maniphest.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-anchor';
}
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -392,7 +392,7 @@
->setHref('/maniphest/task/edit/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/meta/application/PhabricatorApplicationsApplication.php b/src/applications/meta/application/PhabricatorApplicationsApplication.php
--- a/src/applications/meta/application/PhabricatorApplicationsApplication.php
+++ b/src/applications/meta/application/PhabricatorApplicationsApplication.php
@@ -24,7 +24,7 @@
return pht('Explore More Applications');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-globe';
}
diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php
--- a/src/applications/meta/query/PhabricatorAppSearchEngine.php
+++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php
@@ -209,7 +209,7 @@
$list = new PHUIObjectItemListView();
foreach ($applications as $application) {
- $icon = $application->getFontIcon();
+ $icon = $application->getIcon();
if (!$icon) {
$icon = 'application';
}
diff --git a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
--- a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
+++ b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
@@ -28,7 +28,7 @@
continue;
}
$name = $application->getName().' '.$application->getShortDescription();
- $img = 'phui-font-fa phui-icon-view '.$application->getFontIcon();
+ $img = 'phui-font-fa phui-icon-view '.$application->getIcon();
$results[] = id(new PhabricatorTypeaheadResult())
->setName($name)
->setURI($uri)
diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
--- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php
+++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
@@ -113,7 +113,7 @@
if ($application->getIconURI()) {
$styles[] = 'background-image: url('.$application->getIconURI().')';
} else {
- $classes[] = $application->getFontIcon();
+ $classes[] = $application->getIcon();
$classes[] = 'phui-icon-view';
$classes[] = 'phui-font-fa';
}
diff --git a/src/applications/metamta/application/PhabricatorMetaMTAApplication.php b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
--- a/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
+++ b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
@@ -10,7 +10,7 @@
return '/mail/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-send';
}
diff --git a/src/applications/multimeter/application/PhabricatorMultimeterApplication.php b/src/applications/multimeter/application/PhabricatorMultimeterApplication.php
--- a/src/applications/multimeter/application/PhabricatorMultimeterApplication.php
+++ b/src/applications/multimeter/application/PhabricatorMultimeterApplication.php
@@ -11,7 +11,7 @@
return '/multimeter/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-motorcycle';
}
diff --git a/src/applications/notification/application/PhabricatorNotificationsApplication.php b/src/applications/notification/application/PhabricatorNotificationsApplication.php
--- a/src/applications/notification/application/PhabricatorNotificationsApplication.php
+++ b/src/applications/notification/application/PhabricatorNotificationsApplication.php
@@ -14,7 +14,7 @@
return pht('Real-Time Updates and Alerts');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-bell';
}
diff --git a/src/applications/nuance/application/PhabricatorNuanceApplication.php b/src/applications/nuance/application/PhabricatorNuanceApplication.php
--- a/src/applications/nuance/application/PhabricatorNuanceApplication.php
+++ b/src/applications/nuance/application/PhabricatorNuanceApplication.php
@@ -6,7 +6,7 @@
return pht('Nuance');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-fax';
}
diff --git a/src/applications/nuance/controller/NuanceConsoleController.php b/src/applications/nuance/controller/NuanceConsoleController.php
--- a/src/applications/nuance/controller/NuanceConsoleController.php
+++ b/src/applications/nuance/controller/NuanceConsoleController.php
@@ -16,14 +16,14 @@
id(new PHUIObjectItemView())
->setHeader(pht('Queues'))
->setHref($this->getApplicationURI('queue/'))
- ->setFontIcon('fa-align-left')
+ ->setIcon('fa-align-left')
->addAttribute(pht('Manage Nuance queues.')));
$menu->addItem(
id(new PHUIObjectItemView())
->setHeader(pht('Sources'))
->setHref($this->getApplicationURI('source/'))
- ->setFontIcon('fa-filter')
+ ->setIcon('fa-filter')
->addAttribute(pht('Manage Nuance sources.')));
$crumbs = $this->buildApplicationCrumbs();
diff --git a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
--- a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
+++ b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
@@ -14,7 +14,7 @@
return pht('OAuth Login Provider');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-hotel';
}
diff --git a/src/applications/owners/application/PhabricatorOwnersApplication.php b/src/applications/owners/application/PhabricatorOwnersApplication.php
--- a/src/applications/owners/application/PhabricatorOwnersApplication.php
+++ b/src/applications/owners/application/PhabricatorOwnersApplication.php
@@ -10,7 +10,7 @@
return '/owners/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-gift';
}
diff --git a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
--- a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
+++ b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Owners.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-gift';
}
diff --git a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php
--- a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php
+++ b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php
@@ -162,7 +162,7 @@
->setHref('/owners/edit/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/passphrase/application/PhabricatorPassphraseApplication.php b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
--- a/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
+++ b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
@@ -14,7 +14,7 @@
return pht('Credential Store');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-user-secret';
}
diff --git a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
--- a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
+++ b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
@@ -118,7 +118,7 @@
->setHref('/passphrase/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/paste/application/PhabricatorPasteApplication.php b/src/applications/paste/application/PhabricatorPasteApplication.php
--- a/src/applications/paste/application/PhabricatorPasteApplication.php
+++ b/src/applications/paste/application/PhabricatorPasteApplication.php
@@ -10,7 +10,7 @@
return '/paste/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-paste';
}
diff --git a/src/applications/paste/config/PhabricatorPasteConfigOptions.php b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
--- a/src/applications/paste/config/PhabricatorPasteConfigOptions.php
+++ b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Paste.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-paste';
}
diff --git a/src/applications/paste/query/PhabricatorPasteSearchEngine.php b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
--- a/src/applications/paste/query/PhabricatorPasteSearchEngine.php
+++ b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
@@ -210,7 +210,7 @@
->setHref('/paste/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
--- a/src/applications/people/application/PhabricatorPeopleApplication.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -18,7 +18,7 @@
return "\xE2\x99\x9F";
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-users';
}
diff --git a/src/applications/people/config/PhabricatorUserConfigOptions.php b/src/applications/people/config/PhabricatorUserConfigOptions.php
--- a/src/applications/people/config/PhabricatorUserConfigOptions.php
+++ b/src/applications/people/config/PhabricatorUserConfigOptions.php
@@ -11,7 +11,7 @@
return pht('User profiles configuration.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-users';
}
diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
--- a/src/applications/phame/application/PhabricatorPhameApplication.php
+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
@@ -10,7 +10,7 @@
return '/phame/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-star';
}
diff --git a/src/applications/phid/type/PhabricatorPHIDType.php b/src/applications/phid/type/PhabricatorPHIDType.php
--- a/src/applications/phid/type/PhabricatorPHIDType.php
+++ b/src/applications/phid/type/PhabricatorPHIDType.php
@@ -25,7 +25,7 @@
$application_class = $this->getPHIDTypeApplicationClass();
if ($application_class) {
$application = newv($application_class, array());
- return $application->getFontIcon();
+ return $application->getIcon();
}
return null;
diff --git a/src/applications/phlux/application/PhabricatorPhluxApplication.php b/src/applications/phlux/application/PhabricatorPhluxApplication.php
--- a/src/applications/phlux/application/PhabricatorPhluxApplication.php
+++ b/src/applications/phlux/application/PhabricatorPhluxApplication.php
@@ -14,7 +14,7 @@
return pht('Key/Value Configuration Store');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-copy';
}
diff --git a/src/applications/pholio/application/PhabricatorPholioApplication.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
--- a/src/applications/pholio/application/PhabricatorPholioApplication.php
+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
@@ -14,7 +14,7 @@
return pht('Review Mocks and Design');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-camera-retro';
}
diff --git a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
--- a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
+++ b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Pholio.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-camera-retro';
}
diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php
--- a/src/applications/pholio/query/PholioMockSearchEngine.php
+++ b/src/applications/pholio/query/PholioMockSearchEngine.php
@@ -137,7 +137,7 @@
->setHref('/pholio/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/phortune/application/PhabricatorPhortuneApplication.php b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
--- a/src/applications/phortune/application/PhabricatorPhortuneApplication.php
+++ b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
@@ -14,7 +14,7 @@
return pht('Accounts and Billing');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-diamond';
}
diff --git a/src/applications/phpast/application/PhabricatorPHPASTApplication.php b/src/applications/phpast/application/PhabricatorPHPASTApplication.php
--- a/src/applications/phpast/application/PhabricatorPHPASTApplication.php
+++ b/src/applications/phpast/application/PhabricatorPHPASTApplication.php
@@ -10,7 +10,7 @@
return '/xhpast/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-ambulance';
}
diff --git a/src/applications/phragment/application/PhabricatorPhragmentApplication.php b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
--- a/src/applications/phragment/application/PhabricatorPhragmentApplication.php
+++ b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
@@ -14,7 +14,7 @@
return pht('Versioned Artifact Storage');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-floppy-o';
}
diff --git a/src/applications/phrequent/application/PhabricatorPhrequentApplication.php b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
--- a/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
+++ b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
@@ -18,7 +18,7 @@
return true;
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-clock-o';
}
diff --git a/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php b/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php
--- a/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php
+++ b/src/applications/phrequent/config/PhabricatorPhrequentConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Phrequent.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-clock-o';
}
diff --git a/src/applications/phriction/application/PhabricatorPhrictionApplication.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
--- a/src/applications/phriction/application/PhabricatorPhrictionApplication.php
+++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
@@ -14,7 +14,7 @@
return '/w/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-book';
}
diff --git a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
--- a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
+++ b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options related to Phriction (wiki).');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-book';
}
diff --git a/src/applications/phurl/application/PhabricatorPhurlApplication.php b/src/applications/phurl/application/PhabricatorPhurlApplication.php
--- a/src/applications/phurl/application/PhabricatorPhurlApplication.php
+++ b/src/applications/phurl/application/PhabricatorPhurlApplication.php
@@ -18,7 +18,7 @@
return '/phurl/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-compress';
}
diff --git a/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php b/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php
--- a/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php
+++ b/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php
@@ -99,7 +99,7 @@
->setHref('/phurl/url/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
--- a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
+++ b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options relating to object visibility.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-lock';
}
diff --git a/src/applications/ponder/application/PhabricatorPonderApplication.php b/src/applications/ponder/application/PhabricatorPonderApplication.php
--- a/src/applications/ponder/application/PhabricatorPonderApplication.php
+++ b/src/applications/ponder/application/PhabricatorPonderApplication.php
@@ -14,7 +14,7 @@
return pht('Questions and Answers');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-university';
}
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
@@ -187,7 +187,7 @@
->setHref('/ponder/question/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
--- a/src/applications/project/application/PhabricatorProjectApplication.php
+++ b/src/applications/project/application/PhabricatorProjectApplication.php
@@ -18,7 +18,7 @@
return '/project/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-briefcase';
}
diff --git a/src/applications/project/config/PhabricatorProjectConfigOptions.php b/src/applications/project/config/PhabricatorProjectConfigOptions.php
--- a/src/applications/project/config/PhabricatorProjectConfigOptions.php
+++ b/src/applications/project/config/PhabricatorProjectConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure Projects.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-briefcase';
}
diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -185,7 +185,7 @@
->setHref('/project/edit/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/releeph/application/PhabricatorReleephApplication.php b/src/applications/releeph/application/PhabricatorReleephApplication.php
--- a/src/applications/releeph/application/PhabricatorReleephApplication.php
+++ b/src/applications/releeph/application/PhabricatorReleephApplication.php
@@ -14,7 +14,7 @@
return '/releeph/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-flag-checkered';
}
diff --git a/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php b/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php
--- a/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php
+++ b/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options for configuring Releeph, the release branch tool.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-flag-checkered';
}
diff --git a/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php b/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php
--- a/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php
+++ b/src/applications/repository/config/PhabricatorRepositoryConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Configure repositories.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-hdd-o';
}
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -254,7 +254,7 @@
->setHref('/diffusion/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/search/application/PhabricatorSearchApplication.php b/src/applications/search/application/PhabricatorSearchApplication.php
--- a/src/applications/search/application/PhabricatorSearchApplication.php
+++ b/src/applications/search/application/PhabricatorSearchApplication.php
@@ -18,7 +18,7 @@
return pht('Find stuff in big piles.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-search';
}
diff --git a/src/applications/search/config/PhabricatorSearchConfigOptions.php b/src/applications/search/config/PhabricatorSearchConfigOptions.php
--- a/src/applications/search/config/PhabricatorSearchConfigOptions.php
+++ b/src/applications/search/config/PhabricatorSearchConfigOptions.php
@@ -11,7 +11,7 @@
return pht('Options relating to Search.');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-search';
}
diff --git a/src/applications/settings/application/PhabricatorSettingsApplication.php b/src/applications/settings/application/PhabricatorSettingsApplication.php
--- a/src/applications/settings/application/PhabricatorSettingsApplication.php
+++ b/src/applications/settings/application/PhabricatorSettingsApplication.php
@@ -14,7 +14,7 @@
return pht('User Preferences');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-wrench';
}
diff --git a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
@@ -140,7 +140,7 @@
continue;
}
- $icon = $application->getFontIcon();
+ $icon = $application->getIcon();
if (!$icon) {
$icon = 'application';
}
diff --git a/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
--- a/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
+++ b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
@@ -6,7 +6,7 @@
return '/vote/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-bar-chart';
}
diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
--- a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
+++ b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
@@ -170,7 +170,7 @@
->setHref('/vote/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/spaces/application/PhabricatorSpacesApplication.php b/src/applications/spaces/application/PhabricatorSpacesApplication.php
--- a/src/applications/spaces/application/PhabricatorSpacesApplication.php
+++ b/src/applications/spaces/application/PhabricatorSpacesApplication.php
@@ -14,7 +14,7 @@
return pht('Policy Namespaces');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-th-large';
}
diff --git a/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php b/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
--- a/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
+++ b/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
@@ -105,7 +105,7 @@
->setHref('/spaces/create/')
->setColor(PHUIButtonView::GREEN);
- $icon = $this->getApplication()->getFontIcon();
+ $icon = $this->getApplication()->getIcon();
$app_name = $this->getApplication()->getName();
$view = id(new PHUIBigInfoView())
->setIcon($icon)
diff --git a/src/applications/tokens/application/PhabricatorTokensApplication.php b/src/applications/tokens/application/PhabricatorTokensApplication.php
--- a/src/applications/tokens/application/PhabricatorTokensApplication.php
+++ b/src/applications/tokens/application/PhabricatorTokensApplication.php
@@ -10,7 +10,7 @@
return '/token/';
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-thumbs-up';
}
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1773,7 +1773,7 @@
public function getIcon() {
$application = $this->getApplication();
- return $application->getFontIcon();
+ return $application->getIcon();
}
public function loadQuickCreateItems() {
diff --git a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
--- a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
+++ b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
@@ -77,7 +77,7 @@
$class = $phid_type->getPHIDTypeApplicationClass();
if ($class) {
$application = PhabricatorApplication::getByClass($class);
- $icon = $application->getFontIcon();
+ $icon = $application->getIcon();
}
}
diff --git a/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php b/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php
--- a/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php
+++ b/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php
@@ -70,7 +70,7 @@
$query_uri = "/transactions/editengine/{$engine_key}/";
$application = $engine->getApplication();
- $app_icon = $application->getFontIcon();
+ $app_icon = $application->getIcon();
$item = id(new PHUIObjectItemView())
->setHeader($engine->getSummaryHeader())
diff --git a/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php b/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
--- a/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
+++ b/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
@@ -14,7 +14,7 @@
return pht('UIExamples');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-magnet';
}
diff --git a/src/applications/uiexample/examples/PHUIActionPanelExample.php b/src/applications/uiexample/examples/PHUIActionPanelExample.php
--- a/src/applications/uiexample/examples/PHUIActionPanelExample.php
+++ b/src/applications/uiexample/examples/PHUIActionPanelExample.php
@@ -17,7 +17,7 @@
/* Action Panels */
$panel1 = id(new PHUIActionPanelView())
- ->setFontIcon('fa-book')
+ ->setIcon('fa-book')
->setHeader(pht('Read Documentation'))
->setHref('#')
->setSubHeader(pht('Reading is a common way to learn about things.'))
@@ -25,7 +25,7 @@
$view->addColumn($panel1);
$panel2 = id(new PHUIActionPanelView())
- ->setFontIcon('fa-server')
+ ->setIcon('fa-server')
->setHeader(pht('Launch Instance'))
->setHref('#')
->setSubHeader(pht("Maybe this is what you're likely here for."))
@@ -33,7 +33,7 @@
$view->addColumn($panel2);
$panel3 = id(new PHUIActionPanelView())
- ->setFontIcon('fa-group')
+ ->setIcon('fa-group')
->setHeader(pht('Code with Friends'))
->setHref('#')
->setSubHeader(pht('Writing code is much more fun with friends!'))
@@ -41,7 +41,7 @@
$view->addColumn($panel3);
$panel4 = id(new PHUIActionPanelView())
- ->setFontIcon('fa-cloud-download')
+ ->setIcon('fa-cloud-download')
->setHeader(pht('Download Data'))
->setHref('#')
->setSubHeader(pht('Need a backup of all your kitten memes?'))
@@ -53,7 +53,7 @@
/* Action Panels */
$panel1 = id(new PHUIActionPanelView())
- ->setFontIcon('fa-credit-card')
+ ->setIcon('fa-credit-card')
->setHeader(pht('Account Balance'))
->setHref('#')
->setSubHeader(pht('You were last billed $2,245.12 on Dec 12, 2014.'))
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -23,9 +23,9 @@
public function renderExample() {
- $colors = PHUIIconView::getFontIconColors();
+ $colors = PHUIIconView::getIconColors();
$colors = array_merge(array(null), $colors);
- $fas = PHUIIconView::getFontIcons();
+ $fas = PHUIIconView::getIcons();
$trans = $this->listTransforms();
diff --git a/src/applications/xhprof/application/PhabricatorXHProfApplication.php b/src/applications/xhprof/application/PhabricatorXHProfApplication.php
--- a/src/applications/xhprof/application/PhabricatorXHProfApplication.php
+++ b/src/applications/xhprof/application/PhabricatorXHProfApplication.php
@@ -14,7 +14,7 @@
return pht('PHP Profiling Tool');
}
- public function getFontIcon() {
+ public function getIcon() {
return 'fa-stethoscope';
}
diff --git a/src/infrastructure/markup/rule/PhabricatorNavigationRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorNavigationRemarkupRule.php
--- a/src/infrastructure/markup/rule/PhabricatorNavigationRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorNavigationRemarkupRule.php
@@ -46,7 +46,7 @@
static $icon_names;
if (!$icon_names) {
- $icon_names = array_fuse(PHUIIconView::getFontIcons());
+ $icon_names = array_fuse(PHUIIconView::getIcons());
}
$out = array();
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -747,7 +747,7 @@
if ($application) {
$application_class = get_class($application);
if ($application->getApplicationSearchDocumentTypes()) {
- $application_search_icon = $application->getFontIcon();
+ $application_search_icon = $application->getIcon();
}
}
}
diff --git a/src/view/page/menu/PhabricatorMainMenuSearchView.php b/src/view/page/menu/PhabricatorMainMenuSearchView.php
--- a/src/view/page/menu/PhabricatorMainMenuSearchView.php
+++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php
@@ -128,7 +128,7 @@
if ($application) {
$application_value = get_class($application);
if ($application->getApplicationSearchDocumentTypes()) {
- $application_icon = $application->getFontIcon();
+ $application_icon = $application->getIcon();
}
}
diff --git a/src/view/phui/PHUIActionPanelView.php b/src/view/phui/PHUIActionPanelView.php
--- a/src/view/phui/PHUIActionPanelView.php
+++ b/src/view/phui/PHUIActionPanelView.php
@@ -24,7 +24,7 @@
return $this;
}
- public function setFontIcon($image) {
+ public function setIcon($image) {
$this->fontIcon = $image;
return $this;
}
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -105,7 +105,7 @@
return idx(phutil_json_decode($data), 'sprites');
}
- public static function getFontIcons() {
+ public static function getIcons() {
return array(
'fa-glass',
'fa-music',
@@ -747,7 +747,7 @@
);
}
- public static function getFontIconColors() {
+ public static function getIconColors() {
return array(
'bluegrey',
'white',
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -169,11 +169,11 @@
$fi = 'fa-refresh ph-spin sky';
break;
}
- $this->setFontIcon($fi);
+ $this->setIcon($fi);
return $this;
}
- public function setFontIcon($icon) {
+ public function setIcon($icon) {
$this->fontIcon = id(new PHUIIconView())
->setIcon($icon);
return $this;

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 3:36 AM (10 h, 46 m)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/uo/pq/5avj3yxsvxbf3r2k
Default Alt Text
D15129.diff (74 KB)

Event Timeline