From b592630d72596e8d283b26c0426bbbb002bfb523 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 30 Sep 2013 09:36:04 -0700 Subject: [PATCH] Provide more structure to PHUIObjectBoxView Summary: Three changes here. - Add `setActionList()`, and use that to set the action list. - Add `setPropertyList()`, and use that to set the property list. These will let us add some apropriate CSS so we can fix the border issue, and get rid of a bunch of goofy `.x + .y` selectors. - Replace `addContent()` with `appendChild()`. This is just a consistency thing; `AphrontView` already provides `appendChild()`, and `addContent()` did the same thing. Test Plan: - Viewed "All Config". - Viewed a countdown. - Viewed a revision (add comment, change list, table of contents, comment, local commits, open revisions affecting these files, update history). - Viewed Diffusion (browse, change, history, repository, lint). - Viewed Drydock (resource, lease). - Viewed Files. - Viewed Herald. - Viewed Legalpad. - Viewed macro (edit, edit audio, view). - Viewed Maniphest. - Viewed Applications. - Viewed Paste. - Viewed People. - Viewed Phulux. - Viewed Pholio. - Viewed Phame (blog, post). - Viewed Phortune (account, product). - Viewed Ponder (questions, answers, comments). - Viewed Releeph. - Viewed Projects. - Viewed Slowvote. NOTE: Images in Files aren't on a black background anymore -- I assume that's on purpose? NOTE: Some jankiness in Phortune, I'll clean that up when I get back to it. Not related to this diff. Reviewers: chad Reviewed By: chad CC: aran Differential Revision: https://secure.phabricator.com/D7174 --- .../PhabricatorConfigAllController.php | 2 +- .../PhabricatorCountdownViewController.php | 4 ++-- .../DifferentialRevisionViewController.php | 2 +- .../view/DifferentialAddCommentView.php | 6 ++--- .../view/DifferentialChangesetListView.php | 2 +- .../DifferentialDiffTableOfContentsView.php | 2 +- .../view/DifferentialLocalCommitsView.php | 5 ++--- .../view/DifferentialRevisionDetailView.php | 6 ++--- .../DifferentialRevisionUpdateHistoryView.php | 4 ++-- .../DiffusionBrowseDirectoryController.php | 6 ++--- .../DiffusionBrowseFileController.php | 4 ++-- .../DiffusionBrowseSearchController.php | 4 ++-- .../controller/DiffusionChangeController.php | 4 ++-- .../controller/DiffusionCommitController.php | 6 ++--- .../controller/DiffusionHistoryController.php | 4 ++-- .../controller/DiffusionLintController.php | 4 ++-- .../DiffusionRepositoryController.php | 4 ++-- .../controller/DrydockLeaseViewController.php | 4 ++-- .../DrydockResourceViewController.php | 4 ++-- .../PhabricatorFileInfoController.php | 6 ++--- .../controller/HeraldRuleViewController.php | 4 ++-- .../LegalpadDocumentViewController.php | 6 ++--- .../PhabricatorMacroEditController.php | 4 ++-- .../PhabricatorMacroViewController.php | 6 ++--- .../ManiphestTaskDetailController.php | 6 ++--- ...ricatorApplicationDetailViewController.php | 4 ++-- .../PhabricatorPasteViewController.php | 6 ++--- .../PhabricatorPeopleProfileController.php | 4 ++-- .../blog/PhameBlogViewController.php | 4 ++-- .../post/PhamePostViewController.php | 4 ++-- .../phlux/controller/PhluxViewController.php | 4 ++-- .../controller/PholioMockViewController.php | 6 ++--- .../PhortuneAccountViewController.php | 4 ++-- .../PhortuneProductViewController.php | 4 ++-- .../PonderQuestionViewController.php | 12 +++++----- .../ponder/view/PonderAddAnswerView.php | 2 +- .../PhabricatorProjectProfileController.php | 6 ++--- .../branch/ReleephBranchViewController.php | 5 ++--- .../project/ReleephProjectViewController.php | 5 ++--- .../PhabricatorSlowvotePollController.php | 6 ++--- src/view/phui/PHUIObjectBoxView.php | 22 +++++++++++++------ 41 files changed, 106 insertions(+), 101 deletions(-) diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php index 3161ee19aa..89b5a455ce 100644 --- a/src/applications/config/controller/PhabricatorConfigAllController.php +++ b/src/applications/config/controller/PhabricatorConfigAllController.php @@ -74,7 +74,7 @@ final class PhabricatorConfigAllController $object_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Current Settings')) - ->addContent($version_property_list); + ->setPropertyList($version_property_list); $phabricator_root = dirname(phutil_get_library_root('phabricator')); $version_path = $phabricator_root.'/conf/local/VERSION'; diff --git a/src/applications/countdown/controller/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php index a0abfdce5e..1bcffbb4f6 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownViewController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownViewController.php @@ -49,8 +49,8 @@ final class PhabricatorCountdownViewController $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $content = array( $crumbs, diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 3aaa5cce25..3b1eac014a 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -872,7 +872,7 @@ final class DifferentialRevisionViewController extends DifferentialController { return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Open Revisions Affecting These Files')) - ->addContent($view); + ->appendChild($view); } /** diff --git a/src/applications/differential/view/DifferentialAddCommentView.php b/src/applications/differential/view/DifferentialAddCommentView.php index 6e3bc8f14c..76f2bffcb7 100644 --- a/src/applications/differential/view/DifferentialAddCommentView.php +++ b/src/applications/differential/view/DifferentialAddCommentView.php @@ -195,9 +195,9 @@ final class DifferentialAddCommentView extends AphrontView { $comment_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($anchor) - ->addContent($warn) - ->addContent($form); + ->appendChild($anchor) + ->appendChild($warn) + ->appendChild($form); return array($comment_box, $preview); } diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php index e64cc31445..fc8784e2e2 100644 --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -210,7 +210,7 @@ final class DifferentialChangesetListView extends AphrontView { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($content); + ->appendChild($content); return $object_box; } diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php index e9e1ea21cb..1ba389839a 100644 --- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php +++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php @@ -239,7 +239,7 @@ final class DifferentialDiffTableOfContentsView extends AphrontView { return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Table of Contents')) - ->addContent($content); + ->appendChild($content); } private function renderRename($display_file, $other_file, $arrow) { diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php index 2c1d8b7f73..aec57bfe81 100644 --- a/src/applications/differential/view/DifferentialLocalCommitsView.php +++ b/src/applications/differential/view/DifferentialLocalCommitsView.php @@ -136,9 +136,8 @@ final class DifferentialLocalCommitsView extends AphrontView { phutil_implode_html("\n", $rows)); return id(new PHUIObjectBoxView()) - ->setHeaderText(pht('Local Commits')) - ->addContent($content); - + ->setHeaderText(pht('Local Commits')) + ->appendChild($content); } private static function formatCommit($commit) { diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php index b13d25ae9b..a529608dce 100644 --- a/src/applications/differential/view/DifferentialRevisionDetailView.php +++ b/src/applications/differential/view/DifferentialRevisionDetailView.php @@ -112,9 +112,9 @@ final class DifferentialRevisionDetailView extends AphrontView { $properties->setHasKeyboardShortcuts(true); $object_box = id(new PHUIObjectBoxView()) - ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setHeader($header) + ->setActionList($actions) + ->setPropertyList($properties); return $object_box; } diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php index afa52652a2..c10f985b1d 100644 --- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php +++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php @@ -219,8 +219,8 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView { pht('Show Diff')); return id(new PHUIObjectBoxView()) - ->setHeaderText(pht('Revision Update History')) - ->addContent($content); + ->setHeaderText(pht('Revision Update History')) + ->appendChild($content); } const STAR_NONE = 'none'; diff --git a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php index 00302be73c..35d702c1de 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php @@ -24,8 +24,8 @@ final class DiffusionBrowseDirectoryController $object_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderView($drequest)) - ->addContent($this->buildActionView($drequest)) - ->addContent($this->buildPropertyView($drequest)); + ->setActionList($this->buildActionView($drequest)) + ->setPropertyList($this->buildPropertyView($drequest)); $content[] = $object_box; $content[] = $this->renderSearchForm($collapsed = true); @@ -77,7 +77,7 @@ final class DiffusionBrowseDirectoryController $object_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('README')) - ->addContent($box); + ->appendChild($box); $content[] = $object_box; } diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index 06c10b3844..52dc63ab0b 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -100,8 +100,8 @@ final class DiffusionBrowseFileController extends DiffusionBrowseController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderView($drequest)) - ->addContent($this->buildActionView($drequest)) - ->addContent($this->buildPropertyView($drequest)); + ->setActionList($this->buildActionView($drequest)) + ->setPropertyList($this->buildPropertyView($drequest)); // Render the page. $content = array(); diff --git a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php index 36b9e16d64..0ca2636b85 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php @@ -7,8 +7,8 @@ final class DiffusionBrowseSearchController extends DiffusionBrowseController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($this->buildHeaderView($drequest)) - ->addContent($this->buildActionView($drequest)) - ->addContent($this->buildPropertyView($drequest)); + ->setActionList($this->buildActionView($drequest)) + ->setPropertyList($this->buildPropertyView($drequest)); $content = array(); diff --git a/src/applications/diffusion/controller/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php index 4724056362..b6fa8599f2 100644 --- a/src/applications/diffusion/controller/DiffusionChangeController.php +++ b/src/applications/diffusion/controller/DiffusionChangeController.php @@ -84,8 +84,8 @@ final class DiffusionChangeController extends DiffusionController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php index a56b6680c2..e88e321566 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -140,8 +140,8 @@ final class DiffusionCommitController extends DiffusionController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($headsup_view) - ->addContent($headsup_actions) - ->addContent($property_list); + ->setActionList($headsup_actions) + ->setPropertyList($property_list); $content[] = $object_box; } @@ -743,7 +743,7 @@ final class DiffusionCommitController extends DiffusionController { $comment_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($form); + ->appendChild($form); return phutil_tag( 'div', diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php index 4200b00694..d727c1fafc 100644 --- a/src/applications/diffusion/controller/DiffusionHistoryController.php +++ b/src/applications/diffusion/controller/DiffusionHistoryController.php @@ -74,8 +74,8 @@ final class DiffusionHistoryController extends DiffusionController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $crumbs = $this->buildCrumbs( array( diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php index 2e6d76d4d7..d7166047a5 100644 --- a/src/applications/diffusion/controller/DiffusionLintController.php +++ b/src/applications/diffusion/controller/DiffusionLintController.php @@ -168,8 +168,8 @@ final class DiffusionLintController extends DiffusionController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); } else { $object_box = null; } diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php index 7dcc3ce579..4b559c80ad 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -176,8 +176,8 @@ final class DiffusionRepositoryController extends DiffusionController { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($view); + ->setActionList($actions) + ->setPropertyList($view); } diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php index 050cb52d59..5dc6d6c361 100644 --- a/src/applications/drydock/controller/DrydockLeaseViewController.php +++ b/src/applications/drydock/controller/DrydockLeaseViewController.php @@ -47,8 +47,8 @@ final class DrydockLeaseViewController extends DrydockController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php index 573c4e8016..b9259786de 100644 --- a/src/applications/drydock/controller/DrydockResourceViewController.php +++ b/src/applications/drydock/controller/DrydockResourceViewController.php @@ -58,8 +58,8 @@ final class DrydockResourceViewController extends DrydockController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php index ddbae7babe..4abf378725 100644 --- a/src/applications/files/controller/PhabricatorFileInfoController.php +++ b/src/applications/files/controller/PhabricatorFileInfoController.php @@ -51,8 +51,8 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( @@ -113,7 +113,7 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { $comment_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($add_comment_header) - ->addContent($add_comment_form); + ->appendChild($add_comment_form); return array( $timeline, diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php index 26a055617c..b7b6f582bc 100644 --- a/src/applications/herald/controller/HeraldRuleViewController.php +++ b/src/applications/herald/controller/HeraldRuleViewController.php @@ -34,8 +34,8 @@ final class HeraldRuleViewController extends HeraldController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/legalpad/controller/LegalpadDocumentViewController.php b/src/applications/legalpad/controller/LegalpadDocumentViewController.php index 2168a4616b..ccfe5684af 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentViewController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentViewController.php @@ -88,8 +88,8 @@ final class LegalpadDocumentViewController extends LegalpadController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $content = array( $crumbs, @@ -216,7 +216,7 @@ final class LegalpadDocumentViewController extends LegalpadController { return id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($header) - ->addContent($form); + ->appendChild($form); } diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php index e2eb917096..1cdf858a8e 100644 --- a/src/applications/macro/controller/PhabricatorMacroEditController.php +++ b/src/applications/macro/controller/PhabricatorMacroEditController.php @@ -258,8 +258,8 @@ final class PhabricatorMacroEditController ->setValue(pht('Upload File'))); $upload = id(new PHUIObjectBoxView()) - ->setHeaderText(pht('Upload New File')) - ->setForm($upload_form); + ->setHeaderText(pht('Upload New File')) + ->setForm($upload_form); } $form_box = id(new PHUIObjectBoxView()) diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php index 11e1b2a32b..39fb032ed7 100644 --- a/src/applications/macro/controller/PhabricatorMacroViewController.php +++ b/src/applications/macro/controller/PhabricatorMacroViewController.php @@ -93,13 +93,13 @@ final class PhabricatorMacroViewController $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $comment_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($add_comment_header) - ->addContent($add_comment_form); + ->appendChild($add_comment_form); return $this->buildApplicationPage( array( diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index 62e533a098..ee00597a3f 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -365,13 +365,13 @@ final class ManiphestTaskDetailController extends ManiphestController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $comment_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($comment_header) - ->addContent($comment_form); + ->appendChild($comment_form); return $this->buildApplicationPage( array( diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php index e540093d41..c789aaa969 100644 --- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php +++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php @@ -56,8 +56,8 @@ final class PhabricatorApplicationDetailViewController $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php index 42bd6432b7..d270fb4e06 100644 --- a/src/applications/paste/controller/PhabricatorPasteViewController.php +++ b/src/applications/paste/controller/PhabricatorPasteViewController.php @@ -71,8 +71,8 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $source_code = $this->buildSourceCodeView( $paste, @@ -139,7 +139,7 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController { $comment_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($add_comment_header) - ->addContent($add_comment_form); + ->appendChild($add_comment_form); return $this->buildApplicationPage( array( diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php index c31e9cc851..c42523ab30 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php @@ -78,8 +78,8 @@ final class PhabricatorPeopleProfileController $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php index 0782bd4bd2..0e0abbd26e 100644 --- a/src/applications/phame/controller/blog/PhameBlogViewController.php +++ b/src/applications/phame/controller/blog/PhameBlogViewController.php @@ -65,8 +65,8 @@ final class PhameBlogViewController extends PhameController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $nav->appendChild( array( diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php index 5cf3d73ebf..f08bf0a36f 100644 --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -50,8 +50,8 @@ final class PhamePostViewController extends PhameController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); if ($post->isDraft()) { $object_box->appendChild( diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php index c8a87ca774..bc0c2882c4 100644 --- a/src/applications/phlux/controller/PhluxViewController.php +++ b/src/applications/phlux/controller/PhluxViewController.php @@ -76,8 +76,8 @@ final class PhluxViewController extends PhluxController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php index e671495d0e..b1794ea8a3 100644 --- a/src/applications/pholio/controller/PholioMockViewController.php +++ b/src/applications/pholio/controller/PholioMockViewController.php @@ -105,8 +105,8 @@ final class PholioMockViewController extends PholioController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $content = array( $crumbs, @@ -257,7 +257,7 @@ final class PholioMockViewController extends PholioController { return id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($header) - ->addContent($form); + ->appendChild($form); } } diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php index ee5c9fc706..b47c8ddbdb 100644 --- a/src/applications/phortune/controller/PhortuneAccountViewController.php +++ b/src/applications/phortune/controller/PhortuneAccountViewController.php @@ -62,8 +62,8 @@ final class PhortuneAccountViewController extends PhortuneController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php index ee004bbffc..4c05b336e7 100644 --- a/src/applications/phortune/controller/PhortuneProductViewController.php +++ b/src/applications/phortune/controller/PhortuneProductViewController.php @@ -83,8 +83,8 @@ final class PhortuneProductViewController extends PhortuneController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php index 4e66207c9a..8adf93718b 100644 --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -52,8 +52,8 @@ final class PonderQuestionViewController extends PonderController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); $crumbs->setActionList($actions); @@ -214,7 +214,7 @@ final class PonderQuestionViewController extends PonderController { $object_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeaderText(pht('Question Comment')) - ->addContent($add_comment); + ->appendChild($add_comment); return $this->wrapComments( count($xactions), @@ -269,8 +269,8 @@ final class PonderQuestionViewController extends PonderController { $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); $out[] = $object_box; $details = array(); @@ -291,7 +291,7 @@ final class PonderQuestionViewController extends PonderController { $comment_box = id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeaderText(pht('Answer Comment')) - ->addContent($form); + ->appendChild($form); $details[] = $comment_box; diff --git a/src/applications/ponder/view/PonderAddAnswerView.php b/src/applications/ponder/view/PonderAddAnswerView.php index 2d1128f39f..d9018630e6 100644 --- a/src/applications/ponder/view/PonderAddAnswerView.php +++ b/src/applications/ponder/view/PonderAddAnswerView.php @@ -45,6 +45,6 @@ final class PonderAddAnswerView extends AphrontView { return id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($form); + ->appendChild($form); } } diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php index aa6e60dc9a..a1e083eff5 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -74,8 +74,8 @@ final class PhabricatorProjectProfileController $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( @@ -182,7 +182,7 @@ final class PhabricatorProjectProfileController $content = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Open Tasks')) - ->addContent($list); + ->appendChild($list); return $content; } diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php index 6fd7b55d09..7406c263d0 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php @@ -170,9 +170,8 @@ final class ReleephBranchViewController extends ReleephProjectController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); - + ->setActionList($actions) + ->setPropertyList($properties); } } diff --git a/src/applications/releeph/controller/project/ReleephProjectViewController.php b/src/applications/releeph/controller/project/ReleephProjectViewController.php index c7e5721406..77603eebd4 100644 --- a/src/applications/releeph/controller/project/ReleephProjectViewController.php +++ b/src/applications/releeph/controller/project/ReleephProjectViewController.php @@ -238,9 +238,8 @@ final class ReleephProjectViewController extends ReleephProjectController return id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); - + ->setActionList($actions) + ->setPropertyList($properties); } } diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php index b4b7be8661..5ea49c7457 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php @@ -59,8 +59,8 @@ final class PhabricatorSlowvotePollController $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->addContent($actions) - ->addContent($properties); + ->setActionList($actions) + ->setPropertyList($properties); return $this->buildApplicationPage( array( @@ -181,7 +181,7 @@ final class PhabricatorSlowvotePollController return id(new PHUIObjectBoxView()) ->setFlush(true) ->setHeader($add_comment_header) - ->addContent($add_comment_form); + ->appendChild($add_comment_form); } diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php index 19d7289046..fabb91df43 100644 --- a/src/view/phui/PHUIObjectBoxView.php +++ b/src/view/phui/PHUIObjectBoxView.php @@ -6,9 +6,20 @@ final class PHUIObjectBoxView extends AphrontView { private $formError = null; private $form; private $validationException; - private $content = array(); private $header; private $flush; + private $propertyList; + private $actionList; + + public function setActionList(PhabricatorActionListView $action_list) { + $this->actionList = $action_list; + return $this; + } + + public function setPropertyList(PhabricatorPropertyListView $property_list) { + $this->propertyList = $property_list; + return $this; + } public function setHeaderText($text) { $this->headerText = $text; @@ -30,11 +41,6 @@ final class PHUIObjectBoxView extends AphrontView { return $this; } - public function addContent($content) { - $this->content[] = $content; - return $this; - } - public function setFlush($flush) { $this->flush = $flush; return $this; @@ -79,7 +85,9 @@ final class PHUIObjectBoxView extends AphrontView { $this->formError, $exception_errors, $this->form, - $this->content, + $this->actionList, + $this->propertyList, + $this->renderChildren(), )) ->setBorder(true) ->addMargin(PHUI::MARGIN_LARGE_TOP)