diff --git a/src/applications/almanac/controller/AlmanacBindingEditController.php b/src/applications/almanac/controller/AlmanacBindingEditController.php index 7fc5abc395..f20011ded9 100644 --- a/src/applications/almanac/controller/AlmanacBindingEditController.php +++ b/src/applications/almanac/controller/AlmanacBindingEditController.php @@ -110,14 +110,14 @@ final class AlmanacBindingEditController $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 index f68c335fbe..9e26ba2012 100644 --- a/src/applications/almanac/controller/AlmanacBindingViewController.php +++ b/src/applications/almanac/controller/AlmanacBindingViewController.php @@ -55,15 +55,14 @@ final class AlmanacBindingViewController 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 index 020027f23b..8abd8c6113 100644 --- a/src/applications/almanac/controller/AlmanacConsoleController.php +++ b/src/applications/almanac/controller/AlmanacConsoleController.php @@ -40,14 +40,14 @@ final class AlmanacConsoleController extends AlmanacController { ->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 index dede68a971..3bbc388838 100644 --- a/src/applications/almanac/controller/AlmanacDeviceEditController.php +++ b/src/applications/almanac/controller/AlmanacDeviceEditController.php @@ -151,13 +151,12 @@ final class AlmanacDeviceEditController $crumbs->addTextCrumb(pht('Edit')); } - 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/AlmanacDeviceViewController.php b/src/applications/almanac/controller/AlmanacDeviceViewController.php index 61dacdee56..e611cceb7a 100644 --- a/src/applications/almanac/controller/AlmanacDeviceViewController.php +++ b/src/applications/almanac/controller/AlmanacDeviceViewController.php @@ -57,18 +57,17 @@ final class AlmanacDeviceViewController 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($title) + ->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 index 9bb45fd2ce..6d750bfbf5 100644 --- a/src/applications/almanac/controller/AlmanacInterfaceEditController.php +++ b/src/applications/almanac/controller/AlmanacInterfaceEditController.php @@ -142,13 +142,12 @@ final class AlmanacInterfaceEditController $crumbs->addTextCrumb(pht('Edit Interface')); } - 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/AlmanacNetworkEditController.php b/src/applications/almanac/controller/AlmanacNetworkEditController.php index 6c756969f8..b4ab77b95b 100644 --- a/src/applications/almanac/controller/AlmanacNetworkEditController.php +++ b/src/applications/almanac/controller/AlmanacNetworkEditController.php @@ -130,13 +130,12 @@ final class AlmanacNetworkEditController $crumbs->addTextCrumb(pht('Edit')); } - 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/AlmanacNetworkViewController.php b/src/applications/almanac/controller/AlmanacNetworkViewController.php index 294039dae7..70bd0cb87e 100644 --- a/src/applications/almanac/controller/AlmanacNetworkViewController.php +++ b/src/applications/almanac/controller/AlmanacNetworkViewController.php @@ -42,14 +42,13 @@ final class AlmanacNetworkViewController new AlmanacNetworkTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, - $timeline, - ), - array( - 'title' => $title, + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, + $timeline, )); } diff --git a/src/applications/almanac/controller/AlmanacServiceEditController.php b/src/applications/almanac/controller/AlmanacServiceEditController.php index 699e1bb3da..20a7528704 100644 --- a/src/applications/almanac/controller/AlmanacServiceEditController.php +++ b/src/applications/almanac/controller/AlmanacServiceEditController.php @@ -168,13 +168,12 @@ final class AlmanacServiceEditController $crumbs->addTextCrumb(pht('Edit')); } - 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/AlmanacServiceViewController.php b/src/applications/almanac/controller/AlmanacServiceViewController.php index 2fef847fec..a6fa6d8ac9 100644 --- a/src/applications/almanac/controller/AlmanacServiceViewController.php +++ b/src/applications/almanac/controller/AlmanacServiceViewController.php @@ -56,17 +56,16 @@ final class AlmanacServiceViewController new AlmanacServiceTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild( + array( + $box, $bindings, $this->buildAlmanacPropertiesTable($service), $timeline, - ), - array( - 'title' => $title, - )); + )); } private function buildPropertyList(AlmanacService $service) {