Index: src/__phutil_library_map__.php =================================================================== --- src/__phutil_library_map__.php +++ src/__phutil_library_map__.php @@ -1260,15 +1260,15 @@ 'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php', 'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php', 'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php', - 'PhabricatorCalendarDeleteStatusController' => 'applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php', - 'PhabricatorCalendarEditStatusController' => 'applications/calendar/controller/PhabricatorCalendarEditStatusController.php', 'PhabricatorCalendarEvent' => 'applications/calendar/storage/PhabricatorCalendarEvent.php', + 'PhabricatorCalendarEventDeleteController' => 'applications/calendar/controller/PhabricatorCalendarEventDeleteController.php', + 'PhabricatorCalendarEventEditController' => 'applications/calendar/controller/PhabricatorCalendarEventEditController.php', 'PhabricatorCalendarEventInvalidEpochException' => 'applications/calendar/exception/PhabricatorCalendarEventInvalidEpochException.php', + 'PhabricatorCalendarEventListController' => 'applications/calendar/controller/PhabricatorCalendarEventListController.php', 'PhabricatorCalendarEventOverlapException' => 'applications/calendar/exception/PhabricatorCalendarEventOverlapException.php', 'PhabricatorCalendarEventQuery' => 'applications/calendar/query/PhabricatorCalendarEventQuery.php', 'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php', 'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php', - 'PhabricatorCalendarViewStatusController' => 'applications/calendar/controller/PhabricatorCalendarViewStatusController.php', 'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php', 'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php', 'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php', @@ -3899,19 +3899,19 @@ 'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController', 'PhabricatorCalendarController' => 'PhabricatorController', 'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO', - 'PhabricatorCalendarDeleteStatusController' => 'PhabricatorCalendarController', - 'PhabricatorCalendarEditStatusController' => 'PhabricatorCalendarController', 'PhabricatorCalendarEvent' => array( 0 => 'PhabricatorCalendarDAO', 1 => 'PhabricatorPolicyInterface', ), + 'PhabricatorCalendarEventDeleteController' => 'PhabricatorCalendarController', + 'PhabricatorCalendarEventEditController' => 'PhabricatorCalendarController', 'PhabricatorCalendarEventInvalidEpochException' => 'Exception', + 'PhabricatorCalendarEventListController' => 'PhabricatorCalendarController', 'PhabricatorCalendarEventOverlapException' => 'Exception', 'PhabricatorCalendarEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO', 'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase', - 'PhabricatorCalendarViewStatusController' => 'PhabricatorCalendarController', 'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter', 'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase', 'PhabricatorChangesetResponse' => 'AphrontProxyResponse', Index: src/applications/calendar/application/PhabricatorApplicationCalendar.php =================================================================== --- src/applications/calendar/application/PhabricatorApplicationCalendar.php +++ src/applications/calendar/application/PhabricatorApplicationCalendar.php @@ -36,16 +36,14 @@ return array( '/calendar/' => array( '' => 'PhabricatorCalendarBrowseController', - 'status/' => array( - '' => 'PhabricatorCalendarViewStatusController', + 'event/' => array( + '' => 'PhabricatorCalendarEventListController', 'create/' => - 'PhabricatorCalendarEditStatusController', - 'delete/(?P[1-9]\d*)/' => - 'PhabricatorCalendarDeleteStatusController', + 'PhabricatorCalendarEventEditController', 'edit/(?P[1-9]\d*)/' => - 'PhabricatorCalendarEditStatusController', - 'view/(?P[^/]+)/' => - 'PhabricatorCalendarViewStatusController', + 'PhabricatorCalendarEventEditController', + 'delete/(?P[1-9]\d*)/' => + 'PhabricatorCalendarEventDeleteController', ), ), ); @@ -57,7 +55,7 @@ $item = id(new PHUIListItemView()) ->setName(pht('Calendar Event')) ->setAppIcon('calendar-dark') - ->setHref($this->getBaseURI().'status/create/'); + ->setHref($this->getBaseURI().'event/create/'); $items[] = $item; return $items; Index: src/applications/calendar/controller/PhabricatorCalendarController.php =================================================================== --- src/applications/calendar/controller/PhabricatorCalendarController.php +++ src/applications/calendar/controller/PhabricatorCalendarController.php @@ -9,12 +9,12 @@ $nav->addLabel(pht('Calendar')); $nav->addFilter('/', pht('View All')); - $nav->addFilter('status/create/', pht('New Status')); + $nav->addFilter('event/create/', pht('New Status')); if ($status && $status->getID()) { - $nav->addFilter('status/edit/'.$status->getID().'/', pht('Edit Status')); + $nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Status')); } - $nav->addFilter('status/', pht('Upcoming Statuses')); + $nav->addFilter('event/', pht('Upcoming Statuses')); return $nav; } Index: src/applications/calendar/controller/PhabricatorCalendarEventDeleteController.php =================================================================== --- src/applications/calendar/controller/PhabricatorCalendarEventDeleteController.php +++ src/applications/calendar/controller/PhabricatorCalendarEventDeleteController.php @@ -1,6 +1,6 @@ addSubmitButton(pht('Delete')); $dialog->addCancelButton( - $this->getApplicationURI('status/edit/'.$status->getID().'/')); + $this->getApplicationURI('event/')); return id(new AphrontDialogResponse())->setDialog($dialog); Index: src/applications/calendar/controller/PhabricatorCalendarEventEditController.php =================================================================== --- src/applications/calendar/controller/PhabricatorCalendarEventEditController.php +++ src/applications/calendar/controller/PhabricatorCalendarEventEditController.php @@ -1,6 +1,6 @@ readValueFromRequest($request); $submit_label = pht('Create'); $filter = 'status/create/'; - $page_title = pht('Create Status'); + $page_title = pht('Create Event'); $redirect = 'created'; } else { $status = id(new PhabricatorCalendarEventQuery()) @@ -51,8 +51,8 @@ $end_time->setValue($status->getDateTo()); $start_time->setValue($status->getDateFrom()); $submit_label = pht('Update'); - $filter = 'status/edit/'.$status->getID().'/'; - $page_title = pht('Update Status'); + $filter = 'event/edit/'.$status->getID().'/'; + $page_title = pht('Update Event'); $redirect = 'updated'; } @@ -125,10 +125,10 @@ ->setTitle($page_title) ->setWidth(AphrontDialogView::WIDTH_FORM); if ($this->isCreate()) { - $dialog->setSubmitURI($this->getApplicationURI('status/create/')); + $dialog->setSubmitURI($this->getApplicationURI('event/create/')); } else { $dialog->setSubmitURI( - $this->getApplicationURI('status/edit/'.$status->getID().'/')); + $this->getApplicationURI('event/edit/'.$status->getID().'/')); } $form = new PHUIFormLayoutView(); if ($error_view) { @@ -156,8 +156,8 @@ $submit->addCancelButton($this->getApplicationURI()); } else { $submit->addCancelButton( - $this->getApplicationURI('status/delete/'.$status->getID().'/'), - pht('Delete Status')); + $this->getApplicationURI('event/delete/'.$status->getID().'/'), + pht('Delete Event')); } if ($request->isAjax()) { Index: src/applications/calendar/controller/PhabricatorCalendarEventListController.php =================================================================== --- src/applications/calendar/controller/PhabricatorCalendarEventListController.php +++ src/applications/calendar/controller/PhabricatorCalendarEventListController.php @@ -1,6 +1,6 @@ getUserPHID() == $user->getPHID()) { - $href = $this->getApplicationURI('/status/edit/'.$status->getID().'/'); + $href = $this->getApplicationURI('/event/edit/'.$status->getID().'/'); } else { $from = $status->getDateFrom(); $month = phabricator_format_local_time($from, $user, 'm'); @@ -99,11 +99,7 @@ } private function getFilter() { - if ($this->isUserRequest()) { - $filter = 'status/'; - } else { - $filter = 'status/view/'.$this->phid.'/'; - } + $filter = 'event/'; return $filter; } Index: src/applications/calendar/view/AphrontCalendarMonthView.php =================================================================== --- src/applications/calendar/view/AphrontCalendarMonthView.php +++ src/applications/calendar/view/AphrontCalendarMonthView.php @@ -303,7 +303,7 @@ if ($user->getPHID() == $event->getUserPHID()) { $tag = 'a'; - $href = '/calendar/status/edit/'.$event->getEventID().'/'; + $href = '/calendar/event/edit/'.$event->getEventID().'/'; } else { $tag = 'div'; $href = null; Index: src/applications/conpherence/controller/ConpherenceController.php =================================================================== --- src/applications/conpherence/controller/ConpherenceController.php +++ src/applications/conpherence/controller/ConpherenceController.php @@ -25,7 +25,7 @@ id(new PHUIListItemView()) ->setName(pht('New Calendar Item')) ->setType(PHUIListItemView::TYPE_LINK) - ->setHref('/calendar/status/create/') + ->setHref('/calendar/event/create/') ->addSigil('conpherence-widget-adder') ->setMetadata(array('widget' => 'widgets-calendar'))); Index: src/applications/conpherence/view/ConpherenceLayoutView.php =================================================================== --- src/applications/conpherence/view/ConpherenceLayoutView.php +++ src/applications/conpherence/view/ConpherenceLayoutView.php @@ -106,7 +106,7 @@ 'createData' => array( 'refreshFromResponse' => false, 'action' => ConpherenceUpdateActions::ADD_STATUS, - 'customHref' => '/calendar/status/create/' + 'customHref' => '/calendar/event/create/' ) ), 'widgets-settings' => array(