Page MenuHomePhabricator
Files F15560741

D8265.id19655.diff
No OneTemporary
Actions

D8265.id19655.diff
View Options

diff --git a/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php b/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
@@ -57,10 +57,14 @@
$month_view->addEvent($event);
}
+ $crumbs = $this->buildApplicationCrumbs();
+ $crumbs->addTextCrumb("{$year}-{$month}");
+
$nav = $this->buildSideNavView();
$nav->selectFilter('/');
$nav->appendChild(
array(
+ $crumbs,
$this->getNoticeView(),
$month_view,
));
diff --git a/src/applications/calendar/controller/PhabricatorCalendarController.php b/src/applications/calendar/controller/PhabricatorCalendarController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarController.php
@@ -9,14 +9,30 @@
$nav->addLabel(pht('Calendar'));
$nav->addFilter('/', pht('View All'));
- $nav->addFilter('event/create/', pht('New Status'));
+ $nav->addFilter('event/create/', pht('Create Event'));
if ($status && $status->getID()) {
- $nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Status'));
+ $nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Event'));
}
- $nav->addFilter('event/', pht('Upcoming Statuses'));
+ $nav->addFilter('event/', pht('Upcoming Events'));
return $nav;
}
+ public function buildApplicationMenu() {
+ return $this->buildSideNavView()->getMenu();
+ }
+
+ public function buildApplicationCrumbs() {
+ $crumbs = parent::buildApplicationCrumbs();
+
+ $crumbs->addAction(
+ id(new PHUIListItemView())
+ ->setName(pht('Create Event'))
+ ->setHref($this->getApplicationURI().'event/create')
+ ->setIcon('create'));
+
+ return $crumbs;
+ }
+
}
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -166,6 +166,8 @@
}
$form->appendChild($submit);
+
+
$form_box = id(new PHUIObjectBoxView())
->setHeaderText($page_title)
->setFormErrors($errors)
@@ -174,8 +176,13 @@
$nav = $this->buildSideNavView($status);
$nav->selectFilter($filter);
+ $crumbs = $this
+ ->buildApplicationCrumbs()
+ ->addTextCrumb($page_title);
+
$nav->appendChild(
array(
+ $crumbs,
$form_box,
));
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventListController.php b/src/applications/calendar/controller/PhabricatorCalendarEventListController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventListController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventListController.php
@@ -34,18 +34,6 @@
return $nav;
}
- public function buildApplicationCrumbs() {
- $crumbs = parent::buildApplicationCrumbs();
-
- $crumbs->addAction(
- id(new PHUIListItemView())
- ->setIcon('create')
- ->setName(pht('Create Event'))
- ->setHref($this->getApplicationURI().'create/'));
-
- return $crumbs;
- }
-
public function renderResultsList(
array $events,
PhabricatorSavedQuery $query) {
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -1,7 +1,7 @@
<?php
final class PhabricatorCalendarEventViewController
- extends PhabricatorDashboardController {
+ extends PhabricatorCalendarController {
private $id;

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 4:21 PM (1 w, 29 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7872692
Default Alt Text
D8265.id19655.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility