Skip to content

Commit 97c690f

Browse files
committed
PHUIPropertyListView
Summary: This builds out and implements PHUIPropertyListView (container) and PHUIPropertyListItemView (section) as well as adding tabs. Test Plan: Tested each page I edited with the exception of Releeph and Phortune, though those changes look ok to me diff wise. Updated examples page with tabs. Reviewers: epriestley, btrahan Reviewed By: epriestley CC: Korvin, epriestley, aran Differential Revision: https://secure.phabricator.com/D7283
1 parent f8d963a commit 97c690f

File tree

54 files changed

+581
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+581
-417
lines changed

scripts/celerity_mapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112

113113
'phabricator-application-launch-view-css',
114114
'phabricator-action-list-view-css',
115-
'phabricator-property-list-view-css',
115+
'phui-property-list-view-css',
116116
'phabricator-tag-view-css',
117117
'phui-list-view-css',
118118
),

src/__celerity_resource_map__.php

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@
11491149
),
11501150
'diviner-shared-css' =>
11511151
array(
1152-
'uri' => '/res/cba9c99e/rsrc/css/diviner/diviner-shared.css',
1152+
'uri' => '/res/2e831eea/rsrc/css/diviner/diviner-shared.css',
11531153
'type' => 'css',
11541154
'requires' =>
11551155
array(
@@ -3387,15 +3387,6 @@
33873387
),
33883388
'disk' => '/rsrc/css/application/projects/project-tag.css',
33893389
),
3390-
'phabricator-property-list-view-css' =>
3391-
array(
3392-
'uri' => '/res/31912bb1/rsrc/css/layout/phabricator-property-list-view.css',
3393-
'type' => 'css',
3394-
'requires' =>
3395-
array(
3396-
),
3397-
'disk' => '/rsrc/css/layout/phabricator-property-list-view.css',
3398-
),
33993390
'phabricator-remarkup-css' =>
34003391
array(
34013392
'uri' => '/res/7e8988dd/rsrc/css/core/remarkup.css',
@@ -3760,7 +3751,7 @@
37603751
),
37613752
'phui-document-view-css' =>
37623753
array(
3763-
'uri' => '/res/40e39942/rsrc/css/phui/phui-document.css',
3754+
'uri' => '/res/f744b3b2/rsrc/css/phui/phui-document.css',
37643755
'type' => 'css',
37653756
'requires' =>
37663757
array(
@@ -3796,7 +3787,7 @@
37963787
),
37973788
'phui-header-view-css' =>
37983789
array(
3799-
'uri' => '/res/94208bd6/rsrc/css/phui/phui-header-view.css',
3790+
'uri' => '/res/d4cec460/rsrc/css/phui/phui-header-view.css',
38003791
'type' => 'css',
38013792
'requires' =>
38023793
array(
@@ -3848,6 +3839,15 @@
38483839
),
38493840
'disk' => '/rsrc/css/phui/phui-pinboard-view.css',
38503841
),
3842+
'phui-property-list-view-css' =>
3843+
array(
3844+
'uri' => '/res/6c937c64/rsrc/css/phui/phui-property-list-view.css',
3845+
'type' => 'css',
3846+
'requires' =>
3847+
array(
3848+
),
3849+
'disk' => '/rsrc/css/phui/phui-property-list-view.css',
3850+
),
38513851
'phui-remarkup-preview-css' =>
38523852
array(
38533853
'uri' => '/res/50fa4178/rsrc/css/phui/phui-remarkup-preview.css',
@@ -4220,7 +4220,7 @@
42204220
), array(
42214221
'packages' =>
42224222
array(
4223-
'7cd2ded3' =>
4223+
'09637a26' =>
42244224
array(
42254225
'name' => 'core.pkg.css',
42264226
'symbols' =>
@@ -4265,11 +4265,11 @@
42654265
37 => 'phui-icon-view-css',
42664266
38 => 'phabricator-application-launch-view-css',
42674267
39 => 'phabricator-action-list-view-css',
4268-
40 => 'phabricator-property-list-view-css',
4268+
40 => 'phui-property-list-view-css',
42694269
41 => 'phabricator-tag-view-css',
42704270
42 => 'phui-list-view-css',
42714271
),
4272-
'uri' => '/res/pkg/7cd2ded3/core.pkg.css',
4272+
'uri' => '/res/pkg/09637a26/core.pkg.css',
42734273
'type' => 'css',
42744274
),
42754275
'64eeda79' =>
@@ -4461,15 +4461,15 @@
44614461
),
44624462
'reverse' =>
44634463
array(
4464-
'aphront-dialog-view-css' => '7cd2ded3',
4465-
'aphront-error-view-css' => '7cd2ded3',
4466-
'aphront-list-filter-view-css' => '7cd2ded3',
4467-
'aphront-pager-view-css' => '7cd2ded3',
4468-
'aphront-panel-view-css' => '7cd2ded3',
4469-
'aphront-table-view-css' => '7cd2ded3',
4470-
'aphront-tokenizer-control-css' => '7cd2ded3',
4471-
'aphront-tooltip-css' => '7cd2ded3',
4472-
'aphront-typeahead-control-css' => '7cd2ded3',
4464+
'aphront-dialog-view-css' => '09637a26',
4465+
'aphront-error-view-css' => '09637a26',
4466+
'aphront-list-filter-view-css' => '09637a26',
4467+
'aphront-pager-view-css' => '09637a26',
4468+
'aphront-panel-view-css' => '09637a26',
4469+
'aphront-table-view-css' => '09637a26',
4470+
'aphront-tokenizer-control-css' => '09637a26',
4471+
'aphront-tooltip-css' => '09637a26',
4472+
'aphront-typeahead-control-css' => '09637a26',
44734473
'differential-changeset-view-css' => '4dc2311c',
44744474
'differential-core-view-css' => '4dc2311c',
44754475
'differential-inline-comment-editor' => '5e9e5c4e',
@@ -4483,7 +4483,7 @@
44834483
'differential-table-of-contents-css' => '4dc2311c',
44844484
'diffusion-commit-view-css' => 'c8ce2d88',
44854485
'diffusion-icons-css' => 'c8ce2d88',
4486-
'global-drag-and-drop-css' => '7cd2ded3',
4486+
'global-drag-and-drop-css' => '09637a26',
44874487
'inline-comment-summary-css' => '4dc2311c',
44884488
'javelin-aphlict' => '64eeda79',
44894489
'javelin-behavior' => '9564fa17',
@@ -4558,56 +4558,56 @@
45584558
'javelin-util' => '9564fa17',
45594559
'javelin-vector' => '9564fa17',
45604560
'javelin-workflow' => '9564fa17',
4561-
'lightbox-attachment-css' => '7cd2ded3',
4561+
'lightbox-attachment-css' => '09637a26',
45624562
'maniphest-task-summary-css' => '49898640',
4563-
'phabricator-action-list-view-css' => '7cd2ded3',
4564-
'phabricator-application-launch-view-css' => '7cd2ded3',
4563+
'phabricator-action-list-view-css' => '09637a26',
4564+
'phabricator-application-launch-view-css' => '09637a26',
45654565
'phabricator-busy' => '64eeda79',
45664566
'phabricator-content-source-view-css' => '4dc2311c',
4567-
'phabricator-core-css' => '7cd2ded3',
4568-
'phabricator-crumbs-view-css' => '7cd2ded3',
4567+
'phabricator-core-css' => '09637a26',
4568+
'phabricator-crumbs-view-css' => '09637a26',
45694569
'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
45704570
'phabricator-dropdown-menu' => '64eeda79',
45714571
'phabricator-file-upload' => '64eeda79',
4572-
'phabricator-filetree-view-css' => '7cd2ded3',
4573-
'phabricator-flag-css' => '7cd2ded3',
4572+
'phabricator-filetree-view-css' => '09637a26',
4573+
'phabricator-flag-css' => '09637a26',
45744574
'phabricator-hovercard' => '64eeda79',
4575-
'phabricator-jump-nav' => '7cd2ded3',
4575+
'phabricator-jump-nav' => '09637a26',
45764576
'phabricator-keyboard-shortcut' => '64eeda79',
45774577
'phabricator-keyboard-shortcut-manager' => '64eeda79',
4578-
'phabricator-main-menu-view' => '7cd2ded3',
4578+
'phabricator-main-menu-view' => '09637a26',
45794579
'phabricator-menu-item' => '64eeda79',
4580-
'phabricator-nav-view-css' => '7cd2ded3',
4580+
'phabricator-nav-view-css' => '09637a26',
45814581
'phabricator-notification' => '64eeda79',
4582-
'phabricator-notification-css' => '7cd2ded3',
4583-
'phabricator-notification-menu-css' => '7cd2ded3',
4582+
'phabricator-notification-css' => '09637a26',
4583+
'phabricator-notification-menu-css' => '09637a26',
45844584
'phabricator-object-selector-css' => '4dc2311c',
45854585
'phabricator-phtize' => '64eeda79',
45864586
'phabricator-prefab' => '64eeda79',
45874587
'phabricator-project-tag-css' => '49898640',
4588-
'phabricator-property-list-view-css' => '7cd2ded3',
4589-
'phabricator-remarkup-css' => '7cd2ded3',
4588+
'phabricator-remarkup-css' => '09637a26',
45904589
'phabricator-shaped-request' => '5e9e5c4e',
4591-
'phabricator-side-menu-view-css' => '7cd2ded3',
4592-
'phabricator-standard-page-view' => '7cd2ded3',
4593-
'phabricator-tag-view-css' => '7cd2ded3',
4590+
'phabricator-side-menu-view-css' => '09637a26',
4591+
'phabricator-standard-page-view' => '09637a26',
4592+
'phabricator-tag-view-css' => '09637a26',
45944593
'phabricator-textareautils' => '64eeda79',
45954594
'phabricator-tooltip' => '64eeda79',
4596-
'phabricator-transaction-view-css' => '7cd2ded3',
4597-
'phabricator-zindex-css' => '7cd2ded3',
4598-
'phui-button-css' => '7cd2ded3',
4599-
'phui-form-css' => '7cd2ded3',
4600-
'phui-form-view-css' => '7cd2ded3',
4601-
'phui-header-view-css' => '7cd2ded3',
4602-
'phui-icon-view-css' => '7cd2ded3',
4603-
'phui-list-view-css' => '7cd2ded3',
4604-
'phui-object-item-list-view-css' => '7cd2ded3',
4605-
'phui-spacing-css' => '7cd2ded3',
4606-
'sprite-apps-large-css' => '7cd2ded3',
4607-
'sprite-gradient-css' => '7cd2ded3',
4608-
'sprite-icons-css' => '7cd2ded3',
4609-
'sprite-menu-css' => '7cd2ded3',
4610-
'sprite-status-css' => '7cd2ded3',
4611-
'syntax-highlighting-css' => '7cd2ded3',
4595+
'phabricator-transaction-view-css' => '09637a26',
4596+
'phabricator-zindex-css' => '09637a26',
4597+
'phui-button-css' => '09637a26',
4598+
'phui-form-css' => '09637a26',
4599+
'phui-form-view-css' => '09637a26',
4600+
'phui-header-view-css' => '09637a26',
4601+
'phui-icon-view-css' => '09637a26',
4602+
'phui-list-view-css' => '09637a26',
4603+
'phui-object-item-list-view-css' => '09637a26',
4604+
'phui-property-list-view-css' => '09637a26',
4605+
'phui-spacing-css' => '09637a26',
4606+
'sprite-apps-large-css' => '09637a26',
4607+
'sprite-gradient-css' => '09637a26',
4608+
'sprite-icons-css' => '09637a26',
4609+
'sprite-menu-css' => '09637a26',
4610+
'sprite-status-css' => '09637a26',
4611+
'syntax-highlighting-css' => '09637a26',
46124612
),
46134613
));

