diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 57b94f4ddf..6114aea9e0 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -2980,7 +2980,7 @@ celerity_register_resource_map(array( ), 'phabricator-feed-css' => array( - 'uri' => '/res/bb92244a/rsrc/css/application/feed/feed.css', + 'uri' => '/res/e337f54b/rsrc/css/application/feed/feed.css', 'type' => 'css', 'requires' => array( @@ -3212,7 +3212,7 @@ celerity_register_resource_map(array( ), 'phabricator-profile-css' => array( - 'uri' => '/res/9869d10b/rsrc/css/application/profile/profile-view.css', + 'uri' => '/res/a54f47a7/rsrc/css/application/profile/profile-view.css', 'type' => 'css', 'requires' => array( @@ -3221,7 +3221,7 @@ celerity_register_resource_map(array( ), 'phabricator-profile-header-css' => array( - 'uri' => '/res/4b1cb23b/rsrc/css/application/profile/profile-header-view.css', + 'uri' => '/res/1ccc6f0b/rsrc/css/application/profile/profile-header-view.css', 'type' => 'css', 'requires' => array( @@ -3594,6 +3594,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/phriction/phriction-document-css.css', ), + 'phui-feed-story-css' => + array( + 'uri' => '/res/9b5bb654/rsrc/css/phui/phui-feed-story.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/phui/phui-feed-story.css', + ), 'ponder-comment-table-css' => array( 'uri' => '/res/a1bb9056/rsrc/css/application/ponder/comments.css', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 748ae78588..2824cbf3ef 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -663,6 +663,7 @@ phutil_register_library_map(array( 'MetaMTANotificationType' => 'applications/metamta/constants/MetaMTANotificationType.php', 'ObjectHandleLoader' => 'applications/phid/handle/ObjectHandleLoader.php', 'OwnersPackageReplyHandler' => 'applications/owners/OwnersPackageReplyHandler.php', + 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', 'PackageCreateMail' => 'applications/owners/mail/PackageCreateMail.php', 'PackageDeleteMail' => 'applications/owners/mail/PackageDeleteMail.php', 'PackageMail' => 'applications/owners/mail/PackageMail.php', @@ -2361,6 +2362,7 @@ phutil_register_library_map(array( 'ManiphestView' => 'AphrontView', 'MetaMTANotificationType' => 'MetaMTAConstants', 'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler', + 'PHUIFeedStoryView' => 'AphrontView', 'PackageCreateMail' => 'PackageMail', 'PackageDeleteMail' => 'PackageMail', 'PackageMail' => 'PhabricatorMail', @@ -2987,6 +2989,7 @@ phutil_register_library_map(array( 'PhabricatorRepositoryTestCase' => 'PhabricatorTestCase', 'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine', 'PhabricatorSSHWorkflow' => 'PhutilArgumentWorkflow', + 'PhabricatorSavedQuery' => 'PhabricatorSearchDAO', 'PhabricatorSearchAttachController' => 'PhabricatorSearchBaseController', 'PhabricatorSearchBaseController' => 'PhabricatorController', 'PhabricatorSearchConfigOptions' => 'PhabricatorApplicationConfigOptions', diff --git a/src/applications/feed/story/PhabricatorFeedStoryAudit.php b/src/applications/feed/story/PhabricatorFeedStoryAudit.php index d9a44dffcd..7f7ce0ccff 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryAudit.php +++ b/src/applications/feed/story/PhabricatorFeedStoryAudit.php @@ -10,7 +10,7 @@ final class PhabricatorFeedStoryAudit extends PhabricatorFeedStory { $author_phid = $this->getAuthorPHID(); $commit_phid = $this->getPrimaryObjectPHID(); - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('audit-dark'); $action = $this->getValue('action'); diff --git a/src/applications/feed/story/PhabricatorFeedStoryCommit.php b/src/applications/feed/story/PhabricatorFeedStoryCommit.php index f135d90c8e..1d97516b31 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryCommit.php +++ b/src/applications/feed/story/PhabricatorFeedStoryCommit.php @@ -49,7 +49,7 @@ final class PhabricatorFeedStoryCommit extends PhabricatorFeedStory { $commit); } - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('differential-dark'); $view->setTitle($title); diff --git a/src/applications/feed/story/PhabricatorFeedStoryDifferential.php b/src/applications/feed/story/PhabricatorFeedStoryDifferential.php index f3ea17e3f1..368d8668f4 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryDifferential.php +++ b/src/applications/feed/story/PhabricatorFeedStoryDifferential.php @@ -9,7 +9,7 @@ final class PhabricatorFeedStoryDifferential extends PhabricatorFeedStory { public function renderView() { $data = $this->getStoryData(); - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('differential-dark'); $view->setViewed($this->getHasViewed()); diff --git a/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php b/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php index 11f26b8bf8..f71e12f352 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php +++ b/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php @@ -54,7 +54,7 @@ final class PhabricatorFeedStoryDifferentialAggregate break; } - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('differential-dark'); $view->setEpoch($this->getEpoch()); $view->setViewed($this->getHasViewed()); diff --git a/src/applications/feed/story/PhabricatorFeedStoryManiphest.php b/src/applications/feed/story/PhabricatorFeedStoryManiphest.php index 798927d86b..21255b6fca 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryManiphest.php +++ b/src/applications/feed/story/PhabricatorFeedStoryManiphest.php @@ -16,7 +16,7 @@ final class PhabricatorFeedStoryManiphest public function renderView() { $data = $this->getStoryData(); - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('maniphest-dark'); $view->setViewed($this->getHasViewed()); diff --git a/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php b/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php index 0032c7cc2e..db2abc05ef 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php +++ b/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php @@ -54,7 +54,7 @@ final class PhabricatorFeedStoryManiphestAggregate break; } - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('maniphest-dark'); $view->setEpoch($this->getEpoch()); $view->setViewed($this->getHasViewed()); diff --git a/src/applications/feed/story/PhabricatorFeedStoryPhriction.php b/src/applications/feed/story/PhabricatorFeedStoryPhriction.php index d0e174c9f2..a91c4acd33 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryPhriction.php +++ b/src/applications/feed/story/PhabricatorFeedStoryPhriction.php @@ -21,7 +21,7 @@ final class PhabricatorFeedStoryPhriction extends PhabricatorFeedStory { $author_phid = $data->getAuthorPHID(); $document_phid = $data->getValue('phid'); - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('phriction-dark'); $action = $data->getValue('action'); diff --git a/src/applications/feed/story/PhabricatorFeedStoryProject.php b/src/applications/feed/story/PhabricatorFeedStoryProject.php index 2632898a6c..0cba787e43 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryProject.php +++ b/src/applications/feed/story/PhabricatorFeedStoryProject.php @@ -24,7 +24,7 @@ final class PhabricatorFeedStoryProject extends PhabricatorFeedStory { public function renderView() { $data = $this->getStoryData(); - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('projects-dark'); $type = $data->getValue('type'); diff --git a/src/applications/feed/story/PhabricatorFeedStoryStatus.php b/src/applications/feed/story/PhabricatorFeedStoryStatus.php index cbe402a44f..315beb08e4 100644 --- a/src/applications/feed/story/PhabricatorFeedStoryStatus.php +++ b/src/applications/feed/story/PhabricatorFeedStoryStatus.php @@ -11,7 +11,7 @@ final class PhabricatorFeedStoryStatus extends PhabricatorFeedStory { $author_phid = $data->getAuthorPHID(); - $view = new PhabricatorFeedStoryView(); + $view = new PHUIFeedStoryView(); $view->setAppIcon('calendar-dark'); $view->setTitle($this->linkTo($author_phid)); diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php index 078b5f3e4e..27b519e230 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php @@ -141,8 +141,6 @@ final class PhabricatorPeopleProfileController } $nav->appendChild($header); - - $content = hsprintf('