From 23a238b0454526fc532664c7ea97f20f5a9901d6 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 29 May 2014 15:25:26 -0700 Subject: [PATCH] Remove "organization", "communication" and "miscellaneous" app groups Summary: Merge "Organization" and "Communication" into "Core". The split between these three was always tenuous, and this is easier to use and nicer looking on the new launcher. Merge "Miscellaneous" into "Utilities" since they're basically the same thing. Test Plan: Looked at app launcher. Reviewers: chad Reviewed By: chad Subscribers: epriestley Differential Revision: https://secure.phabricator.com/D9334 --- src/applications/base/PhabricatorApplication.php | 8 +------- .../application/PhabricatorApplicationCalendar.php | 4 ---- .../applications/PhabricatorApplicationChatLog.php | 2 +- .../application/PhabricatorApplicationConpherence.php | 7 ------- .../feed/application/PhabricatorApplicationFeed.php | 4 ---- .../herald/application/PhabricatorApplicationHerald.php | 2 +- .../application/PhabricatorApplicationLegalpad.php | 2 +- .../application/PhabricatorApplicationApplications.php | 4 ---- .../people/application/PhabricatorApplicationPeople.php | 4 ---- .../phame/application/PhabricatorApplicationPhame.php | 4 ---- .../pholio/application/PhabricatorApplicationPholio.php | 5 ----- .../application/PhabricatorApplicationPhriction.php | 4 ---- .../ponder/application/PhabricatorApplicationPonder.php | 4 ---- .../project/application/PhabricatorApplicationProject.php | 4 ---- .../releeph/application/PhabricatorApplicationReleeph.php | 4 ---- 15 files changed, 4 insertions(+), 58 deletions(-) diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php index 91acc55a8f..004a38e44a 100644 --- a/src/applications/base/PhabricatorApplication.php +++ b/src/applications/base/PhabricatorApplication.php @@ -12,12 +12,9 @@ abstract class PhabricatorApplication implements PhabricatorPolicyInterface { const GROUP_CORE = 'core'; - const GROUP_COMMUNICATION = 'communication'; - const GROUP_ORGANIZATION = 'organization'; const GROUP_UTILITIES = 'util'; const GROUP_ADMIN = 'admin'; const GROUP_DEVELOPER = 'developer'; - const GROUP_MISC = 'misc'; const TILE_INVISIBLE = 'invisible'; const TILE_HIDE = 'hide'; @@ -27,12 +24,9 @@ abstract class PhabricatorApplication public static function getApplicationGroups() { return array( self::GROUP_CORE => pht('Core Applications'), - self::GROUP_COMMUNICATION => pht('Communication'), - self::GROUP_ORGANIZATION => pht('Organization'), self::GROUP_UTILITIES => pht('Utilities'), self::GROUP_ADMIN => pht('Administration'), self::GROUP_DEVELOPER => pht('Developer Tools'), - self::GROUP_MISC => pht('Miscellaneous Applications'), ); } @@ -147,7 +141,7 @@ abstract class PhabricatorApplication } public function getApplicationGroup() { - return self::GROUP_MISC; + return self::GROUP_CORE; } public function getTitleGlyph() { diff --git a/src/applications/calendar/application/PhabricatorApplicationCalendar.php b/src/applications/calendar/application/PhabricatorApplicationCalendar.php index 18c6b12d11..3925792f81 100644 --- a/src/applications/calendar/application/PhabricatorApplicationCalendar.php +++ b/src/applications/calendar/application/PhabricatorApplicationCalendar.php @@ -24,10 +24,6 @@ final class PhabricatorApplicationCalendar extends PhabricatorApplication { return "\xE2\x8C\xA8"; } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php index 018cae36c0..9ef90f6d33 100644 --- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php +++ b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php @@ -23,7 +23,7 @@ final class PhabricatorApplicationChatLog extends PhabricatorApplication { } public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; + return self::GROUP_UTILITIES; } public function getRoutes() { diff --git a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php b/src/applications/conpherence/application/PhabricatorApplicationConpherence.php index d86cb67722..671066f011 100644 --- a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php +++ b/src/applications/conpherence/application/PhabricatorApplicationConpherence.php @@ -1,8 +1,5 @@ array( diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorApplicationPeople.php index d387b0f882..aebf1383d7 100644 --- a/src/applications/people/application/PhabricatorApplicationPeople.php +++ b/src/applications/people/application/PhabricatorApplicationPeople.php @@ -22,10 +22,6 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication { return pht('Sort of a social utility.'); } - public function getApplicationGroup() { - return self::GROUP_ORGANIZATION; - } - public function canUninstall() { return false; } diff --git a/src/applications/phame/application/PhabricatorApplicationPhame.php b/src/applications/phame/application/PhabricatorApplicationPhame.php index d254d871cb..e66e02c871 100644 --- a/src/applications/phame/application/PhabricatorApplicationPhame.php +++ b/src/applications/phame/application/PhabricatorApplicationPhame.php @@ -22,10 +22,6 @@ final class PhabricatorApplicationPhame extends PhabricatorApplication { return PhabricatorEnv::getDoclink('Phame User Guide'); } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/pholio/application/PhabricatorApplicationPholio.php b/src/applications/pholio/application/PhabricatorApplicationPholio.php index 500ee5098b..b93d825402 100644 --- a/src/applications/pholio/application/PhabricatorApplicationPholio.php +++ b/src/applications/pholio/application/PhabricatorApplicationPholio.php @@ -22,11 +22,6 @@ final class PhabricatorApplicationPholio extends PhabricatorApplication { return pht('Things before they were cool.'); } - public function getApplicationGroup() { - // TODO: Move to CORE, this just keeps it out of the side menu. - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorApplicationPhriction.php index 6fdc116c65..e6fc014ec7 100644 --- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php +++ b/src/applications/phriction/application/PhabricatorApplicationPhriction.php @@ -58,10 +58,6 @@ final class PhabricatorApplicationPhriction extends PhabricatorApplication { ); } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function getApplicationOrder() { return 0.140; } diff --git a/src/applications/ponder/application/PhabricatorApplicationPonder.php b/src/applications/ponder/application/PhabricatorApplicationPonder.php index 0821533460..2e0279d0e8 100644 --- a/src/applications/ponder/application/PhabricatorApplicationPonder.php +++ b/src/applications/ponder/application/PhabricatorApplicationPonder.php @@ -37,10 +37,6 @@ final class PhabricatorApplicationPonder extends PhabricatorApplication { ); } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/project/application/PhabricatorApplicationProject.php b/src/applications/project/application/PhabricatorApplicationProject.php index 60c13fb62e..15268a75c1 100644 --- a/src/applications/project/application/PhabricatorApplicationProject.php +++ b/src/applications/project/application/PhabricatorApplicationProject.php @@ -22,10 +22,6 @@ final class PhabricatorApplicationProject extends PhabricatorApplication { return pht('Group stuff into big piles.'); } - public function getApplicationGroup() { - return self::GROUP_ORGANIZATION; - } - public function getRemarkupRules() { return array( new ProjectRemarkupRule(), diff --git a/src/applications/releeph/application/PhabricatorApplicationReleeph.php b/src/applications/releeph/application/PhabricatorApplicationReleeph.php index 79f7a24961..78691c3772 100644 --- a/src/applications/releeph/application/PhabricatorApplicationReleeph.php +++ b/src/applications/releeph/application/PhabricatorApplicationReleeph.php @@ -18,10 +18,6 @@ final class PhabricatorApplicationReleeph extends PhabricatorApplication { return 'releeph'; } - public function getApplicationGroup() { - return self::GROUP_ORGANIZATION; - } - public function isInstalled() { if (PhabricatorEnv::getEnvConfig('releeph.installed')) { return parent::isInstalled();