Skip to content

Commit f705c97

Browse files
author
epriestley
committed
render_tag -> tag: phabricator_render_form -> phabricator_form
Summary: Convert most phabricator_render_form callsites. In the case of the "headsup view", it converts it by deleting the element entirely (this is the very old Maniphest/Differential header which we no longer use). Test Plan: Poked around a bit. Reviewers: vrana Reviewed By: vrana CC: aran Maniphest Tasks: T2432 Differential Revision: https://secure.phabricator.com/D4726
1 parent 607fca9 commit f705c97

16 files changed

+98
-430
lines changed

scripts/celerity_mapper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
'aphront-pager-view-css',
8282
'phabricator-transaction-view-css',
8383
'aphront-tooltip-css',
84-
'aphront-headsup-view-css',
8584
'phabricator-flag-css',
8685
'aphront-error-view-css',
8786

@@ -115,7 +114,6 @@
115114
'differential-revision-add-comment-css',
116115
'differential-revision-comment-list-css',
117116
'phabricator-object-selector-css',
118-
'aphront-headsup-action-list-view-css',
119117
'phabricator-content-source-view-css',
120118
'differential-local-commits-view-css',
121119
'inline-comment-summary-css',

src/__celerity_resource_map__.php

Lines changed: 80 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -653,24 +653,6 @@
653653
),
654654
'disk' => '/rsrc/css/aphront/form-view.css',
655655
),
656-
'aphront-headsup-action-list-view-css' =>
657-
array(
658-
'uri' => '/res/1dce0ad7/rsrc/css/aphront/headsup-action-list-view.css',
659-
'type' => 'css',
660-
'requires' =>
661-
array(
662-
),
663-
'disk' => '/rsrc/css/aphront/headsup-action-list-view.css',
664-
),
665-
'aphront-headsup-view-css' =>
666-
array(
667-
'uri' => '/res/73874cd2/rsrc/css/aphront/headsup.css',
668-
'type' => 'css',
669-
'requires' =>
670-
array(
671-
),
672-
'disk' => '/rsrc/css/aphront/headsup.css',
673-
),
674656
'aphront-list-filter-view-css' =>
675657
array(
676658
'uri' => '/res/e783d6e1/rsrc/css/aphront/list-filter-view.css',
@@ -1166,7 +1148,7 @@
11661148
),
11671149
'javelin-behavior-dark-console' =>
11681150
array(
1169-
'uri' => '/res/c3e8a3d8/rsrc/js/application/core/behavior-dark-console.js',
1151+
'uri' => '/res/52444d4e/rsrc/js/application/core/behavior-dark-console.js',
11701152
'type' => 'js',
11711153
'requires' =>
11721154
array(
@@ -3375,7 +3357,7 @@
33753357
), array(
33763358
'packages' =>
33773359
array(
3378-
'0cb71c48' =>
3360+
'0e6165d0' =>
33793361
array(
33803362
'name' => 'core.pkg.css',
33813363
'symbols' =>
@@ -3399,27 +3381,26 @@
33993381
16 => 'aphront-pager-view-css',
34003382
17 => 'phabricator-transaction-view-css',
34013383
18 => 'aphront-tooltip-css',
3402-
19 => 'aphront-headsup-view-css',
3403-
20 => 'phabricator-flag-css',
3404-
21 => 'aphront-error-view-css',
3405-
22 => 'sprite-icon-css',
3406-
23 => 'sprite-gradient-css',
3407-
24 => 'sprite-menu-css',
3408-
25 => 'sprite-apps-large-css',
3409-
26 => 'phabricator-main-menu-view',
3410-
27 => 'phabricator-notification-css',
3411-
28 => 'phabricator-notification-menu-css',
3412-
29 => 'lightbox-attachment-css',
3413-
30 => 'phabricator-header-view-css',
3414-
31 => 'phabricator-form-view-css',
3415-
32 => 'phabricator-filetree-view-css',
3416-
33 => 'phabricator-nav-view-css',
3417-
34 => 'phabricator-side-menu-view-css',
3418-
35 => 'phabricator-crumbs-view-css',
3419-
36 => 'phabricator-object-item-list-view-css',
3420-
37 => 'global-drag-and-drop-css',
3384+
19 => 'phabricator-flag-css',
3385+
20 => 'aphront-error-view-css',
3386+
21 => 'sprite-icon-css',
3387+
22 => 'sprite-gradient-css',
3388+
23 => 'sprite-menu-css',
3389+
24 => 'sprite-apps-large-css',
3390+
25 => 'phabricator-main-menu-view',
3391+
26 => 'phabricator-notification-css',
3392+
27 => 'phabricator-notification-menu-css',
3393+
28 => 'lightbox-attachment-css',
3394+
29 => 'phabricator-header-view-css',
3395+
30 => 'phabricator-form-view-css',
3396+
31 => 'phabricator-filetree-view-css',
3397+
32 => 'phabricator-nav-view-css',
3398+
33 => 'phabricator-side-menu-view-css',
3399+
34 => 'phabricator-crumbs-view-css',
3400+
35 => 'phabricator-object-item-list-view-css',
3401+
36 => 'global-drag-and-drop-css',
34213402
),
3422-
'uri' => '/res/pkg/0cb71c48/core.pkg.css',
3403+
'uri' => '/res/pkg/0e6165d0/core.pkg.css',
34233404
'type' => 'css',
34243405
),
34253406
'ff199687' =>
@@ -3464,18 +3445,18 @@
34643445
'uri' => '/res/pkg/ff199687/core.pkg.js',
34653446
'type' => 'js',
34663447
),
3467-
'032118cf' =>
3448+
'74593df4' =>
34683449
array(
34693450
'name' => 'darkconsole.pkg.js',
34703451
'symbols' =>
34713452
array(
34723453
0 => 'javelin-behavior-dark-console',
34733454
1 => 'javelin-behavior-error-log',
34743455
),
3475-
'uri' => '/res/pkg/032118cf/darkconsole.pkg.js',
3456+
'uri' => '/res/pkg/74593df4/darkconsole.pkg.js',
34763457
'type' => 'js',
34773458
),
3478-
'ec01d039' =>
3459+
'8aaacd1b' =>
34793460
array(
34803461
'name' => 'differential.pkg.css',
34813462
'symbols' =>
@@ -3490,12 +3471,11 @@
34903471
7 => 'differential-revision-add-comment-css',
34913472
8 => 'differential-revision-comment-list-css',
34923473
9 => 'phabricator-object-selector-css',
3493-
10 => 'aphront-headsup-action-list-view-css',
3494-
11 => 'phabricator-content-source-view-css',
3495-
12 => 'differential-local-commits-view-css',
3496-
13 => 'inline-comment-summary-css',
3474+
10 => 'phabricator-content-source-view-css',
3475+
11 => 'differential-local-commits-view-css',
3476+
12 => 'inline-comment-summary-css',
34973477
),
3498-
'uri' => '/res/pkg/ec01d039/differential.pkg.css',
3478+
'uri' => '/res/pkg/8aaacd1b/differential.pkg.css',
34993479
'type' => 'css',
35003480
),
35013481
'9dae5f20' =>
@@ -3608,34 +3588,32 @@
36083588
'reverse' =>
36093589
array(
36103590
'aphront-attached-file-view-css' => 'e30a3fa8',
3611-
'aphront-crumbs-view-css' => '0cb71c48',
3612-
'aphront-dialog-view-css' => '0cb71c48',
3613-
'aphront-error-view-css' => '0cb71c48',
3614-
'aphront-form-view-css' => '0cb71c48',
3615-
'aphront-headsup-action-list-view-css' => 'ec01d039',
3616-
'aphront-headsup-view-css' => '0cb71c48',
3617-
'aphront-list-filter-view-css' => '0cb71c48',
3618-
'aphront-pager-view-css' => '0cb71c48',
3619-
'aphront-panel-view-css' => '0cb71c48',
3620-
'aphront-table-view-css' => '0cb71c48',
3621-
'aphront-tokenizer-control-css' => '0cb71c48',
3622-
'aphront-tooltip-css' => '0cb71c48',
3623-
'aphront-typeahead-control-css' => '0cb71c48',
3624-
'differential-changeset-view-css' => 'ec01d039',
3625-
'differential-core-view-css' => 'ec01d039',
3591+
'aphront-crumbs-view-css' => '0e6165d0',
3592+
'aphront-dialog-view-css' => '0e6165d0',
3593+
'aphront-error-view-css' => '0e6165d0',
3594+
'aphront-form-view-css' => '0e6165d0',
3595+
'aphront-list-filter-view-css' => '0e6165d0',
3596+
'aphront-pager-view-css' => '0e6165d0',
3597+
'aphront-panel-view-css' => '0e6165d0',
3598+
'aphront-table-view-css' => '0e6165d0',
3599+
'aphront-tokenizer-control-css' => '0e6165d0',
3600+
'aphront-tooltip-css' => '0e6165d0',
3601+
'aphront-typeahead-control-css' => '0e6165d0',
3602+
'differential-changeset-view-css' => '8aaacd1b',
3603+
'differential-core-view-css' => '8aaacd1b',
36263604
'differential-inline-comment-editor' => '9dae5f20',
3627-
'differential-local-commits-view-css' => 'ec01d039',
3628-
'differential-results-table-css' => 'ec01d039',
3629-
'differential-revision-add-comment-css' => 'ec01d039',
3630-
'differential-revision-comment-css' => 'ec01d039',
3631-
'differential-revision-comment-list-css' => 'ec01d039',
3632-
'differential-revision-history-css' => 'ec01d039',
3633-
'differential-revision-list-css' => 'ec01d039',
3634-
'differential-table-of-contents-css' => 'ec01d039',
3605+
'differential-local-commits-view-css' => '8aaacd1b',
3606+
'differential-results-table-css' => '8aaacd1b',
3607+
'differential-revision-add-comment-css' => '8aaacd1b',
3608+
'differential-revision-comment-css' => '8aaacd1b',
3609+
'differential-revision-comment-list-css' => '8aaacd1b',
3610+
'differential-revision-history-css' => '8aaacd1b',
3611+
'differential-revision-list-css' => '8aaacd1b',
3612+
'differential-table-of-contents-css' => '8aaacd1b',
36353613
'diffusion-commit-view-css' => 'c8ce2d88',
36363614
'diffusion-icons-css' => 'c8ce2d88',
3637-
'global-drag-and-drop-css' => '0cb71c48',
3638-
'inline-comment-summary-css' => 'ec01d039',
3615+
'global-drag-and-drop-css' => '0e6165d0',
3616+
'inline-comment-summary-css' => '8aaacd1b',
36393617
'javelin-aphlict' => 'ff199687',
36403618
'javelin-behavior' => '1c6f020b',
36413619
'javelin-behavior-aphlict-dropdown' => 'ff199687',
@@ -3645,7 +3623,7 @@
36453623
'javelin-behavior-aphront-drag-and-drop-textarea' => '9dae5f20',
36463624
'javelin-behavior-aphront-form-disable-on-submit' => 'ff199687',
36473625
'javelin-behavior-audit-preview' => 'f96657b8',
3648-
'javelin-behavior-dark-console' => '032118cf',
3626+
'javelin-behavior-dark-console' => '74593df4',
36493627
'javelin-behavior-device' => 'ff199687',
36503628
'javelin-behavior-differential-accept-with-errors' => '9dae5f20',
36513629
'javelin-behavior-differential-add-reviewers-and-ccs' => '9dae5f20',
@@ -3661,7 +3639,7 @@
36613639
'javelin-behavior-differential-user-select' => '9dae5f20',
36623640
'javelin-behavior-diffusion-commit-graph' => 'f96657b8',
36633641
'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8',
3664-
'javelin-behavior-error-log' => '032118cf',
3642+
'javelin-behavior-error-log' => '74593df4',
36653643
'javelin-behavior-global-drag-and-drop' => 'ff199687',
36663644
'javelin-behavior-konami' => 'ff199687',
36673645
'javelin-behavior-lightbox-attachments' => 'ff199687',
@@ -3703,48 +3681,48 @@
37033681
'javelin-util' => '1c6f020b',
37043682
'javelin-vector' => '1c6f020b',
37053683
'javelin-workflow' => '1c6f020b',
3706-
'lightbox-attachment-css' => '0cb71c48',
3684+
'lightbox-attachment-css' => '0e6165d0',
37073685
'maniphest-task-summary-css' => 'e30a3fa8',
37083686
'maniphest-transaction-detail-css' => 'e30a3fa8',
37093687
'phabricator-busy' => 'ff199687',
3710-
'phabricator-content-source-view-css' => 'ec01d039',
3711-
'phabricator-core-buttons-css' => '0cb71c48',
3712-
'phabricator-core-css' => '0cb71c48',
3713-
'phabricator-crumbs-view-css' => '0cb71c48',
3714-
'phabricator-directory-css' => '0cb71c48',
3688+
'phabricator-content-source-view-css' => '8aaacd1b',
3689+
'phabricator-core-buttons-css' => '0e6165d0',
3690+
'phabricator-core-css' => '0e6165d0',
3691+
'phabricator-crumbs-view-css' => '0e6165d0',
3692+
'phabricator-directory-css' => '0e6165d0',
37153693
'phabricator-drag-and-drop-file-upload' => '9dae5f20',
37163694
'phabricator-dropdown-menu' => 'ff199687',
37173695
'phabricator-file-upload' => 'ff199687',
3718-
'phabricator-filetree-view-css' => '0cb71c48',
3719-
'phabricator-flag-css' => '0cb71c48',
3720-
'phabricator-form-view-css' => '0cb71c48',
3721-
'phabricator-header-view-css' => '0cb71c48',
3722-
'phabricator-jump-nav' => '0cb71c48',
3696+
'phabricator-filetree-view-css' => '0e6165d0',
3697+
'phabricator-flag-css' => '0e6165d0',
3698+
'phabricator-form-view-css' => '0e6165d0',
3699+
'phabricator-header-view-css' => '0e6165d0',
3700+
'phabricator-jump-nav' => '0e6165d0',
37233701
'phabricator-keyboard-shortcut' => 'ff199687',
37243702
'phabricator-keyboard-shortcut-manager' => 'ff199687',
3725-
'phabricator-main-menu-view' => '0cb71c48',
3703+
'phabricator-main-menu-view' => '0e6165d0',
37263704
'phabricator-menu-item' => 'ff199687',
3727-
'phabricator-nav-view-css' => '0cb71c48',
3705+
'phabricator-nav-view-css' => '0e6165d0',
37283706
'phabricator-notification' => 'ff199687',
3729-
'phabricator-notification-css' => '0cb71c48',
3730-
'phabricator-notification-menu-css' => '0cb71c48',
3731-
'phabricator-object-item-list-view-css' => '0cb71c48',
3732-
'phabricator-object-selector-css' => 'ec01d039',
3707+
'phabricator-notification-css' => '0e6165d0',
3708+
'phabricator-notification-menu-css' => '0e6165d0',
3709+
'phabricator-object-item-list-view-css' => '0e6165d0',
3710+
'phabricator-object-selector-css' => '8aaacd1b',
37333711
'phabricator-paste-file-upload' => 'ff199687',
37343712
'phabricator-prefab' => 'ff199687',
37353713
'phabricator-project-tag-css' => 'e30a3fa8',
3736-
'phabricator-remarkup-css' => '0cb71c48',
3714+
'phabricator-remarkup-css' => '0e6165d0',
37373715
'phabricator-shaped-request' => '9dae5f20',
3738-
'phabricator-side-menu-view-css' => '0cb71c48',
3739-
'phabricator-standard-page-view' => '0cb71c48',
3716+
'phabricator-side-menu-view-css' => '0e6165d0',
3717+
'phabricator-standard-page-view' => '0e6165d0',
37403718
'phabricator-textareautils' => 'ff199687',
37413719
'phabricator-tooltip' => 'ff199687',
3742-
'phabricator-transaction-view-css' => '0cb71c48',
3743-
'phabricator-zindex-css' => '0cb71c48',
3744-
'sprite-apps-large-css' => '0cb71c48',
3745-
'sprite-gradient-css' => '0cb71c48',
3746-
'sprite-icon-css' => '0cb71c48',
3747-
'sprite-menu-css' => '0cb71c48',
3748-
'syntax-highlighting-css' => '0cb71c48',
3720+
'phabricator-transaction-view-css' => '0e6165d0',
3721+
'phabricator-zindex-css' => '0e6165d0',
3722+
'sprite-apps-large-css' => '0e6165d0',
3723+
'sprite-gradient-css' => '0e6165d0',
3724+
'sprite-icon-css' => '0e6165d0',
3725+
'sprite-menu-css' => '0e6165d0',
3726+
'syntax-highlighting-css' => '0e6165d0',
37493727
),
37503728
));