src/__phutil_library_map__.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,9 @@
788788
'PHUIPagedFormView' => 'view/form/PHUIPagedFormView.php',
789789
'PHUIPinboardItemView' => 'view/phui/PHUIPinboardItemView.php',
790790
'PHUIPinboardView' => 'view/phui/PHUIPinboardView.php',
791+
'PHUIPropertyGroupView' => 'view/phui/PHUIPropertyGroupView.php',
792+
'PHUIPropertyListExample' => 'applications/uiexample/examples/PHUIPropertyListExample.php',
793+
'PHUIPropertyListView' => 'view/phui/PHUIPropertyListView.php',
791794
'PHUIRemarkupPreviewPanel' => 'view/phui/PHUIRemarkupPreviewPanel.php',
792795
'PHUIStatusItemView' => 'view/phui/PHUIStatusItemView.php',
793796
'PHUIStatusListView' => 'view/phui/PHUIStatusListView.php',
@@ -1524,8 +1527,6 @@
15241527
'PhabricatorProjectTransaction' => 'applications/project/storage/PhabricatorProjectTransaction.php',
15251528
'PhabricatorProjectTransactionType' => 'applications/project/constants/PhabricatorProjectTransactionType.php',
15261529
'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
1527-
'PhabricatorPropertyListExample' => 'applications/uiexample/examples/PhabricatorPropertyListExample.php',
1528-
'PhabricatorPropertyListView' => 'view/layout/PhabricatorPropertyListView.php',
15291530
'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
15301531
'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
15311532
'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php',
@@ -2926,6 +2927,9 @@
29262927
'PHUIPagedFormView' => 'AphrontTagView',
29272928
'PHUIPinboardItemView' => 'AphrontView',
29282929
'PHUIPinboardView' => 'AphrontView',
2930+
'PHUIPropertyGroupView' => 'AphrontTagView',
2931+
'PHUIPropertyListExample' => 'PhabricatorUIExample',
2932+
'PHUIPropertyListView' => 'AphrontView',
29292933
'PHUIRemarkupPreviewPanel' => 'AphrontTagView',
29302934
'PHUIStatusItemView' => 'AphrontTagView',
29312935
'PHUIStatusListView' => 'AphrontTagView',
@@ -3726,8 +3730,6 @@
37263730
'PhabricatorProjectTransaction' => 'PhabricatorProjectDAO',
37273731
'PhabricatorProjectTransactionType' => 'PhabricatorProjectConstants',
37283732
'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
3729-
'PhabricatorPropertyListExample' => 'PhabricatorUIExample',
3730-
'PhabricatorPropertyListView' => 'AphrontView',
37313733
'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
37323734
'PhabricatorRedirectController' => 'PhabricatorController',
37333735
'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',

