diff --git a/src/applications/almanac/controller/AlmanacBindingEditController.php b/src/applications/almanac/controller/AlmanacBindingEditController.php --- a/src/applications/almanac/controller/AlmanacBindingEditController.php +++ b/src/applications/almanac/controller/AlmanacBindingEditController.php @@ -110,14 +110,14 @@ $crumbs->addTextCrumb(pht('Edit Binding')); } - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, )); + } } diff --git a/src/applications/almanac/controller/AlmanacBindingViewController.php b/src/applications/almanac/controller/AlmanacBindingViewController.php --- a/src/applications/almanac/controller/AlmanacBindingViewController.php +++ b/src/applications/almanac/controller/AlmanacBindingViewController.php @@ -55,15 +55,14 @@ new AlmanacBindingTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, - $this->buildAlmanacPropertiesTable($binding), - $timeline, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, + $this->buildAlmanacPropertiesTable($binding), + $timeline, )); } diff --git a/src/applications/almanac/controller/AlmanacConsoleController.php b/src/applications/almanac/controller/AlmanacConsoleController.php --- a/src/applications/almanac/controller/AlmanacConsoleController.php +++ b/src/applications/almanac/controller/AlmanacConsoleController.php @@ -40,14 +40,14 @@ ->setHeaderText(pht('Console')) ->setObjectList($menu); - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => pht('Almanac Console'), + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, )); + } } diff --git a/src/applications/almanac/controller/AlmanacDeviceEditController.php b/src/applications/almanac/controller/AlmanacDeviceEditController.php --- a/src/applications/almanac/controller/AlmanacDeviceEditController.php +++ b/src/applications/almanac/controller/AlmanacDeviceEditController.php @@ -151,13 +151,12 @@ $crumbs->addTextCrumb(pht('Edit')); } - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, )); } diff --git a/src/applications/almanac/controller/AlmanacDeviceViewController.php b/src/applications/almanac/controller/AlmanacDeviceViewController.php --- a/src/applications/almanac/controller/AlmanacDeviceViewController.php +++ b/src/applications/almanac/controller/AlmanacDeviceViewController.php @@ -57,18 +57,17 @@ new AlmanacDeviceTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, - $interfaces, - $this->buildAlmanacPropertiesTable($device), - $this->buildSSHKeysTable($device), - $this->buildServicesTable($device), - $timeline, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, + $interfaces, + $this->buildAlmanacPropertiesTable($device), + $this->buildSSHKeysTable($device), + $this->buildServicesTable($device), + $timeline, )); } diff --git a/src/applications/almanac/controller/AlmanacInterfaceEditController.php b/src/applications/almanac/controller/AlmanacInterfaceEditController.php --- a/src/applications/almanac/controller/AlmanacInterfaceEditController.php +++ b/src/applications/almanac/controller/AlmanacInterfaceEditController.php @@ -142,13 +142,12 @@ $crumbs->addTextCrumb(pht('Edit Interface')); } - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, )); } diff --git a/src/applications/almanac/controller/AlmanacNetworkEditController.php b/src/applications/almanac/controller/AlmanacNetworkEditController.php --- a/src/applications/almanac/controller/AlmanacNetworkEditController.php +++ b/src/applications/almanac/controller/AlmanacNetworkEditController.php @@ -130,13 +130,12 @@ $crumbs->addTextCrumb(pht('Edit')); } - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, )); } diff --git a/src/applications/almanac/controller/AlmanacNetworkViewController.php b/src/applications/almanac/controller/AlmanacNetworkViewController.php --- a/src/applications/almanac/controller/AlmanacNetworkViewController.php +++ b/src/applications/almanac/controller/AlmanacNetworkViewController.php @@ -42,14 +42,13 @@ new AlmanacNetworkTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, - $timeline, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, + $timeline, )); } diff --git a/src/applications/almanac/controller/AlmanacServiceEditController.php b/src/applications/almanac/controller/AlmanacServiceEditController.php --- a/src/applications/almanac/controller/AlmanacServiceEditController.php +++ b/src/applications/almanac/controller/AlmanacServiceEditController.php @@ -168,13 +168,12 @@ $crumbs->addTextCrumb(pht('Edit')); } - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, )); } diff --git a/src/applications/almanac/controller/AlmanacServiceViewController.php b/src/applications/almanac/controller/AlmanacServiceViewController.php --- a/src/applications/almanac/controller/AlmanacServiceViewController.php +++ b/src/applications/almanac/controller/AlmanacServiceViewController.php @@ -56,17 +56,16 @@ new AlmanacServiceTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, + return $this->newPage() + ->setTitle(pht('Almanac Console')) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, $bindings, $this->buildAlmanacPropertiesTable($service), $timeline, - ), - array( - 'title' => $title, - )); + )); } private function buildPropertyList(AlmanacService $service) {