From 839e7e2fc6e61b0721802e881d0690934c76a880 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sun, 3 Apr 2016 00:27:39 +0000 Subject: [PATCH] Update Config to new UI Summary: Converts Config to new UI, updates to `newPage` Test Plan: Review all pages in Config, setup issues, ignore an issue, edit a config option Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D15587 --- .../PhabricatorConfigAllController.php | 8 ++---- .../PhabricatorConfigCacheController.php | 8 ++---- ...abricatorConfigDatabaseIssueController.php | 8 ++---- ...bricatorConfigDatabaseStatusController.php | 8 ++---- .../PhabricatorConfigEditController.php | 28 +++++++++++-------- .../PhabricatorConfigGroupController.php | 24 +++++++++------- .../PhabricatorConfigHistoryController.php | 10 ++----- .../PhabricatorConfigIgnoreController.php | 4 +-- .../PhabricatorConfigIssueListController.php | 8 ++---- .../PhabricatorConfigIssueViewController.php | 12 +++----- .../PhabricatorConfigListController.php | 8 ++---- .../PhabricatorConfigModuleController.php | 12 ++++---- .../PhabricatorConfigWelcomeController.php | 8 ++---- 13 files changed, 65 insertions(+), 81 deletions(-) diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php index d805168eb1..7f15273b88 100644 --- a/src/applications/config/controller/PhabricatorConfigAllController.php +++ b/src/applications/config/controller/PhabricatorConfigAllController.php @@ -64,12 +64,10 @@ final class PhabricatorConfigAllController $nav->setCrumbs($crumbs); $nav->appendChild($panel); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); } } diff --git a/src/applications/config/controller/PhabricatorConfigCacheController.php b/src/applications/config/controller/PhabricatorConfigCacheController.php index 67fbf6e120..0f5681dea6 100644 --- a/src/applications/config/controller/PhabricatorConfigCacheController.php +++ b/src/applications/config/controller/PhabricatorConfigCacheController.php @@ -25,11 +25,9 @@ final class PhabricatorConfigCacheController $data_box, )); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } private function renderCodeBox() { diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php index 22df5104e4..32ec2fa70b 100644 --- a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php +++ b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php @@ -159,11 +159,9 @@ final class PhabricatorConfigDatabaseIssueController $table_box, )); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } } diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php index d886e98d74..1b2f9dbcb4 100644 --- a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php +++ b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php @@ -94,11 +94,9 @@ final class PhabricatorConfigDatabaseStatusController $nav->setCrumbs($crumbs); $nav->appendChild($body); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php index 0c93c86f09..ab246b56ce 100644 --- a/src/applications/config/controller/PhabricatorConfigEditController.php +++ b/src/applications/config/controller/PhabricatorConfigEditController.php @@ -227,11 +227,13 @@ final class PhabricatorConfigEditController ->setValue($examples)); } - $title = pht('Edit %s', $key); + $title = pht('Edit Option: %s', $key); + $header_icon = 'fa-pencil'; $short = pht('Edit'); $form_box = id(new PHUIObjectBoxView()) - ->setHeaderText($title) + ->setHeaderText(pht('Config Option')) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->setForm($form); if ($error_view) { @@ -246,21 +248,25 @@ final class PhabricatorConfigEditController } $crumbs->addTextCrumb($key, '/config/edit/'.$key); + $crumbs->setBorder(true); $timeline = $this->buildTransactionTimeline( $config_entry, new PhabricatorConfigTransactionQuery()); $timeline->setShouldTerminate(true); - return $this->buildApplicationPage( - array( - $crumbs, - $form_box, - $timeline, - ), - array( - 'title' => $title, - )); + $header = id(new PHUIHeaderView()) + ->setHeader($title) + ->setHeaderIcon($header_icon); + + $view = id(new PHUITwoColumnView()) + ->setHeader($header) + ->setFooter($form_box); + + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild($view); } private function readRequest( diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php index 4569491427..af5ed41222 100644 --- a/src/applications/config/controller/PhabricatorConfigGroupController.php +++ b/src/applications/config/controller/PhabricatorConfigGroupController.php @@ -17,22 +17,26 @@ final class PhabricatorConfigGroupController $list = $this->buildOptionList($options->getOptions()); $box = id(new PHUIObjectBoxView()) - ->setHeaderText($title) ->setObjectList($list); $crumbs = $this ->buildApplicationCrumbs() ->addTextCrumb(pht('Config'), $this->getApplicationURI()) - ->addTextCrumb($options->getName(), $this->getApplicationURI()); + ->addTextCrumb($options->getName(), $this->getApplicationURI()) + ->setBorder(true); - return $this->buildApplicationPage( - array( - $crumbs, - $box, - ), - array( - 'title' => $title, - )); + $header = id(new PHUIHeaderView()) + ->setHeader($title) + ->setHeaderIcon('fa-sliders'); + + $view = id(new PHUITwoColumnView()) + ->setHeader($header) + ->setFooter($box); + + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild($view); } private function buildOptionList(array $options) { diff --git a/src/applications/config/controller/PhabricatorConfigHistoryController.php b/src/applications/config/controller/PhabricatorConfigHistoryController.php index d86fb79878..9fc538332f 100644 --- a/src/applications/config/controller/PhabricatorConfigHistoryController.php +++ b/src/applications/config/controller/PhabricatorConfigHistoryController.php @@ -40,13 +40,9 @@ final class PhabricatorConfigHistoryController $nav->setCrumbs($crumbs); $nav->appendChild($timeline); - return $this->buildApplicationPage( - array( - $nav, - ), - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } } diff --git a/src/applications/config/controller/PhabricatorConfigIgnoreController.php b/src/applications/config/controller/PhabricatorConfigIgnoreController.php index 80a859c147..cfe5a225ef 100644 --- a/src/applications/config/controller/PhabricatorConfigIgnoreController.php +++ b/src/applications/config/controller/PhabricatorConfigIgnoreController.php @@ -32,14 +32,12 @@ final class PhabricatorConfigIgnoreController throw new Exception(pht('Unrecognized verb: %s', $verb)); } - $dialog = id(new AphrontDialogView()) - ->setUser($request->getUser()) + return $this->newDialog() ->setTitle($title) ->appendChild($body) ->addSubmitButton($submit_title) ->addCancelButton($issue_uri); - return id(new AphrontDialogResponse())->setDialog($dialog); } public function manageApplication($issue) { diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php index 89b8ea7cd6..5f30a0411d 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueListController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php @@ -66,11 +66,9 @@ final class PhabricatorConfigIssueListController $nav->setCrumbs($crumbs); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } private function buildIssueList(array $issues, $group) { diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php index e8d6e188a4..b1d1c299a5 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php @@ -36,14 +36,10 @@ final class PhabricatorConfigIssueViewController ->addTextCrumb(pht('Setup Issues'), $this->getApplicationURI('issue/')) ->addTextCrumb($title, $request->getRequestURI()); - return $this->buildApplicationPage( - array( - $crumbs, - $content, - ), - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->appendChild($content); } private function renderIssue(PhabricatorSetupIssue $issue) { diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php index 9e87995ebc..220d47cfcd 100644 --- a/src/applications/config/controller/PhabricatorConfigListController.php +++ b/src/applications/config/controller/PhabricatorConfigListController.php @@ -35,11 +35,9 @@ final class PhabricatorConfigListController $nav->setCrumbs($crumbs); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } private function buildConfigOptionsList(array $groups, $type) { diff --git a/src/applications/config/controller/PhabricatorConfigModuleController.php b/src/applications/config/controller/PhabricatorConfigModuleController.php index 76343ecc11..fee5cb9756 100644 --- a/src/applications/config/controller/PhabricatorConfigModuleController.php +++ b/src/applications/config/controller/PhabricatorConfigModuleController.php @@ -14,10 +14,10 @@ final class PhabricatorConfigModuleController $module = $all_modules[$key]; $content = $module->renderModuleStatus($request); - $name = $module->getModuleName(); + $title = $module->getModuleName(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addTextCrumb($name); + $crumbs->addTextCrumb($title); $nav = $this->buildSideNavView(); $nav->selectFilter('module/'.$key.'/'); @@ -27,11 +27,9 @@ final class PhabricatorConfigModuleController $content, )); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $name, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } } diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php index e2d704e0b7..435ce6f01e 100644 --- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php +++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php @@ -18,11 +18,9 @@ final class PhabricatorConfigWelcomeController $nav->setCrumbs($crumbs); $nav->appendChild($this->buildWelcomeScreen($request)); - return $this->buildApplicationPage( - $nav, - array( - 'title' => $title, - )); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } public function buildWelcomeScreen(AphrontRequest $request) {