From a4784e03fff4456139bd590a13a2541b4d8533ed Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 20 May 2015 12:43:34 -0700 Subject: [PATCH] [Redesign] Add Table, Collapse support to ObjectBox Summary: Converts most all tables to be directly set via `setTable` to an ObjectBox. I think this path is more flexible design wise, as we can change the box based on children, and not just CSS. We also already do this with PropertyList, Forms, ObjectList, and Header. `setCollapsed` is added to ObjectBox to all children objects to bleed to the edges (like diffs). Test Plan: I did a grep of `appendChild($table)` as well as searches for `PHUIObjectBoxView`, also with manual opening of hundreds of files. I'm sure I missed 5-8 places. If you just appendChild($table) nothing breaks, it just looks a little funny. Reviewers: epriestley, btrahan Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D12955 --- .../almanac/controller/AlmanacController.php | 2 +- .../AlmanacDeviceEditController.php | 2 +- .../AlmanacDeviceViewController.php | 6 +-- .../AlmanacInterfaceEditController.php | 2 +- .../AlmanacNetworkEditController.php | 2 +- .../AlmanacServiceEditController.php | 2 +- .../AlmanacServiceViewController.php | 2 +- .../PhabricatorPasswordAuthProvider.php | 2 +- .../PhabricatorAuthInviteSearchEngine.php | 2 +- ...habricatorChatLogChannelListController.php | 6 ++- .../PhabricatorConduitAPIController.php | 4 +- .../PhabricatorConduitConsoleController.php | 6 +-- .../PhabricatorConduitLogController.php | 2 +- .../PhabricatorConduitTokensSettingsPanel.php | 2 +- .../PhabricatorConfigAllController.php | 2 +- .../PhabricatorConfigCacheController.php | 2 +- ...abricatorConfigDatabaseIssueController.php | 2 +- ...bricatorConfigDatabaseStatusController.php | 42 ++++++++++++------- .../PhabricatorConfigIssueListController.php | 8 ++-- .../PhabricatorConfigListController.php | 2 +- .../DifferentialDiffViewController.php | 2 +- .../view/DifferentialChangesetListView.php | 1 + .../view/DifferentialRevisionListView.php | 2 +- .../DifferentialRevisionUpdateHistoryView.php | 2 +- .../PhabricatorFactHomeController.php | 2 +- ...atorFilesApplicationStorageEnginePanel.php | 2 +- .../FundInitiativeViewController.php | 2 +- .../fund/query/FundBackerSearchEngine.php | 2 +- .../LegalpadDocumentSignatureSearchEngine.php | 2 +- .../ManiphestBatchEditController.php | 2 +- .../controller/ManiphestReportController.php | 4 +- .../ManiphestTaskDetailController.php | 2 +- ...habricatorMetaMTAApplicationEmailPanel.php | 4 +- .../controller/MultimeterSampleController.php | 2 +- ...OAuthServerAuthorizationsSettingsPanel.php | 2 +- .../PhabricatorOwnersDetailController.php | 2 +- .../PhabricatorOwnersListController.php | 2 +- .../PhabricatorPeopleCreateController.php | 2 +- .../PhabricatorPeopleInviteSendController.php | 4 +- .../PhabricatorPeopleLogSearchEngine.php | 2 +- .../PhortuneAccountEditController.php | 2 +- .../PhortuneAccountViewController.php | 10 ++--- .../PhortuneCartCheckoutController.php | 2 +- .../controller/PhortuneCartViewController.php | 6 +-- .../PhortuneMerchantEditController.php | 2 +- ...hortuneMerchantInvoiceCreateController.php | 2 +- .../PhortuneMerchantViewController.php | 4 +- .../PhortunePaymentMethodEditController.php | 2 +- .../query/PhortuneCartSearchEngine.php | 2 +- .../query/PhortuneChargeSearchEngine.php | 2 +- .../PhortuneSubscriptionSearchEngine.php | 2 +- .../controller/PhrictionDiffController.php | 5 ++- .../PhabricatorRepositoryListController.php | 4 +- .../PhabricatorActivitySettingsPanel.php | 2 +- ...PhabricatorEmailAddressesSettingsPanel.php | 2 +- ...abricatorExternalAccountsSettingsPanel.php | 4 +- ...habricatorHomePreferencesSettingsPanel.php | 2 +- .../PhabricatorMultiFactorSettingsPanel.php | 2 +- .../panel/PhabricatorSSHKeysSettingsPanel.php | 2 +- .../PhabricatorSessionsSettingsPanel.php | 2 +- .../panel/PhabricatorTokensSettingsPanel.php | 2 +- .../PhabricatorXHProfProfileSymbolView.php | 2 +- .../PhabricatorXHProfProfileTopLevelView.php | 2 +- src/view/phui/PHUIObjectBoxView.php | 4 +- webroot/rsrc/css/aphront/table-view.css | 2 +- webroot/rsrc/css/phui/phui-object-box.css | 8 ++++ 66 files changed, 126 insertions(+), 100 deletions(-) diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php index df410a254b..8efae11d6a 100644 --- a/src/applications/almanac/controller/AlmanacController.php +++ b/src/applications/almanac/controller/AlmanacController.php @@ -176,7 +176,7 @@ abstract class AlmanacController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } protected function addLockMessage(PHUIObjectBoxView $box, $message) { diff --git a/src/applications/almanac/controller/AlmanacDeviceEditController.php b/src/applications/almanac/controller/AlmanacDeviceEditController.php index 4dc56a4234..dede68a971 100644 --- a/src/applications/almanac/controller/AlmanacDeviceEditController.php +++ b/src/applications/almanac/controller/AlmanacDeviceEditController.php @@ -141,7 +141,7 @@ final class AlmanacDeviceEditController $box = id(new PHUIObjectBoxView()) ->setValidationException($validation_exception) ->setHeaderText($title) - ->appendChild($form); + ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); if ($is_new) { diff --git a/src/applications/almanac/controller/AlmanacDeviceViewController.php b/src/applications/almanac/controller/AlmanacDeviceViewController.php index 4c925b187a..61dacdee56 100644 --- a/src/applications/almanac/controller/AlmanacDeviceViewController.php +++ b/src/applications/almanac/controller/AlmanacDeviceViewController.php @@ -139,7 +139,7 @@ final class AlmanacDeviceViewController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } private function buildSSHKeysTable(AlmanacDevice $device) { @@ -200,7 +200,7 @@ final class AlmanacDeviceViewController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } @@ -249,7 +249,7 @@ final class AlmanacDeviceViewController return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Bound Services')) - ->appendChild($table); + ->setTable($table); } diff --git a/src/applications/almanac/controller/AlmanacInterfaceEditController.php b/src/applications/almanac/controller/AlmanacInterfaceEditController.php index 9d9cb652e2..9bb45fd2ce 100644 --- a/src/applications/almanac/controller/AlmanacInterfaceEditController.php +++ b/src/applications/almanac/controller/AlmanacInterfaceEditController.php @@ -132,7 +132,7 @@ final class AlmanacInterfaceEditController $box = id(new PHUIObjectBoxView()) ->setValidationException($validation_exception) ->setHeaderText($title) - ->appendChild($form); + ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb($device->getName(), $device_uri); diff --git a/src/applications/almanac/controller/AlmanacNetworkEditController.php b/src/applications/almanac/controller/AlmanacNetworkEditController.php index 558577fd7a..6c756969f8 100644 --- a/src/applications/almanac/controller/AlmanacNetworkEditController.php +++ b/src/applications/almanac/controller/AlmanacNetworkEditController.php @@ -120,7 +120,7 @@ final class AlmanacNetworkEditController $box = id(new PHUIObjectBoxView()) ->setValidationException($validation_exception) ->setHeaderText($title) - ->appendChild($form); + ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); if ($is_new) { diff --git a/src/applications/almanac/controller/AlmanacServiceEditController.php b/src/applications/almanac/controller/AlmanacServiceEditController.php index 13f31430e7..02741d190a 100644 --- a/src/applications/almanac/controller/AlmanacServiceEditController.php +++ b/src/applications/almanac/controller/AlmanacServiceEditController.php @@ -238,7 +238,7 @@ final class AlmanacServiceEditController $box = id(new PHUIObjectBoxView()) ->setFormErrors($errors) ->setHeaderText($title) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/almanac/controller/AlmanacServiceViewController.php b/src/applications/almanac/controller/AlmanacServiceViewController.php index 86a527a7e3..2fef847fec 100644 --- a/src/applications/almanac/controller/AlmanacServiceViewController.php +++ b/src/applications/almanac/controller/AlmanacServiceViewController.php @@ -141,7 +141,7 @@ final class AlmanacServiceViewController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php b/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php index 6307446c88..95091b4807 100644 --- a/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php @@ -94,7 +94,7 @@ final class PhabricatorPasswordAuthProvider extends PhabricatorAuthProvider { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } public function getDescriptionForCreate() { diff --git a/src/applications/auth/query/PhabricatorAuthInviteSearchEngine.php b/src/applications/auth/query/PhabricatorAuthInviteSearchEngine.php index af0cc9790c..b7e4445fda 100644 --- a/src/applications/auth/query/PhabricatorAuthInviteSearchEngine.php +++ b/src/applications/auth/query/PhabricatorAuthInviteSearchEngine.php @@ -104,6 +104,6 @@ final class PhabricatorAuthInviteSearchEngine return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Email Invitations')) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php index c557b2bc2f..7608a6184b 100644 --- a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php +++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php @@ -29,10 +29,14 @@ final class PhabricatorChatLogChannelListController ->buildApplicationCrumbs() ->addTextCrumb(pht('Channel List'), $this->getApplicationURI()); + $box = id(new PHUIObjectBoxView()) + ->setHeaderText('Channel List') + ->setObjectList($list); + return $this->buildApplicationPage( array( $crumbs, - $list, + $box, ), array( 'title' => pht('Channel List'), diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php index cdc14da27d..f4be1c37d8 100644 --- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php +++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php @@ -566,11 +566,11 @@ final class PhabricatorConduitAPIController $param_panel = new PHUIObjectBoxView(); $param_panel->setHeaderText(pht('Method Parameters')); - $param_panel->appendChild($param_table); + $param_panel->setTable($param_table); $result_panel = new PHUIObjectBoxView(); $result_panel->setHeaderText(pht('Method Result')); - $result_panel->appendChild($result_table); + $result_panel->setTable($result_table); $method_uri = $this->getApplicationURI('method/'.$method.'/'); diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php index 5c0ccfe6fb..e2c67d2a02 100644 --- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php +++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php @@ -86,7 +86,7 @@ final class PhabricatorConduitConsoleController $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Call Method')) - ->appendChild($form); + ->setForm($form); $content = array(); @@ -129,7 +129,7 @@ final class PhabricatorConduitConsoleController )); $content[] = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Builtin Orders')) - ->appendChild($table); + ->setTable($table); $columns = $query->getOrderableColumns(); @@ -154,7 +154,7 @@ final class PhabricatorConduitConsoleController )); $content[] = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Column Orders')) - ->appendChild($table); + ->setTable($table); } $crumbs = $this->buildApplicationCrumbs(); diff --git a/src/applications/conduit/controller/PhabricatorConduitLogController.php b/src/applications/conduit/controller/PhabricatorConduitLogController.php index d8da592372..793af0c33f 100644 --- a/src/applications/conduit/controller/PhabricatorConduitLogController.php +++ b/src/applications/conduit/controller/PhabricatorConduitLogController.php @@ -37,7 +37,7 @@ final class PhabricatorConduitLogController $table = $this->renderCallTable($calls, $conns); $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Call Logs')) - ->appendChild($table); + ->setTable($table); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb(pht('Call Logs')); diff --git a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php index 15da1e9c05..faae8a8913 100644 --- a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php +++ b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php @@ -108,7 +108,7 @@ final class PhabricatorConduitTokensSettingsPanel $panel = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); return $panel; } diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php index d4dd4fef01..309304ed21 100644 --- a/src/applications/config/controller/PhabricatorConfigAllController.php +++ b/src/applications/config/controller/PhabricatorConfigAllController.php @@ -57,7 +57,7 @@ final class PhabricatorConfigAllController $panel = new PHUIObjectBoxView(); $panel->setHeaderText(pht('Current Settings')); - $panel->appendChild($table); + $panel->setTable($table); $versions = $this->loadVersions(); diff --git a/src/applications/config/controller/PhabricatorConfigCacheController.php b/src/applications/config/controller/PhabricatorConfigCacheController.php index 973f064a5e..a27be465e2 100644 --- a/src/applications/config/controller/PhabricatorConfigCacheController.php +++ b/src/applications/config/controller/PhabricatorConfigCacheController.php @@ -92,7 +92,7 @@ final class PhabricatorConfigCacheController return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Data Cache')) ->addPropertyList($properties) - ->appendChild($table); + ->setTable($table); } private function renderCommonProperties( diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php index 168b456660..252d8a73de 100644 --- a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php +++ b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php @@ -150,7 +150,7 @@ final class PhabricatorConfigDatabaseIssueController $table_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderWithDocumentationLink($title)) ->setFormErrors($errors) - ->appendChild($table); + ->setTable($table); $nav = $this->buildSideNavView(); $nav->selectFilter('dbissue/'); diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php index c75a019d06..f69e794fb8 100644 --- a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php +++ b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php @@ -165,12 +165,15 @@ final class PhabricatorConfigDatabaseStatusController ), $comp->getIssues()); - $box = id(new PHUIObjectBoxView()) + $prop_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderWithDocumentationLink($title)) - ->addPropertyList($properties) - ->appendChild($table); + ->addPropertyList($properties); - return $this->buildResponse($title, $box); + $table_box = id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Databases')) + ->setTable($table); + + return $this->buildResponse($title, array($prop_box, $table_box)); } private function renderDatabase( @@ -219,7 +222,7 @@ final class PhabricatorConfigDatabaseStatusController null, )); - $title = pht('Database Status: %s', $database_name); + $title = pht('Database: %s', $database_name); $actual_database = $actual->getDatabase($database_name); if ($actual_database) { @@ -260,12 +263,15 @@ final class PhabricatorConfigDatabaseStatusController ), $database->getIssues()); - $box = id(new PHUIObjectBoxView()) + $prop_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderWithDocumentationLink($title)) - ->addPropertyList($properties) - ->appendChild($table); + ->addPropertyList($properties); - return $this->buildResponse($title, $box); + $table_box = id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Database Status')) + ->setTable($table); + + return $this->buildResponse($title, array($prop_box, $table_box)); } private function renderTable( @@ -443,7 +449,7 @@ final class PhabricatorConfigDatabaseStatusController null, )); - $title = pht('Database Status: %s.%s', $database_name, $table_name); + $title = pht('Database: %s.%s', $database_name, $table_name); if ($actual_table) { $actual_collation = $actual_table->getCollation(); @@ -470,13 +476,19 @@ final class PhabricatorConfigDatabaseStatusController ), $table->getIssues()); - $box = id(new PHUIObjectBoxView()) + $prop_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderWithDocumentationLink($title)) - ->addPropertyList($properties) - ->appendChild($table_view) - ->appendChild($keys_view); + ->addPropertyList($properties); - return $this->buildResponse($title, $box); + $table_box = id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Database')) + ->setTable($table_view); + + $key_box = id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Keys')) + ->setTable($keys_view); + + return $this->buildResponse($title, array($prop_box, $table_box, $key_box)); } private function renderColumn( diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php index b50447d740..926d64a176 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueListController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php @@ -28,25 +28,25 @@ final class PhabricatorConfigIssueListController $setup_issues[] = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Important Setup Issues')) ->setColor(PHUIObjectBoxView::COLOR_RED) - ->appendChild($important); + ->setObjectList($important); } if ($php) { $setup_issues[] = id(new PHUIObjectBoxView()) ->setHeaderText(pht('PHP Setup Issues')) - ->appendChild($php); + ->setObjectList($php); } if ($mysql) { $setup_issues[] = id(new PHUIObjectBoxView()) ->setHeaderText(pht('MySQL Setup Issues')) - ->appendChild($mysql); + ->setObjectList($mysql); } if ($other) { $setup_issues[] = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Other Setup Issues')) - ->appendChild($other); + ->setObjectList($other); } if (empty($setup_issues)) { diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php index ea79ec84c4..4da4f2ac01 100644 --- a/src/applications/config/controller/PhabricatorConfigListController.php +++ b/src/applications/config/controller/PhabricatorConfigListController.php @@ -18,7 +18,7 @@ final class PhabricatorConfigListController $core = id(new PHUIObjectBoxView()) ->setHeaderText($title) - ->appendChild($core_list); + ->setObjectList($core_list); $apps = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Applications Configuration')) diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php index ebbee90e99..d095465604 100644 --- a/src/applications/differential/controller/DifferentialDiffViewController.php +++ b/src/applications/differential/controller/DifferentialDiffViewController.php @@ -130,7 +130,7 @@ final class DifferentialDiffViewController extends DifferentialController { $prop_box = id(new PHUIObjectBoxView()) ->setHeader($property_head) ->addPropertyList($property_view) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php index 3e7bfb677c..7ac45cc02b 100644 --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -250,6 +250,7 @@ final class DifferentialChangesetListView extends AphrontView { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) + ->setCollapsed(true) ->appendChild($content); return $object_box; diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php index fad49ba68a..45a0306023 100644 --- a/src/applications/differential/view/DifferentialRevisionListView.php +++ b/src/applications/differential/view/DifferentialRevisionListView.php @@ -195,7 +195,7 @@ final class DifferentialRevisionListView extends AphrontView { if ($this->header && !$this->noBox) { $list->setFlush(true); $list = id(new PHUIObjectBoxView()) - ->appendChild($list); + ->setObjectList($list); if ($this->header instanceof PHUIHeaderView) { $list->setHeader($this->header); diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php index 4f99c19c7d..02826f1efd 100644 --- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php +++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php @@ -307,7 +307,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView { return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Revision Update History')) ->setFlush(true) - ->appendChild($content); + ->setTable($content); } const STAR_NONE = 'none'; diff --git a/src/applications/fact/controller/PhabricatorFactHomeController.php b/src/applications/fact/controller/PhabricatorFactHomeController.php index 85f8a084df..700b2ef926 100644 --- a/src/applications/fact/controller/PhabricatorFactHomeController.php +++ b/src/applications/fact/controller/PhabricatorFactHomeController.php @@ -53,7 +53,7 @@ final class PhabricatorFactHomeController extends PhabricatorFactController { $panel = new PHUIObjectBoxView(); $panel->setHeaderText(pht('Facts')); - $panel->appendChild($table); + $panel->setTable($table); $chart_form = $this->buildChartForm(); diff --git a/src/applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php b/src/applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php index a174102c18..34f695e81a 100644 --- a/src/applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php +++ b/src/applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php @@ -87,7 +87,7 @@ final class PhabricatorFilesApplicationStorageEnginePanel $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Storage Engines')) - ->appendChild($table); + ->setTable($table); return $box; } diff --git a/src/applications/fund/controller/FundInitiativeViewController.php b/src/applications/fund/controller/FundInitiativeViewController.php index 34f04d3133..763366e621 100644 --- a/src/applications/fund/controller/FundInitiativeViewController.php +++ b/src/applications/fund/controller/FundInitiativeViewController.php @@ -57,7 +57,7 @@ final class FundInitiativeViewController $box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($properties); + ->addPropertyList($properties); $timeline = $this->buildTransactionTimeline( diff --git a/src/applications/fund/query/FundBackerSearchEngine.php b/src/applications/fund/query/FundBackerSearchEngine.php index d1b7e64a23..1b6b16a519 100644 --- a/src/applications/fund/query/FundBackerSearchEngine.php +++ b/src/applications/fund/query/FundBackerSearchEngine.php @@ -143,7 +143,7 @@ final class FundBackerSearchEngine return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Backers')) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php index 48cc1b94b6..b4c2429f4f 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php +++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php @@ -284,7 +284,7 @@ final class LegalpadDocumentSignatureSearchEngine $box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); if (!$this->document) { $policy_notice = id(new PHUIInfoView()) diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php index 58c8ffce1c..b251f7c6ee 100644 --- a/src/applications/maniphest/controller/ManiphestBatchEditController.php +++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php @@ -173,7 +173,7 @@ final class ManiphestBatchEditController extends ManiphestController { $task_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Selected Tasks')) - ->appendChild($list); + ->setObjectList($list); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Batch Editor')) diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index 3c6eca0542..cf97970c92 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -272,7 +272,7 @@ final class ManiphestReportController extends ManiphestController { if ($caption) { $panel->setInfoView($caption); } - $panel->appendChild($table); + $panel->setTable($table); $tokens = array(); if ($handle) { @@ -653,7 +653,7 @@ final class ManiphestReportController extends ManiphestController { $panel = new PHUIObjectBoxView(); $panel->setHeaderText($header); - $panel->appendChild($table); + $panel->setTable($table); $tokens = array(); if ($project_handle) { diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index 7b61c7b288..0d4fa74398 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -341,7 +341,7 @@ final class ManiphestTaskDetailController extends ManiphestController { $comment_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeaderText($comment_header) - ->appendChild($comment_form); + ->setForm($comment_form); $timeline->setQuoteTargetID('transaction-comments'); $timeline->setQuoteRef($object_name); } diff --git a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php index 80cb3f0313..ac8a3d560f 100644 --- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php +++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php @@ -56,7 +56,7 @@ final class PhabricatorMetaMTAApplicationEmailPanel $box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); return $box; } @@ -175,7 +175,7 @@ final class PhabricatorMetaMTAApplicationEmailPanel $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); $title = $application->getName(); diff --git a/src/applications/multimeter/controller/MultimeterSampleController.php b/src/applications/multimeter/controller/MultimeterSampleController.php index c67adee8a2..a62d10ef30 100644 --- a/src/applications/multimeter/controller/MultimeterSampleController.php +++ b/src/applications/multimeter/controller/MultimeterSampleController.php @@ -235,7 +235,7 @@ final class MultimeterSampleController extends MultimeterController { 'Samples (%s - %s)', phabricator_datetime($ago, $viewer), phabricator_datetime($now, $viewer))) - ->appendChild($table); + ->setTable($table); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb( diff --git a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php index 8504c97ce1..b33f5a4616 100644 --- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php +++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php @@ -135,7 +135,7 @@ final class PhabricatorOAuthServerAuthorizationsSettingsPanel $panel = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); return $panel; } diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php index 1db98f14aa..4a4bc85822 100644 --- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php +++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php @@ -129,7 +129,7 @@ final class PhabricatorOwnersDetailController ->setText(pht('Edit Package'))); $panel->setHeader($header); - $panel->appendChild($table); + $panel->setTable($table); $key = 'package/'.$package->getID(); $this->setSideNavFilter($key); diff --git a/src/applications/owners/controller/PhabricatorOwnersListController.php b/src/applications/owners/controller/PhabricatorOwnersListController.php index ef7b01ebfb..01ae38dc23 100644 --- a/src/applications/owners/controller/PhabricatorOwnersListController.php +++ b/src/applications/owners/controller/PhabricatorOwnersListController.php @@ -330,7 +330,7 @@ final class PhabricatorOwnersListController $panel = new PHUIObjectBoxView(); $panel->setHeaderText($header); - $panel->appendChild($table); + $panel->setTable($table); return $panel; } diff --git a/src/applications/people/controller/PhabricatorPeopleCreateController.php b/src/applications/people/controller/PhabricatorPeopleCreateController.php index b8852f2e42..7bceddc1a2 100644 --- a/src/applications/people/controller/PhabricatorPeopleCreateController.php +++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php @@ -72,7 +72,7 @@ final class PhabricatorPeopleCreateController $box = id(new PHUIObjectBoxView()) ->setHeaderText($title) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php index 2d00177877..6a7049215d 100644 --- a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php +++ b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php @@ -163,7 +163,7 @@ final class PhabricatorPeopleInviteSendController ->setErrors($confirm_errors) ->setSeverity($severity)) ->setHeaderText(pht('Confirm Invites')) - ->appendChild($invite_table) + ->setTable($invite_table) ->appendChild($confirm_form); } @@ -203,7 +203,7 @@ final class PhabricatorPeopleInviteSendController ? pht('Revise Invites') : pht('Invite Users')) ->setFormErrors($errors) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php index b98e29840b..6202ab6b86 100644 --- a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php +++ b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php @@ -188,6 +188,6 @@ final class PhabricatorPeopleLogSearchEngine return id(new PHUIObjectBoxView()) ->setHeaderText(pht('User Activity Logs')) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/phortune/controller/PhortuneAccountEditController.php b/src/applications/phortune/controller/PhortuneAccountEditController.php index 6d0f86d868..7847420549 100644 --- a/src/applications/phortune/controller/PhortuneAccountEditController.php +++ b/src/applications/phortune/controller/PhortuneAccountEditController.php @@ -120,7 +120,7 @@ final class PhortuneAccountEditController extends PhortuneController { $box = id(new PHUIObjectBoxView()) ->setHeaderText($title) ->setValidationException($validation_exception) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php index 7991a260b3..e2ab3badf4 100644 --- a/src/applications/phortune/controller/PhortuneAccountViewController.php +++ b/src/applications/phortune/controller/PhortuneAccountViewController.php @@ -175,7 +175,7 @@ final class PhortuneAccountViewController extends PhortuneController { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($list); + ->setObjectList($list); } private function buildInvoicesSection( @@ -207,7 +207,7 @@ final class PhortuneAccountViewController extends PhortuneController { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } private function buildPurchaseHistorySection(PhortuneAccount $account) { @@ -258,7 +258,7 @@ final class PhortuneAccountViewController extends PhortuneController { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } private function buildChargeHistorySection(PhortuneAccount $account) { @@ -302,7 +302,7 @@ final class PhortuneAccountViewController extends PhortuneController { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } private function buildSubscriptionsSection(PhortuneAccount $account) { @@ -338,7 +338,7 @@ final class PhortuneAccountViewController extends PhortuneController { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); } protected function buildApplicationCrumbs() { diff --git a/src/applications/phortune/controller/PhortuneCartCheckoutController.php b/src/applications/phortune/controller/PhortuneCartCheckoutController.php index b6b9287104..10d7e51b2c 100644 --- a/src/applications/phortune/controller/PhortuneCartCheckoutController.php +++ b/src/applications/phortune/controller/PhortuneCartCheckoutController.php @@ -113,7 +113,7 @@ final class PhortuneCartCheckoutController $cart_box = id(new PHUIObjectBoxView()) ->setFormErrors($errors) ->setHeaderText(pht('Cart Contents')) - ->appendChild($cart_table); + ->setTable($cart_table); $title = $cart->getName(); diff --git a/src/applications/phortune/controller/PhortuneCartViewController.php b/src/applications/phortune/controller/PhortuneCartViewController.php index 956196a3bb..9e133002f5 100644 --- a/src/applications/phortune/controller/PhortuneCartViewController.php +++ b/src/applications/phortune/controller/PhortuneCartViewController.php @@ -146,8 +146,8 @@ final class PhortuneCartViewController $cart_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($properties) - ->appendChild($cart_table); + ->addPropertyList($properties) + ->setTable($cart_table); if ($errors) { $cart_box->setFormErrors($errors); @@ -180,7 +180,7 @@ final class PhortuneCartViewController $charges = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Charges')) - ->appendChild($charges_table); + ->setTable($charges_table); $account = $cart->getAccount(); diff --git a/src/applications/phortune/controller/PhortuneMerchantEditController.php b/src/applications/phortune/controller/PhortuneMerchantEditController.php index 6dfef5bd74..adb6e39c44 100644 --- a/src/applications/phortune/controller/PhortuneMerchantEditController.php +++ b/src/applications/phortune/controller/PhortuneMerchantEditController.php @@ -164,7 +164,7 @@ final class PhortuneMerchantEditController $box = id(new PHUIObjectBoxView()) ->setValidationException($validation_exception) ->setHeaderText($title) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php b/src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php index eeb376b3cf..acb0d1be08 100644 --- a/src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php +++ b/src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php @@ -231,7 +231,7 @@ final class PhortuneMerchantInvoiceCreateController $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('New Invoice')) ->setFormErrors($errors) - ->appendChild($form); + ->setForm($form); return $this->buildApplicationPage( array( diff --git a/src/applications/phortune/controller/PhortuneMerchantViewController.php b/src/applications/phortune/controller/PhortuneMerchantViewController.php index c1512e9d32..979a092e8e 100644 --- a/src/applications/phortune/controller/PhortuneMerchantViewController.php +++ b/src/applications/phortune/controller/PhortuneMerchantViewController.php @@ -50,7 +50,7 @@ final class PhortuneMerchantViewController $box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($properties); + ->addPropertyList($properties); $timeline = $this->buildTransactionTimeline( $merchant, @@ -293,7 +293,7 @@ final class PhortuneMerchantViewController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($provider_list); + ->setObjectList($provider_list); } diff --git a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php index 4cbe627908..2db514a1cf 100644 --- a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php +++ b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php @@ -65,7 +65,7 @@ final class PhortunePaymentMethodEditController $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Edit Payment Method')) - ->appendChild($form); + ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb($account->getName(), $account_uri); diff --git a/src/applications/phortune/query/PhortuneCartSearchEngine.php b/src/applications/phortune/query/PhortuneCartSearchEngine.php index ad29ed4e0d..f7a339e26e 100644 --- a/src/applications/phortune/query/PhortuneCartSearchEngine.php +++ b/src/applications/phortune/query/PhortuneCartSearchEngine.php @@ -229,6 +229,6 @@ final class PhortuneCartSearchEngine return id(new PHUIObjectBoxView()) ->setHeaderText($header) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/phortune/query/PhortuneChargeSearchEngine.php b/src/applications/phortune/query/PhortuneChargeSearchEngine.php index 617c9641c9..a708deef02 100644 --- a/src/applications/phortune/query/PhortuneChargeSearchEngine.php +++ b/src/applications/phortune/query/PhortuneChargeSearchEngine.php @@ -129,6 +129,6 @@ final class PhortuneChargeSearchEngine return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Charges')) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/phortune/query/PhortuneSubscriptionSearchEngine.php b/src/applications/phortune/query/PhortuneSubscriptionSearchEngine.php index 695cd24d0c..8a29747926 100644 --- a/src/applications/phortune/query/PhortuneSubscriptionSearchEngine.php +++ b/src/applications/phortune/query/PhortuneSubscriptionSearchEngine.php @@ -160,6 +160,6 @@ final class PhortuneSubscriptionSearchEngine return id(new PHUIObjectBoxView()) ->setHeaderText($header) - ->appendChild($table); + ->setTable($table); } } diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php index 7f41c193f4..3ed8d382c3 100644 --- a/src/applications/phriction/controller/PhrictionDiffController.php +++ b/src/applications/phriction/controller/PhrictionDiffController.php @@ -149,7 +149,7 @@ final class PhrictionDiffController extends PhrictionController { 'a', array( 'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1), - 'class' => 'button', + 'class' => 'button simple', ), pht("\xC2\xAB Previous Change")); } else { @@ -168,7 +168,7 @@ final class PhrictionDiffController extends PhrictionController { 'a', array( 'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1), - 'class' => 'button', + 'class' => 'button simple', ), pht("Next Change \xC2\xBB")); } else { @@ -206,6 +206,7 @@ final class PhrictionDiffController extends PhrictionController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) + ->setCollapsed(true) ->appendChild($output); return $this->buildApplicationPage( diff --git a/src/applications/repository/controller/PhabricatorRepositoryListController.php b/src/applications/repository/controller/PhabricatorRepositoryListController.php index 56e8dc37d8..145b255cd0 100644 --- a/src/applications/repository/controller/PhabricatorRepositoryListController.php +++ b/src/applications/repository/controller/PhabricatorRepositoryListController.php @@ -83,7 +83,7 @@ final class PhabricatorRepositoryListController $header->addActionLink($button); } $panel->setHeader($header); - $panel->appendChild($table); + $panel->setTable($table); $projects = id(new PhabricatorRepositoryArcanistProject())->loadAll(); @@ -145,7 +145,7 @@ final class PhabricatorRepositoryListController $project_panel = new PHUIObjectBoxView(); $project_panel->setHeaderText(pht('Arcanist Projects')); - $project_panel->appendChild($project_table); + $project_panel->setTable($project_table); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb(pht('Repository List')); diff --git a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php index fcac799c4c..757ac9c332 100644 --- a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php @@ -56,7 +56,7 @@ final class PhabricatorActivitySettingsPanel extends PhabricatorSettingsPanel { $panel = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Account Activity Logs')) - ->appendChild($table); + ->setTable($table); $pager_box = id(new PHUIBoxView()) ->addMargin(PHUI::MARGIN_LARGE) diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php index 7ad59d4d37..05e4df1040 100644 --- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php @@ -147,7 +147,7 @@ final class PhabricatorEmailAddressesSettingsPanel $header->addActionLink($button); } $view->setHeader($header); - $view->appendChild($table); + $view->setTable($table); return $view; } diff --git a/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php b/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php index 6fb0ea8167..c9b6269a87 100644 --- a/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php @@ -135,11 +135,11 @@ final class PhabricatorExternalAccountsSettingsPanel $linked_box = id(new PHUIObjectBoxView()) ->setHeader($linked_head) - ->appendChild($linked); + ->setObjectList($linked); $linkable_box = id(new PHUIObjectBoxView()) ->setHeader($linkable_head) - ->appendChild($linkable); + ->setObjectList($linkable); return array( $linked_box, diff --git a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php index 29acce2b15..c18c4c58d1 100644 --- a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php @@ -188,7 +188,7 @@ final class PhabricatorHomePreferencesSettingsPanel $box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($list); + ->setObjectList($list); return $box; } diff --git a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php index 3e53951212..42d5ac4330 100644 --- a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php @@ -129,7 +129,7 @@ final class PhabricatorMultiFactorSettingsPanel $header->addActionLink($create_button); $panel->setHeader($header); - $panel->appendChild($table); + $panel->setTable($table); return $panel; } diff --git a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php index 2749e7147f..ebc268d6d7 100644 --- a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php @@ -71,7 +71,7 @@ final class PhabricatorSSHKeysSettingsPanel extends PhabricatorSettingsPanel { $header->addActionLink($upload_button); $panel->setHeader($header); - $panel->appendChild($table); + $panel->setTable($table); return $panel; } diff --git a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php index 7e15c8516d..b89ea8e902 100644 --- a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php @@ -138,7 +138,7 @@ final class PhabricatorSessionsSettingsPanel extends PhabricatorSettingsPanel { $panel = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); return $panel; } diff --git a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php index e9b19784e0..9c20e1235f 100644 --- a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php @@ -91,7 +91,7 @@ final class PhabricatorTokensSettingsPanel extends PhabricatorSettingsPanel { $panel = id(new PHUIObjectBoxView()) ->setHeader($header) - ->appendChild($table); + ->setTable($table); return $panel; } diff --git a/src/applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php b/src/applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php index 510d6d8430..fe0f14b39c 100644 --- a/src/applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php +++ b/src/applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php @@ -117,7 +117,7 @@ final class PhabricatorXHProfProfileSymbolView $panel = new PHUIObjectBoxView(); $panel->setHeaderText(pht('XHProf Profile')); - $panel->appendChild($table); + $panel->setTable($table); return $panel->render(); } diff --git a/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php b/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php index e332ca4d2f..cf1ba1d751 100644 --- a/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php +++ b/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php @@ -134,7 +134,7 @@ final class PhabricatorXHProfProfileTopLevelView } $panel->setHeader($header); - $panel->appendChild($table); + $panel->setTable($table); return $panel->render(); } diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php index 4131f816ca..11e8655b67 100644 --- a/src/view/phui/PHUIObjectBoxView.php +++ b/src/view/phui/PHUIObjectBoxView.php @@ -150,7 +150,7 @@ final class PHUIObjectBoxView extends AphrontView { $this->objectList = $list; return $this; } - + public function setTable($table) { $this->collapsed = true; $this->table = $table; @@ -306,7 +306,7 @@ final class PHUIObjectBoxView extends AphrontView { if ($this->color) { $content->addClass('phui-object-box-'.$this->color); } - + if ($this->collapsed) { $content->addClass('phui-object-box-collapsed'); } diff --git a/webroot/rsrc/css/aphront/table-view.css b/webroot/rsrc/css/aphront/table-view.css index 0fa3eb2472..cb96070259 100644 --- a/webroot/rsrc/css/aphront/table-view.css +++ b/webroot/rsrc/css/aphront/table-view.css @@ -204,7 +204,7 @@ span.single-display-line-content { } .aphront-table-view tr.highlighted { - background: #fcf8e2; + background: #fdf9e4; } .aphront-table-view tr.alt-highlighted { diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css index c53f0b4b83..39003c89d4 100644 --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -37,6 +37,14 @@ div.phui-object-box.phui-object-box-flush { margin: 12px 0 0 0; } +.phui-object-box.phui-object-box-collapsed + .phui-header-shell + .phui-info-view { + margin: 0; + border-radius: 0; + border: 0; + border-bottom: 1px solid {$thinblueborder}; +} + .device-phone .phui-object-box { margin: 8px 8px 0 8px; }