recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move PHUIFormBoxView to PHUIObjectBoxView

Summary: I'd like to reuse this for other content areas, renaming for now. This might be weird to keep setForm, but I can fix that later if we need.

Test Plan: reload a few forms in maniphest, projects, differential

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, aran

Differential Revision: https://secure.phabricator.com/D7120

Chad Little 9be7a948 225a38c7

+119 -112
+44 -44
src/__celerity_resource_map__.php
··· 3756 3756 ), 3757 3757 'phui-form-view-css' => 3758 3758 array( 3759 - 'uri' => '/res/5786628c/rsrc/css/phui/phui-form-view.css', 3759 + 'uri' => '/res/d87bdbeb/rsrc/css/phui/phui-form-view.css', 3760 3760 'type' => 'css', 3761 3761 'requires' => 3762 3762 array( ··· 4162 4162 ), array( 4163 4163 'packages' => 4164 4164 array( 4165 - '03a782d0' => 4165 + '15affac5' => 4166 4166 array( 4167 4167 'name' => 'core.pkg.css', 4168 4168 'symbols' => ··· 4209 4209 39 => 'phabricator-property-list-view-css', 4210 4210 40 => 'phabricator-tag-view-css', 4211 4211 ), 4212 - 'uri' => '/res/pkg/03a782d0/core.pkg.css', 4212 + 'uri' => '/res/pkg/15affac5/core.pkg.css', 4213 4213 'type' => 'css', 4214 4214 ), 4215 4215 '8977e356' => ··· 4399 4399 ), 4400 4400 'reverse' => 4401 4401 array( 4402 - 'aphront-dialog-view-css' => '03a782d0', 4403 - 'aphront-error-view-css' => '03a782d0', 4404 - 'aphront-list-filter-view-css' => '03a782d0', 4405 - 'aphront-pager-view-css' => '03a782d0', 4406 - 'aphront-panel-view-css' => '03a782d0', 4407 - 'aphront-table-view-css' => '03a782d0', 4408 - 'aphront-tokenizer-control-css' => '03a782d0', 4409 - 'aphront-tooltip-css' => '03a782d0', 4410 - 'aphront-typeahead-control-css' => '03a782d0', 4402 + 'aphront-dialog-view-css' => '15affac5', 4403 + 'aphront-error-view-css' => '15affac5', 4404 + 'aphront-list-filter-view-css' => '15affac5', 4405 + 'aphront-pager-view-css' => '15affac5', 4406 + 'aphront-panel-view-css' => '15affac5', 4407 + 'aphront-table-view-css' => '15affac5', 4408 + 'aphront-tokenizer-control-css' => '15affac5', 4409 + 'aphront-tooltip-css' => '15affac5', 4410 + 'aphront-typeahead-control-css' => '15affac5', 4411 4411 'differential-changeset-view-css' => '44bfe40c', 4412 4412 'differential-core-view-css' => '44bfe40c', 4413 4413 'differential-inline-comment-editor' => '5e9e5c4e', ··· 4421 4421 'differential-table-of-contents-css' => '44bfe40c', 4422 4422 'diffusion-commit-view-css' => 'c8ce2d88', 4423 4423 'diffusion-icons-css' => 'c8ce2d88', 4424 - 'global-drag-and-drop-css' => '03a782d0', 4424 + 'global-drag-and-drop-css' => '15affac5', 4425 4425 'inline-comment-summary-css' => '44bfe40c', 4426 4426 'javelin-aphlict' => '8977e356', 4427 4427 'javelin-behavior' => '9564fa17', ··· 4494 4494 'javelin-util' => '9564fa17', 4495 4495 'javelin-vector' => '9564fa17', 4496 4496 'javelin-workflow' => '9564fa17', 4497 - 'lightbox-attachment-css' => '03a782d0', 4497 + 'lightbox-attachment-css' => '15affac5', 4498 4498 'maniphest-task-summary-css' => '49898640', 4499 - 'phabricator-action-list-view-css' => '03a782d0', 4500 - 'phabricator-application-launch-view-css' => '03a782d0', 4499 + 'phabricator-action-list-view-css' => '15affac5', 4500 + 'phabricator-application-launch-view-css' => '15affac5', 4501 4501 'phabricator-busy' => '8977e356', 4502 4502 'phabricator-content-source-view-css' => '44bfe40c', 4503 - 'phabricator-core-css' => '03a782d0', 4504 - 'phabricator-crumbs-view-css' => '03a782d0', 4503 + 'phabricator-core-css' => '15affac5', 4504 + 'phabricator-crumbs-view-css' => '15affac5', 4505 4505 'phabricator-drag-and-drop-file-upload' => '5e9e5c4e', 4506 4506 'phabricator-dropdown-menu' => '8977e356', 4507 4507 'phabricator-file-upload' => '8977e356', 4508 - 'phabricator-filetree-view-css' => '03a782d0', 4509 - 'phabricator-flag-css' => '03a782d0', 4508 + 'phabricator-filetree-view-css' => '15affac5', 4509 + 'phabricator-flag-css' => '15affac5', 4510 4510 'phabricator-hovercard' => '8977e356', 4511 - 'phabricator-jump-nav' => '03a782d0', 4511 + 'phabricator-jump-nav' => '15affac5', 4512 4512 'phabricator-keyboard-shortcut' => '8977e356', 4513 4513 'phabricator-keyboard-shortcut-manager' => '8977e356', 4514 - 'phabricator-main-menu-view' => '03a782d0', 4514 + 'phabricator-main-menu-view' => '15affac5', 4515 4515 'phabricator-menu-item' => '8977e356', 4516 - 'phabricator-nav-view-css' => '03a782d0', 4516 + 'phabricator-nav-view-css' => '15affac5', 4517 4517 'phabricator-notification' => '8977e356', 4518 - 'phabricator-notification-css' => '03a782d0', 4519 - 'phabricator-notification-menu-css' => '03a782d0', 4518 + 'phabricator-notification-css' => '15affac5', 4519 + 'phabricator-notification-menu-css' => '15affac5', 4520 4520 'phabricator-object-selector-css' => '44bfe40c', 4521 4521 'phabricator-phtize' => '8977e356', 4522 4522 'phabricator-prefab' => '8977e356', 4523 4523 'phabricator-project-tag-css' => '49898640', 4524 - 'phabricator-property-list-view-css' => '03a782d0', 4525 - 'phabricator-remarkup-css' => '03a782d0', 4524 + 'phabricator-property-list-view-css' => '15affac5', 4525 + 'phabricator-remarkup-css' => '15affac5', 4526 4526 'phabricator-shaped-request' => '5e9e5c4e', 4527 - 'phabricator-side-menu-view-css' => '03a782d0', 4528 - 'phabricator-standard-page-view' => '03a782d0', 4529 - 'phabricator-tag-view-css' => '03a782d0', 4527 + 'phabricator-side-menu-view-css' => '15affac5', 4528 + 'phabricator-standard-page-view' => '15affac5', 4529 + 'phabricator-tag-view-css' => '15affac5', 4530 4530 'phabricator-textareautils' => '8977e356', 4531 4531 'phabricator-tooltip' => '8977e356', 4532 - 'phabricator-transaction-view-css' => '03a782d0', 4533 - 'phabricator-zindex-css' => '03a782d0', 4534 - 'phui-button-css' => '03a782d0', 4535 - 'phui-form-css' => '03a782d0', 4536 - 'phui-form-view-css' => '03a782d0', 4537 - 'phui-header-view-css' => '03a782d0', 4538 - 'phui-icon-view-css' => '03a782d0', 4539 - 'phui-object-item-list-view-css' => '03a782d0', 4540 - 'phui-spacing-css' => '03a782d0', 4541 - 'sprite-apps-large-css' => '03a782d0', 4542 - 'sprite-gradient-css' => '03a782d0', 4543 - 'sprite-icons-css' => '03a782d0', 4544 - 'sprite-menu-css' => '03a782d0', 4545 - 'syntax-highlighting-css' => '03a782d0', 4532 + 'phabricator-transaction-view-css' => '15affac5', 4533 + 'phabricator-zindex-css' => '15affac5', 4534 + 'phui-button-css' => '15affac5', 4535 + 'phui-form-css' => '15affac5', 4536 + 'phui-form-view-css' => '15affac5', 4537 + 'phui-header-view-css' => '15affac5', 4538 + 'phui-icon-view-css' => '15affac5', 4539 + 'phui-object-item-list-view-css' => '15affac5', 4540 + 'phui-spacing-css' => '15affac5', 4541 + 'sprite-apps-large-css' => '15affac5', 4542 + 'sprite-gradient-css' => '15affac5', 4543 + 'sprite-icons-css' => '15affac5', 4544 + 'sprite-menu-css' => '15affac5', 4545 + 'syntax-highlighting-css' => '15affac5', 4546 4546 ), 4547 4547 ));
+2 -2
src/__phutil_library_map__.php
··· 752 752 'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php', 753 753 'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php', 754 754 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', 755 - 'PHUIFormBoxView' => 'view/form/PHUIFormBoxView.php', 756 755 'PHUIFormDividerControl' => 'view/form/control/PHUIFormDividerControl.php', 757 756 'PHUIFormFreeformDateControl' => 'view/form/control/PHUIFormFreeformDateControl.php', 758 757 'PHUIFormLayoutView' => 'view/form/PHUIFormLayoutView.php', ··· 765 764 'PHUIListItemView' => 'view/phui/PHUIListItemView.php', 766 765 'PHUIListView' => 'view/phui/PHUIListView.php', 767 766 'PHUIListViewTestCase' => 'view/layout/__tests__/PHUIListViewTestCase.php', 767 + 'PHUIObjectBoxView' => 'view/phui/PHUIObjectBoxView.php', 768 768 'PHUIObjectItemListExample' => 'applications/uiexample/examples/PHUIObjectItemListExample.php', 769 769 'PHUIObjectItemListView' => 'view/phui/PHUIObjectItemListView.php', 770 770 'PHUIObjectItemView' => 'view/phui/PHUIObjectItemView.php', ··· 2841 2841 'PHUIDocumentView' => 'AphrontTagView', 2842 2842 'PHUIFeedStoryExample' => 'PhabricatorUIExample', 2843 2843 'PHUIFeedStoryView' => 'AphrontView', 2844 - 'PHUIFormBoxView' => 'AphrontView', 2845 2844 'PHUIFormDividerControl' => 'AphrontFormControl', 2846 2845 'PHUIFormFreeformDateControl' => 'AphrontFormControl', 2847 2846 'PHUIFormLayoutView' => 'AphrontView', ··· 2854 2853 'PHUIListItemView' => 'AphrontTagView', 2855 2854 'PHUIListView' => 'AphrontTagView', 2856 2855 'PHUIListViewTestCase' => 'PhabricatorTestCase', 2856 + 'PHUIObjectBoxView' => 'AphrontView', 2857 2857 'PHUIObjectItemListExample' => 'PhabricatorUIExample', 2858 2858 'PHUIObjectItemListView' => 'AphrontTagView', 2859 2859 'PHUIObjectItemView' => 'AphrontTagView',
+1 -1
src/applications/auth/controller/config/PhabricatorAuthEditController.php
··· 280 280 ->setTransactions($xactions); 281 281 } 282 282 283 - $form_box = id(new PHUIFormBoxView()) 283 + $form_box = id(new PHUIObjectBoxView()) 284 284 ->setHeaderText($title) 285 285 ->setFormError($errors) 286 286 ->setForm($form);
+1 -1
src/applications/auth/controller/config/PhabricatorAuthNewController.php
··· 81 81 ->addCancelButton($this->getApplicationURI()) 82 82 ->setValue(pht('Continue'))); 83 83 84 - $form_box = id(new PHUIFormBoxView()) 84 + $form_box = id(new PHUIObjectBoxView()) 85 85 ->setHeaderText(pht('Add Authentication Provider')) 86 86 ->setFormError($errors) 87 87 ->setForm($form);
+1 -1
src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
··· 163 163 } 164 164 $form->appendChild($submit); 165 165 166 - $form_box = id(new PHUIFormBoxView()) 166 + $form_box = id(new PHUIObjectBoxView()) 167 167 ->setHeaderText($page_title) 168 168 ->setFormError($error_view) 169 169 ->setForm($form);
+1 -1
src/applications/conduit/controller/PhabricatorConduitConsoleController.php
··· 110 110 ->addCancelButton($this->getApplicationURI()) 111 111 ->setValue('Call Method')); 112 112 113 - $form_box = id(new PHUIFormBoxView()) 113 + $form_box = id(new PHUIObjectBoxView()) 114 114 ->setHeaderText($method->getAPIMethodName()) 115 115 ->setFormError($status_view) 116 116 ->setForm($form);
+1 -1
src/applications/config/controller/PhabricatorConfigEditController.php
··· 193 193 $title = pht('Edit %s', $this->key); 194 194 $short = pht('Edit'); 195 195 196 - $form_box = id(new PHUIFormBoxView()) 196 + $form_box = id(new PHUIObjectBoxView()) 197 197 ->setHeaderText($title) 198 198 ->setFormError($error_view) 199 199 ->setForm($form);
+1 -1
src/applications/countdown/controller/PhabricatorCountdownEditController.php
··· 128 128 ->addCancelButton($cancel_uri) 129 129 ->setValue($submit_label)); 130 130 131 - $form_box = id(new PHUIFormBoxView()) 131 + $form_box = id(new PHUIObjectBoxView()) 132 132 ->setHeaderText($page_title) 133 133 ->setFormError($error_view) 134 134 ->setForm($form);
+1 -1
src/applications/differential/controller/DifferentialDiffCreateController.php
··· 82 82 ->addCancelButton($cancel_uri) 83 83 ->setValue(pht("Create Diff"))); 84 84 85 - $form_box = id(new PHUIFormBoxView()) 85 + $form_box = id(new PHUIObjectBoxView()) 86 86 ->setHeaderText(pht('Create New Diff')) 87 87 ->setFormError($errors) 88 88 ->setForm($form);
+1 -1
src/applications/differential/controller/DifferentialRevisionEditController.php
··· 164 164 $title = pht('Create New Differential Revision'); 165 165 } 166 166 167 - $form_box = id(new PHUIFormBoxView()) 167 + $form_box = id(new PHUIObjectBoxView()) 168 168 ->setHeaderText($title) 169 169 ->setFormError($error_view) 170 170 ->setForm($form);
+1 -1
src/applications/diffusion/controller/DiffusionCommitEditController.php
··· 81 81 ->addCancelButton('/r'.$callsign.$commit->getCommitIdentifier()); 82 82 $form->appendChild($submit); 83 83 84 - $form_box = id(new PHUIFormBoxView()) 84 + $form_box = id(new PHUIObjectBoxView()) 85 85 ->setHeaderText($page_title) 86 86 ->setForm($form); 87 87
+1 -1
src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php
··· 95 95 ->setValue(pht('Save Policies')) 96 96 ->addCancelButton($edit_uri)); 97 97 98 - $form_box = id(new PHUIFormBoxView()) 98 + $form_box = id(new PHUIObjectBoxView()) 99 99 ->setHeaderText($title) 100 100 ->setForm($form); 101 101
+1 -1
src/applications/files/controller/PhabricatorFileUploadController.php
··· 76 76 $global_upload = id(new PhabricatorGlobalUploadTargetView()) 77 77 ->setShowIfSupportedID($support_id); 78 78 79 - $form_box = id(new PHUIFormBoxView()) 79 + $form_box = id(new PHUIObjectBoxView()) 80 80 ->setHeaderText($title) 81 81 ->setFormError($errors) 82 82 ->setForm($form);
+1 -1
src/applications/herald/controller/HeraldNewController.php
··· 69 69 ->setValue(pht('Create Rule')) 70 70 ->addCancelButton($this->getApplicationURI())); 71 71 72 - $form_box = id(new PHUIFormBoxView()) 72 + $form_box = id(new PHUIObjectBoxView()) 73 73 ->setHeaderText(pht('Create Herald Rule')) 74 74 ->setForm($form); 75 75
+1 -1
src/applications/herald/controller/HeraldRuleController.php
··· 182 182 ? pht('Edit Herald Rule') 183 183 : pht('Create Herald Rule'); 184 184 185 - $form_box = id(new PHUIFormBoxView()) 185 + $form_box = id(new PHUIObjectBoxView()) 186 186 ->setHeaderText($title) 187 187 ->setFormError($error_view) 188 188 ->setForm($form);
+1 -1
src/applications/legalpad/controller/LegalpadDocumentEditController.php
··· 167 167 $form 168 168 ->appendChild($submit); 169 169 170 - $form_box = id(new PHUIFormBoxView()) 170 + $form_box = id(new PHUIObjectBoxView()) 171 171 ->setHeaderText($title) 172 172 ->setFormError($error_view) 173 173 ->setForm($form);
+2 -2
src/applications/macro/controller/PhabricatorMacroEditController.php
··· 257 257 id(new AphrontFormSubmitControl()) 258 258 ->setValue(pht('Upload File'))); 259 259 260 - $upload = id(new PHUIFormBoxView()) 260 + $upload = id(new PHUIObjectBoxView()) 261 261 ->setHeaderText(pht('Upload New File')) 262 262 ->setForm($upload_form); 263 263 } 264 264 265 - $form_box = id(new PHUIFormBoxView()) 265 + $form_box = id(new PHUIObjectBoxView()) 266 266 ->setHeaderText($title) 267 267 ->setFormError($error_view) 268 268 ->setForm($form);
+1 -1
src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
··· 126 126 ->setName(pht('Create Mailing List'))); 127 127 } 128 128 129 - $form_box = id(new PHUIFormBoxView()) 129 + $form_box = id(new PHUIObjectBoxView()) 130 130 ->setHeaderText($page_title) 131 131 ->setFormError($error_view) 132 132 ->setForm($form);
+1 -1
src/applications/maniphest/controller/ManiphestBatchEditController.php
··· 140 140 id(new PhabricatorCrumbView()) 141 141 ->setName($title)); 142 142 143 - $form_box = id(new PHUIFormBoxView()) 143 + $form_box = id(new PHUIObjectBoxView()) 144 144 ->setHeaderText(pht('Batch Edit Tasks')) 145 145 ->setForm($form); 146 146
+1 -1
src/applications/maniphest/controller/ManiphestTaskEditController.php
··· 526 526 ->addCancelButton($cancel_uri) 527 527 ->setValue($button_name)); 528 528 529 - $form_box = id(new PHUIFormBoxView()) 529 + $form_box = id(new PHUIObjectBoxView()) 530 530 ->setHeaderText($header_name) 531 531 ->setFormError($error_view) 532 532 ->setForm($form);
+1 -1
src/applications/owners/controller/PhabricatorOwnersEditController.php
··· 251 251 ->addCancelButton($cancel_uri) 252 252 ->setValue(pht('Save Package'))); 253 253 254 - $form_box = id(new PHUIFormBoxView()) 254 + $form_box = id(new PHUIObjectBoxView()) 255 255 ->setHeaderText($title) 256 256 ->setFormError($error_view) 257 257 ->setForm($form);
+1 -1
src/applications/paste/controller/PhabricatorPasteEditController.php
··· 205 205 206 206 $form->appendChild($submit); 207 207 208 - $form_box = id(new PHUIFormBoxView()) 208 + $form_box = id(new PHUIObjectBoxView()) 209 209 ->setHeaderText($title) 210 210 ->setFormError($error_view) 211 211 ->setForm($form);
+5 -5
src/applications/people/controller/PhabricatorPeopleEditController.php
··· 349 349 $title = pht('Create New User'); 350 350 } 351 351 352 - $form_box = id(new PHUIFormBoxView()) 352 + $form_box = id(new PHUIObjectBoxView()) 353 353 ->setHeaderText($title) 354 354 ->setFormError($error_view) 355 355 ->setForm($form); ··· 454 454 455 455 $title = pht('Edit Role'); 456 456 457 - $form_box = id(new PHUIFormBoxView()) 457 + $form_box = id(new PHUIObjectBoxView()) 458 458 ->setHeaderText($title) 459 459 ->setFormError($error_view) 460 460 ->setForm($form); ··· 496 496 497 497 $title = pht('Conduit Certificate'); 498 498 499 - $form_box = id(new PHUIFormBoxView()) 499 + $form_box = id(new PHUIObjectBoxView()) 500 500 ->setHeaderText($title) 501 501 ->setForm($form); 502 502 ··· 592 592 id(new AphrontFormSubmitControl()) 593 593 ->setValue(pht('Change Username'))); 594 594 595 - $form_box = id(new PHUIFormBoxView()) 595 + $form_box = id(new PHUIObjectBoxView()) 596 596 ->setHeaderText(pht('Change Username')) 597 597 ->setFormError($errors) 598 598 ->setForm($form); ··· 685 685 id(new AphrontFormSubmitControl()) 686 686 ->setValue(pht('Delete User'))); 687 687 688 - $form_box = id(new PHUIFormBoxView()) 688 + $form_box = id(new PHUIObjectBoxView()) 689 689 ->setHeaderText(pht('Delete User')) 690 690 ->setFormError($errors) 691 691 ->setForm($form);
+1 -1
src/applications/people/controller/PhabricatorPeopleProfileEditController.php
··· 80 80 ->addCancelButton($profile_uri) 81 81 ->setValue(pht('Save Profile'))); 82 82 83 - $form_box = id(new PHUIFormBoxView()) 83 + $form_box = id(new PHUIObjectBoxView()) 84 84 ->setHeaderText(pht('Edit Your Profile')) 85 85 ->setValidationException($validation_exception) 86 86 ->setForm($form);
+3 -3
src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
··· 260 260 ->setLabel(pht('Use Picture')) 261 261 ->setValue($buttons)); 262 262 263 - $form_box = id(new PHUIFormBoxView()) 263 + $form_box = id(new PHUIObjectBoxView()) 264 264 ->setHeaderText($title) 265 265 ->setFormError($errors) 266 266 ->setForm($form); ··· 284 284 $errors = id(new AphrontErrorView())->setErrors($errors); 285 285 } 286 286 287 - $form_box = id(new PHUIFormBoxView()) 287 + $form_box = id(new PHUIObjectBoxView()) 288 288 ->setHeaderText($title) 289 289 ->setFormError($errors) 290 290 ->setForm($form); 291 291 292 - $upload_box = id(new PHUIFormBoxView()) 292 + $upload_box = id(new PHUIObjectBoxView()) 293 293 ->setHeaderText(pht('Upload New Picture')) 294 294 ->setForm($upload_form); 295 295
+1 -1
src/applications/phame/controller/blog/PhameBlogEditController.php
··· 170 170 $error_view = null; 171 171 } 172 172 173 - $form_box = id(new PHUIFormBoxView()) 173 + $form_box = id(new PHUIObjectBoxView()) 174 174 ->setHeaderText($page_title) 175 175 ->setFormError($error_view) 176 176 ->setForm($form);
+1 -1
src/applications/phame/controller/post/PhamePostEditController.php
··· 174 174 $error_view = null; 175 175 } 176 176 177 - $form_box = id(new PHUIFormBoxView()) 177 + $form_box = id(new PHUIObjectBoxView()) 178 178 ->setHeaderText($page_title) 179 179 ->setFormError($error_view) 180 180 ->setForm($form);
+1 -1
src/applications/phame/controller/post/PhamePostNewController.php
··· 117 117 } 118 118 119 119 120 - $form_box = id(new PHUIFormBoxView()) 120 + $form_box = id(new PHUIObjectBoxView()) 121 121 ->setHeaderText($title) 122 122 ->setForm($form); 123 123
+1 -1
src/applications/phame/controller/post/PhamePostPublishController.php
··· 46 46 47 47 $frame = $this->renderPreviewFrame($post); 48 48 49 - $form_box = id(new PHUIFormBoxView()) 49 + $form_box = id(new PHUIObjectBoxView()) 50 50 ->setHeaderText(pht('Preview Post')) 51 51 ->setForm($form); 52 52
+1 -1
src/applications/phlux/controller/PhluxEditController.php
··· 176 176 ->setHref($request->getRequestURI())); 177 177 } 178 178 179 - $form_box = id(new PHUIFormBoxView()) 179 + $form_box = id(new PHUIObjectBoxView()) 180 180 ->setHeaderText($title) 181 181 ->setFormError($errors) 182 182 ->setForm($form);
+1 -1
src/applications/pholio/controller/PholioMockEditController.php
··· 322 322 ->setError($e_images)) 323 323 ->appendChild($submit); 324 324 325 - $form_box = id(new PHUIFormBoxView()) 325 + $form_box = id(new PHUIObjectBoxView()) 326 326 ->setHeaderText($title) 327 327 ->setFormError($error_view) 328 328 ->setForm($form);
+1 -1
src/applications/phpast/controller/PhabricatorXHPASTViewRunController.php
··· 43 43 id(new AphrontFormSubmitControl()) 44 44 ->setValue('Parse')); 45 45 46 - $form_box = id(new PHUIFormBoxView()) 46 + $form_box = id(new PHUIObjectBoxView()) 47 47 ->setHeaderText(pht('Generate XHP AST')) 48 48 ->setForm($form); 49 49
+1 -1
src/applications/phriction/controller/PhrictionEditController.php
··· 226 226 ->addCancelButton($cancel_uri) 227 227 ->setValue($submit_button)); 228 228 229 - $form_box = id(new PHUIFormBoxView()) 229 + $form_box = id(new PHUIObjectBoxView()) 230 230 ->setHeaderText(pht('Edit Document')) 231 231 ->setFormError($error_view) 232 232 ->setForm($form);
+1 -1
src/applications/ponder/controller/PonderAnswerEditController.php
··· 94 94 id(new PhabricatorCrumbView()) 95 95 ->setName(pht('Edit Answer'))); 96 96 97 - $form_box = id(new PHUIFormBoxView()) 97 + $form_box = id(new PHUIObjectBoxView()) 98 98 ->setHeaderText(pht('Edit Answer')) 99 99 ->setFormError($errors) 100 100 ->setForm($form);
+1 -1
src/applications/ponder/controller/PonderQuestionEditController.php
··· 108 108 ->setControlID('content') 109 109 ->setPreviewURI($this->getApplicationURI('preview/')); 110 110 111 - $form_box = id(new PHUIFormBoxView()) 111 + $form_box = id(new PHUIObjectBoxView()) 112 112 ->setHeaderText(pht('Ask New Question')) 113 113 ->setFormError($error_view) 114 114 ->setForm($form);
+1 -1
src/applications/project/controller/PhabricatorProjectCreateController.php
··· 113 113 ->setName(pht('Create Project')) 114 114 ->setHref($this->getApplicationURI().'create/')); 115 115 116 - $form_box = id(new PHUIFormBoxView()) 116 + $form_box = id(new PHUIObjectBoxView()) 117 117 ->setHeaderText(pht('Create New Project')) 118 118 ->setFormError($error_view) 119 119 ->setForm($form);
+2 -2
src/applications/project/controller/PhabricatorProjectMembersEditController.php
··· 106 106 id(new AphrontFormInsetView()) 107 107 ->appendChild($list)); 108 108 109 - $box = id(new PHUIFormBoxView()) 109 + $box = id(new PHUIObjectBoxView()) 110 110 ->setHeaderText(pht('Current Members (%d)', count($handles))) 111 111 ->setForm($faux_form); 112 112 113 - $form_box = id(new PHUIFormBoxView()) 113 + $form_box = id(new PHUIObjectBoxView()) 114 114 ->setHeaderText($title) 115 115 ->setForm($form); 116 116
+1 -1
src/applications/project/controller/PhabricatorProjectProfileEditController.php
··· 219 219 ->addCancelButton('/project/view/'.$project->getID().'/') 220 220 ->setValue(pht('Save'))); 221 221 222 - $form_box = id(new PHUIFormBoxView()) 222 + $form_box = id(new PHUIObjectBoxView()) 223 223 ->setHeaderText($title) 224 224 ->setFormError($error_view) 225 225 ->setForm($form);
+1 -1
src/applications/releeph/controller/project/ReleephProjectCreateController.php
··· 108 108 ->addCancelButton('/releeph/project/') 109 109 ->setValue(pht('Create'))); 110 110 111 - $form_box = id(new PHUIFormBoxView()) 111 + $form_box = id(new PHUIObjectBoxView()) 112 112 ->setHeaderText(pht('Create New Project')) 113 113 ->setFormError($error_view) 114 114 ->setForm($form);
+1 -1
src/applications/repository/controller/PhabricatorRepositoryCreateController.php
··· 101 101 ->setValue('Create Repository') 102 102 ->addCancelButton('/repository/')); 103 103 104 - $form_box = id(new PHUIFormBoxView()) 104 + $form_box = id(new PHUIObjectBoxView()) 105 105 ->setHeaderText(pht('Create Repository')) 106 106 ->setFormError($error_view) 107 107 ->setForm($form);
+2 -2
src/applications/repository/controller/PhabricatorRepositoryEditController.php
··· 155 155 156 156 $nav = $this->sideNav; 157 157 158 - $form_box = id(new PHUIFormBoxView()) 158 + $form_box = id(new PHUIObjectBoxView()) 159 159 ->setHeaderText(pht('Edit Repository')) 160 160 ->setFormError($error_view) 161 161 ->setForm($form); ··· 674 674 id(new AphrontFormSubmitControl()) 675 675 ->setValue('Save Configuration')); 676 676 677 - $form_box = id(new PHUIFormBoxView()) 677 + $form_box = id(new PHUIObjectBoxView()) 678 678 ->setHeaderText(pht('Edit Repository Tracking')) 679 679 ->setFormError($error_view) 680 680 ->setForm($form);
+1 -1
src/applications/search/controller/PhabricatorSearchEditController.php
··· 92 92 $title = pht('Save Query'); 93 93 } 94 94 95 - $form_box = id(new PHUIFormBoxView()) 95 + $form_box = id(new PHUIObjectBoxView()) 96 96 ->setHeaderText($title) 97 97 ->setFormError($errors) 98 98 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
··· 137 137 id(new AphrontFormSubmitControl()) 138 138 ->setValue(pht('Save Account Settings'))); 139 139 140 - $form_box = id(new PHUIFormBoxView()) 140 + $form_box = id(new PHUIObjectBoxView()) 141 141 ->setHeaderText(pht('Account Settings')) 142 142 ->setForm($form); 143 143
+2 -2
src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
··· 78 78 ->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT) 79 79 ->setValue($user->getConduitCertificate())); 80 80 81 - $cert_form = id(new PHUIFormBoxView()) 81 + $cert_form = id(new PHUIObjectBoxView()) 82 82 ->setHeaderText(pht('Arcanist Certificate')) 83 83 ->setForm($cert_form); 84 84 ··· 96 96 id(new AphrontFormSubmitControl()) 97 97 ->setValue(pht('Regenerate Certificate'))); 98 98 99 - $regen_form = id(new PHUIFormBoxView()) 99 + $regen_form = id(new PHUIObjectBoxView()) 100 100 ->setHeaderText(pht('Regenerate Certificate')) 101 101 ->setForm($regen_form); 102 102
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
··· 64 64 ->setErrors(array(pht('Your preferences have been saved.'))); 65 65 } 66 66 67 - $form_box = id(new PHUIFormBoxView()) 67 + $form_box = id(new PHUIObjectBoxView()) 68 68 ->setHeaderText(pht('Conpherence Preferences')) 69 69 ->setFormError($error_view) 70 70 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelDeveloperPreferences.php
··· 93 93 ->setErrors(array(pht('Your preferences have been saved.'))); 94 94 } 95 95 96 - $form_box = id(new PHUIFormBoxView()) 96 + $form_box = id(new PHUIObjectBoxView()) 97 97 ->setHeaderText(pht('Developer Settings')) 98 98 ->setFormError($error_view) 99 99 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
··· 66 66 ->setErrors(array(pht('Your preferences have been saved.'))); 67 67 } 68 68 69 - $form_box = id(new PHUIFormBoxView()) 69 + $form_box = id(new PHUIObjectBoxView()) 70 70 ->setHeaderText(pht('Diff Preferences')) 71 71 ->setFormError($error_view) 72 72 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
··· 145 145 ->setErrors(array(pht('Your preferences have been saved.'))); 146 146 } 147 147 148 - $form_box = id(new PHUIFormBoxView()) 148 + $form_box = id(new PHUIObjectBoxView()) 149 149 ->setHeaderText(pht('Display Preferences')) 150 150 ->setFormError($error_view) 151 151 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
··· 216 216 id(new AphrontFormSubmitControl()) 217 217 ->setValue(pht('Save Preferences'))); 218 218 219 - $form_box = id(new PHUIFormBoxView()) 219 + $form_box = id(new PHUIObjectBoxView()) 220 220 ->setHeaderText(pht('Email Preferences')) 221 221 ->setFormError($notice) 222 222 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php
··· 200 200 ->setErrors(array(pht('Your preferences have been saved.'))); 201 201 } 202 202 203 - $form_box = id(new PHUIFormBoxView()) 203 + $form_box = id(new PHUIObjectBoxView()) 204 204 ->setHeaderText(pht('Home Page Preferences')) 205 205 ->setFormError($error_view) 206 206 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
··· 159 159 id(new AphrontFormSubmitControl()) 160 160 ->setValue(pht('Save'))); 161 161 162 - $form_box = id(new PHUIFormBoxView()) 162 + $form_box = id(new PHUIObjectBoxView()) 163 163 ->setHeaderText(pht('Delete User')) 164 164 ->setFormError($notice) 165 165 ->setForm($form);
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
··· 58 58 ->setErrors(array(pht('Your preferences have been saved.'))); 59 59 } 60 60 61 - $form_box = id(new PHUIFormBoxView()) 61 + $form_box = id(new PHUIObjectBoxView()) 62 62 ->setHeaderText(pht('Search Preferences')) 63 63 ->setFormError($error_view) 64 64 ->setForm($form);
+1 -1
src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
··· 231 231 id(new PhabricatorCrumbView()) 232 232 ->setName($title)); 233 233 234 - $form_box = id(new PHUIFormBoxView()) 234 + $form_box = id(new PHUIObjectBoxView()) 235 235 ->setHeaderText($title) 236 236 ->setFormError($error_view) 237 237 ->setForm($form);
+9 -2
src/view/form/PHUIFormBoxView.php src/view/phui/PHUIObjectBoxView.php
··· 1 1 <?php 2 2 3 - final class PHUIFormBoxView extends AphrontView { 3 + final class PHUIObjectBoxView extends AphrontView { 4 4 5 5 private $headerText; 6 6 private $formError = null; 7 7 private $form; 8 8 private $validationException; 9 + private $content = array(); 9 10 10 11 public function setHeaderText($text) { 11 12 $this->headerText = $text; ··· 19 20 20 21 public function setForm($form) { 21 22 $this->form = $form; 23 + return $this; 24 + } 25 + 26 + public function addContent($content) { 27 + $this->content[] = $content; 22 28 return $this; 23 29 } 24 30 ··· 54 60 $this->formError, 55 61 $exception_errors, 56 62 $this->form, 63 + $this->content, 57 64 )) 58 65 ->setBorder(true) 59 66 ->addMargin(PHUI::MARGIN_LARGE_TOP) 60 67 ->addMargin(PHUI::MARGIN_LARGE_LEFT) 61 68 ->addMargin(PHUI::MARGIN_LARGE_RIGHT) 62 - ->addClass('phui-form-box'); 69 + ->addClass('phui-object-box'); 63 70 64 71 return $content; 65 72
+3 -3
webroot/rsrc/css/phui/phui-form-view.css
··· 426 426 display: none; 427 427 } 428 428 429 - .phui-form-box .phabricator-action-header { 429 + .phui-object-box .phabricator-action-header { 430 430 padding: 4px 5px 4px 12px; 431 431 border-bottom: 1px solid {$lightblueborder}; 432 432 } 433 433 434 - .phui-form-box .phabricator-action-header h3 { 434 + .phui-object-box .phabricator-action-header h3 { 435 435 color: {$bluetext}; 436 436 text-shadow: 0 1px 2px #fff; 437 437 } 438 438 439 - .phui-form-box .aphront-error-view { 439 + .phui-object-box .aphront-error-view { 440 440 margin-bottom: 0; 441 441 } 442 442