src/applications/config/controller/PhabricatorConfigAllController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ public function processRequest() {
6666

6767
$versions = $this->loadVersions();
6868

69-
$version_property_list = id(new PhabricatorPropertyListView());
69+
$version_property_list = id(new PHUIPropertyListView());
7070
foreach ($versions as $version) {
7171
list($name, $hash) = $version;
7272
$version_property_list->addProperty($name, $hash);
7373
}
7474

7575
$object_box = id(new PHUIObjectBoxView())
7676
->setHeaderText(pht('Current Settings'))
77-
->setPropertyList($version_property_list);
77+
->addPropertyList($version_property_list);
7878

7979
$phabricator_root = dirname(phutil_get_library_root('phabricator'));
8080
$version_path = $phabricator_root.'/conf/local/VERSION';

src/applications/countdown/controller/PhabricatorCountdownViewController.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ public function processRequest() {
4545
->setHeader($title);
4646

4747
$actions = $this->buildActionListView($countdown);
48-
$properties = $this->buildPropertyListView($countdown);
48+
$properties = $this->buildPropertyListView($countdown, $actions);
4949

5050
$object_box = id(new PHUIObjectBoxView())
5151
->setHeader($header)
52-
->setActionList($actions)
53-
->setPropertyList($properties);
52+
->addPropertyList($properties);
5453

5554
$content = array(
5655
$crumbs,
@@ -99,14 +98,18 @@ private function buildActionListView(PhabricatorCountdown $countdown) {
9998
return $view;
10099
}
101100

102-
private function buildPropertyListView(PhabricatorCountdown $countdown) {
101+
private function buildPropertyListView(
102+
PhabricatorCountdown $countdown,
103+
PhabricatorActionListView $actions) {
104+
103105
$request = $this->getRequest();
104106
$viewer = $request->getUser();
105107

106108
$this->loadHandles(array($countdown->getAuthorPHID()));
107109

108-
$view = id(new PhabricatorPropertyListView())
109-
->setUser($viewer);
110+
$view = id(new PHUIPropertyListView())
111+
->setUser($viewer)
112+
->setActionList($actions);
110113

111114
$view->addProperty(
112115
pht('Author'),

src/applications/daemon/controller/PhabricatorDaemonLogViewController.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@ public function processRequest() {
7272
$event_panel->setNoBackground();
7373
$event_panel->appendChild($event_view);
7474

75+
$object_box = id(new PHUIObjectBoxView())
76+
->setHeader($header)
77+
->addPropertyList($properties);
78+
7579
return $this->buildApplicationPage(
7680
array(
7781
$crumbs,
78-
$header,
79-
$properties,
82+
$object_box,
8083
$event_panel,
8184
),
8285
array(
@@ -88,7 +91,7 @@ private function buildPropertyListView(PhabricatorDaemonLog $daemon) {
8891
$request = $this->getRequest();
8992
$viewer = $request->getUser();
9093

91-
$view = id(new PhabricatorPropertyListView())
94+
$view = id(new PHUIPropertyListView())
9295
->setUser($viewer);
9396

9497
$id = $daemon->getID();

src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,20 @@ public function processRequest() {
3838
$task->getID(),
3939
$task->getTaskClass()));
4040

41-
$actions = $this->buildActionListView($task);
42-
$properties = $this->buildPropertyListView($task);
41+
$actions = $this->buildActionListView($task);
42+
$properties = $this->buildPropertyListView($task, $actions);
4343

4444
$retry_head = id(new PHUIHeaderView())
4545
->setHeader(pht('Retries'));
4646

4747
$retry_info = $this->buildRetryListView($task);
4848

49+
$object_box = id(new PHUIObjectBoxView())
50+
->setHeader($header)
51+
->addPropertyList($properties);
52+
4953
$content = array(
50-
$header,
51-
$actions,
52-
$properties,
54+
$object_box,
5355
$retry_head,
5456
$retry_info,
5557
);
@@ -114,8 +116,12 @@ private function buildActionListView(PhabricatorWorkerTask $task) {
114116
return $view;
115117
}
116118

117-
private function buildPropertyListView(PhabricatorWorkerTask $task) {
118-
$view = new PhabricatorPropertyListView();
119+
private function buildPropertyListView(
120+
PhabricatorWorkerTask $task,
121+
PhabricatorActionListView $actions) {
122+
123+
$view = new PHUIPropertyListView();
124+
$view->setActionList($actions);
119125

120126
if ($task->isArchived()) {
121127
switch ($task->getResult()) {
@@ -197,7 +203,7 @@ private function buildPropertyListView(PhabricatorWorkerTask $task) {
197203
}
198204

199205
private function buildRetryListView(PhabricatorWorkerTask $task) {
200-
$view = new PhabricatorPropertyListView();
206+
$view = new PHUIPropertyListView();
201207

202208
$data = id(new PhabricatorWorkerTaskData())->load($task->getDataID());
203209
$task->setData($data->getData());

src/applications/differential/controller/DifferentialDiffViewController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function processRequest() {
117117
$property_head = id(new PHUIHeaderView())
118118
->setHeader(pht('Properties'));
119119

120-
$property_view = new PhabricatorPropertyListView();
120+
$property_view = new PHUIPropertyListView();
121121
foreach ($dict as $key => $value) {
122122
$property_view->addProperty($key, $value);
123123
}

0 commit comments

Comments
 (0)