src/__phutil_library_map__.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@
5555
'AphrontHTMLResponse' => 'aphront/response/AphrontHTMLResponse.php',
5656
'AphrontHTTPSink' => 'aphront/sink/AphrontHTTPSink.php',
5757
'AphrontHTTPSinkTestCase' => 'aphront/sink/__tests__/AphrontHTTPSinkTestCase.php',
58-
'AphrontHeadsupActionListView' => 'view/layout/headsup/AphrontHeadsupActionListView.php',
59-
'AphrontHeadsupActionView' => 'view/layout/headsup/AphrontHeadsupActionView.php',
60-
'AphrontHeadsupView' => 'view/layout/headsup/AphrontHeadsupView.php',
6158
'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
6259
'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php',
6360
'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php',
@@ -1544,9 +1541,6 @@
15441541
'AphrontFormView' => 'AphrontView',
15451542
'AphrontHTMLResponse' => 'AphrontResponse',
15461543
'AphrontHTTPSinkTestCase' => 'PhabricatorTestCase',
1547-
'AphrontHeadsupActionListView' => 'AphrontView',
1548-
'AphrontHeadsupActionView' => 'AphrontView',
1549-
'AphrontHeadsupView' => 'AphrontView',
15501544
'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
15511545
'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink',
15521546
'AphrontJSONResponse' => 'AphrontResponse',

