diff --git a/resources/celerity/map.php b/resources/celerity/map.php index b7fc935f9a..0388e7bffc 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -45,7 +45,7 @@ return array( 'rsrc/css/application/chatlog/chatlog.css' => '852140ff', 'rsrc/css/application/config/config-options.css' => '7fedf08b', 'rsrc/css/application/config/config-template.css' => '25d446d6', - 'rsrc/css/application/config/setup-issue.css' => '1bb81c53', + 'rsrc/css/application/config/setup-issue.css' => '69e640e7', 'rsrc/css/application/conpherence/menu.css' => '561348ac', 'rsrc/css/application/conpherence/message-pane.css' => '2aedca89', 'rsrc/css/application/conpherence/notification.css' => 'f9ba9914', @@ -170,6 +170,7 @@ return array( 'rsrc/externals/javelin/core/__tests__/stratcom.js' => 'da194d4b', 'rsrc/externals/javelin/core/__tests__/util.js' => 'd3b157a9', 'rsrc/externals/javelin/core/init.js' => 'b88ab49e', + 'rsrc/externals/javelin/core/init_node.js' => '9fe4895f', 'rsrc/externals/javelin/core/install.js' => '52a92793', 'rsrc/externals/javelin/core/util.js' => '7501647b', 'rsrc/externals/javelin/docs/Base.js' => '3b9ca7eb', @@ -775,7 +776,7 @@ return array( 'releeph-request-differential-create-dialog' => '8d8b92cd', 'releeph-request-typeahead-css' => '667a48ae', 'releeph-status' => 'a20631d9', - 'setup-issue-css' => '1bb81c53', + 'setup-issue-css' => '69e640e7', 'sprite-actions-css' => '969ad0e5', 'sprite-apps-css' => '6973a52b', 'sprite-apps-large-css' => '5abf49e9', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 162c55c412..c4f5a0c54a 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1114,6 +1114,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationMailingLists' => 'applications/mailinglists/application/PhabricatorApplicationMailingLists.php', 'PhabricatorApplicationManiphest' => 'applications/maniphest/application/PhabricatorApplicationManiphest.php', 'PhabricatorApplicationMetaMTA' => 'applications/metamta/application/PhabricatorApplicationMetaMTA.php', + 'PhabricatorApplicationNotifications' => 'applications/notification/application/PhabricatorApplicationNotifications.php', 'PhabricatorApplicationNuance' => 'applications/nuance/application/PhabricatorApplicationNuance.php', 'PhabricatorApplicationOwners' => 'applications/owners/application/PhabricatorApplicationOwners.php', 'PhabricatorApplicationPHIDTypeApplication' => 'applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php', @@ -3759,6 +3760,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationMailingLists' => 'PhabricatorApplication', 'PhabricatorApplicationManiphest' => 'PhabricatorApplication', 'PhabricatorApplicationMetaMTA' => 'PhabricatorApplication', + 'PhabricatorApplicationNotifications' => 'PhabricatorApplication', 'PhabricatorApplicationNuance' => 'PhabricatorApplication', 'PhabricatorApplicationOwners' => 'PhabricatorApplication', 'PhabricatorApplicationPHIDTypeApplication' => 'PhabricatorPHIDType', diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index c14d796834..97bd5740eb 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -48,15 +48,6 @@ class AphrontDefaultApplicationConfiguration 'keyboardshortcut/' => 'PhabricatorHelpKeyboardShortcutController', ), - '/notification/' => array( - '(?:(?Pall|unread)/)?' - => 'PhabricatorNotificationListController', - 'panel/' => 'PhabricatorNotificationPanelController', - 'individual/' => 'PhabricatorNotificationIndividualController', - 'status/' => 'PhabricatorNotificationStatusController', - 'clear/' => 'PhabricatorNotificationClearController', - ), - '/debug/' => 'PhabricatorDebugController', ); } diff --git a/src/applications/notification/PhabricatorNotificationQuery.php b/src/applications/notification/PhabricatorNotificationQuery.php index 731d9dca73..3fa20923d5 100644 --- a/src/applications/notification/PhabricatorNotificationQuery.php +++ b/src/applications/notification/PhabricatorNotificationQuery.php @@ -113,8 +113,7 @@ final class PhabricatorNotificationQuery public function getQueryApplicationClass() { - // TODO: No actual "Notification" app yet, but there probably should be. - return null; + return 'PhabricatorApplicationNotifications'; } } diff --git a/src/applications/notification/application/PhabricatorApplicationNotifications.php b/src/applications/notification/application/PhabricatorApplicationNotifications.php new file mode 100644 index 0000000000..b26c54238a --- /dev/null +++ b/src/applications/notification/application/PhabricatorApplicationNotifications.php @@ -0,0 +1,30 @@ + array( + '(?:(?Pall|unread)/)?' + => 'PhabricatorNotificationListController', + 'panel/' => 'PhabricatorNotificationPanelController', + 'individual/' => 'PhabricatorNotificationIndividualController', + 'status/' => 'PhabricatorNotificationStatusController', + 'clear/' => 'PhabricatorNotificationClearController', + ), + ); + } + + public function shouldAppearInLaunchView() { + return false; + } + +} diff --git a/src/applications/notification/controller/PhabricatorNotificationStatusController.php b/src/applications/notification/controller/PhabricatorNotificationStatusController.php index 3972474314..c8fb0b5fd4 100644 --- a/src/applications/notification/controller/PhabricatorNotificationStatusController.php +++ b/src/applications/notification/controller/PhabricatorNotificationStatusController.php @@ -20,10 +20,16 @@ final class PhabricatorNotificationStatusController phutil_escape_html_newlines($ex->getMessage()))); } - return $this->buildStandardPageResponse( - $status, + $crumbs = $this->buildApplicationCrumbs(); + $crumbs->addTextCrumb(pht('Status')); + + return $this->buildApplicationPage( array( - 'title' => 'Aphlict Server Status', + $crumbs, + $status, + ), + array( + 'title' => pht('Notification Server Status'), )); } @@ -53,10 +59,10 @@ final class PhabricatorNotificationStatusController 'wide', )); - $panel = new AphrontPanelView(); - $panel->setHeader('Server Status'); - $panel->appendChild($table); + $box = id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Server Status')) + ->appendChild($table); - return $panel; + return $box; } }