diff --git a/src/applications/dashboard/controller/PhabricatorDashboardHistoryController.php b/src/applications/dashboard/controller/PhabricatorDashboardHistoryController.php index 641f642bd4..bdd2e03b87 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardHistoryController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardHistoryController.php @@ -1,53 +1,54 @@ id = $data['id']; } public function processRequest() { $request = $this->getRequest(); $viewer = $request->getUser(); $id = $this->id; $dashboard_view_uri = $this->getApplicationURI('view/'.$id.'/'); $dashboard_manage_uri = $this->getApplicationURI('manage/'.$id.'/'); $dashboard = id(new PhabricatorDashboardQuery()) ->setViewer($viewer) ->withIDs(array($this->id)) ->executeOne(); if (!$dashboard) { return new Aphront404Response(); } $title = $dashboard->getName(); $crumbs = $this->buildApplicationCrumbs(); + $crumbs->setBorder(true); $crumbs->addTextCrumb( pht('Dashboard %d', $dashboard->getID()), $dashboard_view_uri); $crumbs->addTextCrumb( pht('Manage'), $dashboard_manage_uri); $crumbs->addTextCrumb(pht('History')); $timeline = $this->buildTransactionTimeline( $dashboard, new PhabricatorDashboardTransactionQuery()); $timeline->setShouldTerminate(true); return $this->buildApplicationPage( array( $crumbs, $timeline, ), array( 'title' => $title, )); } } diff --git a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php index bda1bf0516..5dc9949c78 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php @@ -1,80 +1,81 @@ id = $data['id']; } public function processRequest() { $request = $this->getRequest(); $viewer = $request->getUser(); $dashboard = id(new PhabricatorDashboardQuery()) ->setViewer($viewer) ->withIDs(array($this->id)) ->needPanels(true) ->executeOne(); if (!$dashboard) { return new Aphront404Response(); } $title = $dashboard->getName(); $crumbs = $this->buildApplicationCrumbs(); + $crumbs->setBorder(true); $crumbs->addTextCrumb(pht('Dashboard %d', $dashboard->getID())); if ($dashboard->getPanelPHIDs()) { $rendered_dashboard = id(new PhabricatorDashboardRenderingEngine()) ->setViewer($viewer) ->setDashboard($dashboard) ->renderDashboard(); } else { $rendered_dashboard = $this->buildEmptyView(); } return $this->buildApplicationPage( array( $crumbs, $rendered_dashboard, ), array( 'title' => $title, )); } protected function buildApplicationCrumbs() { $crumbs = parent::buildApplicationCrumbs(); $id = $this->id; $crumbs->addAction( id(new PHUIListItemView()) ->setIcon('fa-th') ->setName(pht('Manage Dashboard')) ->setHref($this->getApplicationURI("manage/{$id}/"))); return $crumbs; } public function buildEmptyView() { $id = $this->id; $manage_uri = $this->getApplicationURI("manage/{$id}/"); return id(new PHUIErrorView()) ->setSeverity(PHUIErrorView::SEVERITY_NODATA) ->appendChild( pht('This dashboard has no panels '. 'yet. Use %s to add panels.', phutil_tag( 'a', array('href' => $manage_uri), pht('Manage Dashboard')))); } }