src/applications/auth/controller/PhabricatorMustVerifyEmailController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function processRequest() {
5151
'</p>');
5252
$error_view->appendChild(
5353
'<div class="aphront-failure-continue">'.
54-
phabricator_render_form(
54+
phabricator_form(
5555
$user,
5656
array(
5757
'action' => '/login/mustverify/',

src/applications/differential/controller/DifferentialDiffViewController.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,10 @@ public function processRequest() {
113113
}
114114
}
115115

116-
$action_panel = new AphrontHeadsupView();
117-
$action_panel->setProperties($dict);
118-
$action_panel->setHeader(pht('Diff Properties'));
116+
$property_view = new PhabricatorPropertyListView();
117+
foreach ($dict as $key => $value) {
118+
$property_view->addProperty($key, $value);
119+
}
119120

120121
$changesets = $diff->loadChangesets();
121122
$changesets = msort($changesets, 'getSortKey');
@@ -144,7 +145,7 @@ public function processRequest() {
144145
->appendChild(
145146
array(
146147
$top_panel->render(),
147-
$action_panel->render(),
148+
$property_view,
148149
$table_of_contents->render(),
149150
$details->render(),
150151
)),

src/applications/directory/controller/PhabricatorDirectoryMainController.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,17 @@ private function buildJumpPanel($query=null) {
322322
$panel = new AphrontPanelView();
323323
$panel->setHeader('Jump Nav');
324324
$panel->appendChild(
325-
phabricator_render_form(
325+
phabricator_form(
326326
$user,
327327
array(
328328
'action' => '/jump/',
329329
'method' => 'POST',
330330
'class' => 'phabricator-jump-nav-form',
331331
),
332-
$jump_input.
333-
$jump_caption));
332+
array(
333+
$jump_input,
334+
$jump_caption,
335+
)));
334336

335337
return $panel;
336338
}

src/applications/flag/view/PhabricatorFlagListView.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function render() {
2929
$flag->getHandle()->renderLink(),
3030
phutil_escape_html($flag->getNote()),
3131
phabricator_datetime($flag->getDateCreated(), $user),
32-
phabricator_render_form(
32+
phabricator_form(
3333
$user,
3434
array(
3535
'method' => 'POST',
@@ -42,7 +42,7 @@ public function render() {
4242
'class' => 'small grey',
4343
),
4444
'Edit Flag')),
45-
phabricator_render_form(
45+
phabricator_form(
4646
$user,
4747
array(
4848
'method' => 'POST',

0 commit comments

Comments
 (0)