From fe2a96e37ff03b003cb10928e6d9f077dd44aa05 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 26 Aug 2013 11:53:11 -0700 Subject: [PATCH] Update Form Layouts Summary: This attempts some consistency in form layouts. Notably, they all now contain headers and are 16px off the sides and tops of pages. Also updated dialogs to the same look and feel. I think I got 98% of forms with this pass, but it's likely I missed some buried somewhere. TODO: will take another pass as consolidating these colors and new gradients in another diff. Test Plan: Played in my sandbox all week. Please play with it too and let me know how they feel. Reviewers: epriestley, btrahan Reviewed By: epriestley CC: Korvin, aran Differential Revision: https://secure.phabricator.com/D6806 --- .../sprite/gradients/lightblue-header.png | Bin 0 -> 196 bytes resources/sprite/manifest/gradient.json | 5 + scripts/celerity_mapper.php | 3 +- src/__celerity_resource_map__.php | 173 ++++++++---------- src/__phutil_library_map__.php | 6 +- .../PhabricatorAuditListController.php | 1 - .../PhabricatorAuthConfirmLinkController.php | 2 +- .../PhabricatorEmailLoginController.php | 2 +- ...PhabricatorEmailVerificationController.php | 4 - .../config/PhabricatorAuthEditController.php | 9 +- .../config/PhabricatorAuthNewController.php | 7 +- .../provider/PhabricatorAuthProviderLDAP.php | 2 +- .../PhabricatorAuthProviderPassword.php | 2 +- ...habricatorCalendarEditStatusController.php | 14 +- ...PhabricatorChatLogChannelLogController.php | 1 - .../PhabricatorConduitConsoleController.php | 1 - .../PhabricatorConfigEditController.php | 11 +- .../controller/ConpherenceNewController.php | 2 +- .../ConpherenceUpdateController.php | 5 +- .../controller/ConpherenceViewController.php | 1 - .../PhabricatorCountdownEditController.php | 12 +- .../DifferentialDiffCreateController.php | 9 +- .../DifferentialDiffViewController.php | 1 - .../DifferentialRevisionEditController.php | 1 - .../view/DifferentialAddCommentView.php | 2 +- .../controller/DiffusionBrowseController.php | 3 +- .../DiffusionCommitEditController.php | 1 - ...DiffusionRepositoryEditBasicController.php | 1 - ...fusionRepositoryEditEncodingController.php | 1 - .../PhabricatorFileUploadController.php | 12 +- .../PhabricatorFlagEditController.php | 2 +- .../controller/HeraldDeleteController.php | 1 - .../herald/controller/HeraldNewController.php | 7 +- .../controller/HeraldRuleController.php | 8 +- .../LegalpadDocumentEditController.php | 9 +- .../LegalpadDocumentSignController.php | 1 - .../PhabricatorMacroEditController.php | 10 +- .../PhabricatorMacroMemeDialogController.php | 2 +- .../PhabricatorMailingListsEditController.php | 12 +- .../controller/ManiphestExportController.php | 2 +- .../ManiphestTaskDetailController.php | 1 + .../ManiphestTaskEditController.php | 11 +- .../ManiphestTaskListController.php | 1 - .../PhabricatorOwnersDeleteController.php | 1 - .../PhabricatorOwnersEditController.php | 11 +- .../PhabricatorOwnersListController.php | 1 - .../PhabricatorPasteEditController.php | 15 +- .../PhabricatorPeopleEditController.php | 47 +++-- ...PhabricatorPeopleProfileEditController.php | 6 +- ...bricatorPeopleProfilePictureController.php | 3 +- .../blog/PhameBlogDeleteController.php | 1 - .../blog/PhameBlogEditController.php | 9 +- .../post/PhamePostDeleteController.php | 1 - .../post/PhamePostEditController.php | 9 +- .../post/PhamePostNewController.php | 8 +- .../post/PhamePostPublishController.php | 1 - .../phlux/controller/PhluxEditController.php | 10 +- .../controller/PholioMockEditController.php | 9 +- .../PhortuneAccountBuyController.php | 4 +- .../controller/PhrequentListController.php | 1 - .../controller/PhrictionDeleteController.php | 1 - .../controller/PhrictionEditController.php | 9 +- .../controller/PhrictionMoveController.php | 2 +- .../controller/PhrictionNewController.php | 2 +- .../controller/PonderAnswerEditController.php | 8 +- .../PonderQuestionEditController.php | 11 +- .../ponder/view/PonderAddAnswerView.php | 1 - .../PhabricatorProjectCreateController.php | 10 +- ...habricatorProjectMembersEditController.php | 19 +- ...habricatorProjectProfileEditController.php | 8 +- .../ReleephProjectCreateController.php | 1 - .../PhabricatorRepositoryCreateController.php | 12 +- .../PhabricatorRepositoryEditController.php | 11 +- ...PhabricatorApplicationSearchController.php | 1 - .../PhabricatorSearchController.php | 1 - .../PhabricatorSearchEditController.php | 8 +- .../panel/PhabricatorSettingsPanelAccount.php | 9 +- .../panel/PhabricatorSettingsPanelConduit.php | 12 +- ...torSettingsPanelConpherencePreferences.php | 12 +- ...catorSettingsPanelDeveloperPreferences.php | 13 +- ...habricatorSettingsPanelDiffPreferences.php | 12 +- ...ricatorSettingsPanelDisplayPreferences.php | 12 +- ...PhabricatorSettingsPanelEmailAddresses.php | 2 +- ...abricatorSettingsPanelEmailPreferences.php | 10 +- ...habricatorSettingsPanelHomePreferences.php | 13 +- .../PhabricatorSettingsPanelPassword.php | 10 +- ...bricatorSettingsPanelSearchPreferences.php | 12 +- .../PhabricatorSlowvoteEditController.php | 9 +- ...cationTransactionCommentEditController.php | 2 +- ...catorApplicationTransactionCommentView.php | 2 +- .../examples/PhabricatorFormExample.php | 1 - .../PhabricatorMultiColumnExample.php | 4 +- .../PhabricatorUIListFilterExample.php | 1 - .../celerity/CeleritySpriteGenerator.php | 1 + src/view/AphrontDialogView.php | 2 +- src/view/form/AphrontFormLayoutView.php | 53 ------ src/view/form/AphrontFormView.php | 35 +--- src/view/form/PHUIFormBoxView.php | 43 +++++ src/view/form/PHUIFormLayoutView.php | 32 ++++ .../layout/PhabricatorActionHeaderView.php | 1 + src/view/phui/PHUIBoxView.php | 9 + src/view/phui/PHUIRemarkupPreviewPanel.php | 9 +- webroot/rsrc/css/aphront/dialog-view.css | 33 ++-- webroot/rsrc/css/aphront/error-view.css | 20 +- webroot/rsrc/css/aphront/list-filter-view.css | 8 +- webroot/rsrc/css/aphront/panel-view.css | 4 +- .../application/conpherence/message-pane.css | 10 +- webroot/rsrc/css/core/core.css | 5 +- webroot/rsrc/css/core/remarkup.css | 22 ++- .../rsrc/css/layout/phabricator-form-view.css | 48 ----- .../css/layout/phabricator-side-menu-view.css | 2 +- webroot/rsrc/css/phui/phui-box.css | 16 ++ .../form-view.css => phui/phui-form-view.css} | 93 ++++++---- webroot/rsrc/css/phui/phui-form.css | 5 +- .../rsrc/css/phui/phui-remarkup-preview.css | 24 +-- webroot/rsrc/css/sprite-gradient.css | 8 +- webroot/rsrc/image/sprite-gradient.png | Bin 531 -> 559 bytes 117 files changed, 633 insertions(+), 589 deletions(-) create mode 100644 resources/sprite/gradients/lightblue-header.png delete mode 100644 src/view/form/AphrontFormLayoutView.php create mode 100644 src/view/form/PHUIFormBoxView.php create mode 100644 src/view/form/PHUIFormLayoutView.php delete mode 100644 webroot/rsrc/css/layout/phabricator-form-view.css rename webroot/rsrc/css/{aphront/form-view.css => phui/phui-form-view.css} (80%) diff --git a/resources/sprite/gradients/lightblue-header.png b/resources/sprite/gradients/lightblue-header.png new file mode 100644 index 0000000000000000000000000000000000000000..35006c91a89030a106c537b92f5c75c83aca25fb GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^tU&C>!2~3`51uRlQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jiqbq?978H@y}7WLuR(!_%V=g uKDXz4z5d@9C$Il~ajN?L$J^g@4=`N%7*u~VYO*HKMg~t;KbLh*2~7Y8(osMF literal 0 HcmV?d00001 diff --git a/resources/sprite/manifest/gradient.json b/resources/sprite/manifest/gradient.json index b701841317..4482167b4e 100644 --- a/resources/sprite/manifest/gradient.json +++ b/resources/sprite/manifest/gradient.json @@ -31,6 +31,11 @@ "rule" : ".gradient-grey-header", "hash" : "1c8f8d61984e3fc5a7e528b9bd4d484a" }, + "gradient-lightblue-header" : { + "name" : "gradient-lightblue-header", + "rule" : ".gradient-lightblue-header", + "hash" : "b838d2eb15f9b620e82b4da240bf464a" + }, "gradient-menu-label" : { "name" : "gradient-menu-label", "rule" : ".gradient-menu-label, .phabricator-side-menu .phui-list-item-type-label", diff --git a/scripts/celerity_mapper.php b/scripts/celerity_mapper.php index b6e3760b9d..23506c4e67 100755 --- a/scripts/celerity_mapper.php +++ b/scripts/celerity_mapper.php @@ -70,7 +70,7 @@ $package_spec = array( 'phui-button-css', 'phabricator-standard-page-view', 'aphront-dialog-view-css', - 'aphront-form-view-css', + 'phui-form-view-css', 'aphront-panel-view-css', 'aphront-table-view-css', 'aphront-tokenizer-control-css', @@ -97,7 +97,6 @@ $package_spec = array( 'phabricator-notification-menu-css', 'lightbox-attachment-css', 'phabricator-header-view-css', - 'phabricator-form-view-css', 'phabricator-filetree-view-css', 'phabricator-nav-view-css', 'phabricator-side-menu-view-css', diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 74d0ca3548..5dbae02e0a 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -632,8 +632,8 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-gradient.png' => array( - 'hash' => 'a49d2e493dba4bea85bb202af528106a', - 'uri' => '/res/a49d2e49/rsrc/image/sprite-gradient.png', + 'hash' => 'c6c42387e625948e683d9d8c62ea1b7f', + 'uri' => '/res/c6c42387/rsrc/image/sprite-gradient.png', 'disk' => '/rsrc/image/sprite-gradient.png', 'type' => 'png', ), @@ -836,7 +836,7 @@ celerity_register_resource_map(array( ), 'aphront-dialog-view-css' => array( - 'uri' => '/res/29a054fd/rsrc/css/aphront/dialog-view.css', + 'uri' => '/res/c7a7e179/rsrc/css/aphront/dialog-view.css', 'type' => 'css', 'requires' => array( @@ -845,25 +845,16 @@ celerity_register_resource_map(array( ), 'aphront-error-view-css' => array( - 'uri' => '/res/e2bb50c4/rsrc/css/aphront/error-view.css', + 'uri' => '/res/4ba306a0/rsrc/css/aphront/error-view.css', 'type' => 'css', 'requires' => array( ), 'disk' => '/rsrc/css/aphront/error-view.css', ), - 'aphront-form-view-css' => - array( - 'uri' => '/res/1be2545a/rsrc/css/aphront/form-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/form-view.css', - ), 'aphront-list-filter-view-css' => array( - 'uri' => '/res/a90a0c94/rsrc/css/aphront/list-filter-view.css', + 'uri' => '/res/9fd0aae6/rsrc/css/aphront/list-filter-view.css', 'type' => 'css', 'requires' => array( @@ -899,7 +890,7 @@ celerity_register_resource_map(array( ), 'aphront-panel-view-css' => array( - 'uri' => '/res/f55024c3/rsrc/css/aphront/panel-view.css', + 'uri' => '/res/e19deae5/rsrc/css/aphront/panel-view.css', 'type' => 'css', 'requires' => array( @@ -990,7 +981,7 @@ celerity_register_resource_map(array( ), 'conpherence-message-pane-css' => array( - 'uri' => '/res/80cde760/rsrc/css/application/conpherence/message-pane.css', + 'uri' => '/res/4f3bfae5/rsrc/css/application/conpherence/message-pane.css', 'type' => 'css', 'requires' => array( @@ -2178,7 +2169,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-phabricator-transaction-list' => array( - 'uri' => '/res/db441ac4/rsrc/js/application/transactions/behavior-transaction-list.js', + 'uri' => '/res/f05b3c6b/rsrc/js/application/transactions/behavior-transaction-list.js', 'type' => 'js', 'requires' => array( @@ -3063,7 +3054,7 @@ celerity_register_resource_map(array( ), 'phabricator-core-css' => array( - 'uri' => '/res/bb4b77f3/rsrc/css/core/core.css', + 'uri' => '/res/9e767fb1/rsrc/css/core/core.css', 'type' => 'css', 'requires' => array( @@ -3181,15 +3172,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/flag/flag.css', ), - 'phabricator-form-view-css' => - array( - 'uri' => '/res/ba05f8ba/rsrc/css/layout/phabricator-form-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/layout/phabricator-form-view.css', - ), 'phabricator-header-view-css' => array( 'uri' => '/res/da35cfa0/rsrc/css/layout/phabricator-header-view.css', @@ -3404,7 +3386,7 @@ celerity_register_resource_map(array( ), 'phabricator-remarkup-css' => array( - 'uri' => '/res/8531b6a1/rsrc/css/core/remarkup.css', + 'uri' => '/res/d0af3cab/rsrc/css/core/remarkup.css', 'type' => 'css', 'requires' => array( @@ -3443,7 +3425,7 @@ celerity_register_resource_map(array( ), 'phabricator-side-menu-view-css' => array( - 'uri' => '/res/f43a8365/rsrc/css/layout/phabricator-side-menu-view.css', + 'uri' => '/res/e83fbe58/rsrc/css/layout/phabricator-side-menu-view.css', 'type' => 'css', 'requires' => array( @@ -3766,7 +3748,7 @@ celerity_register_resource_map(array( ), 'phui-box-css' => array( - 'uri' => '/res/1b741073/rsrc/css/phui/phui-box.css', + 'uri' => '/res/8244305c/rsrc/css/phui/phui-box.css', 'type' => 'css', 'requires' => array( @@ -3802,13 +3784,22 @@ celerity_register_resource_map(array( ), 'phui-form-css' => array( - 'uri' => '/res/c02b6db7/rsrc/css/phui/phui-form.css', + 'uri' => '/res/8f33e95f/rsrc/css/phui/phui-form.css', 'type' => 'css', 'requires' => array( ), 'disk' => '/rsrc/css/phui/phui-form.css', ), + 'phui-form-view-css' => + array( + 'uri' => '/res/52025834/rsrc/css/phui/phui-form-view.css', + 'type' => 'css', + 'requires' => + array( + ), + 'disk' => '/rsrc/css/phui/phui-form-view.css', + ), 'phui-icon-view-css' => array( 'uri' => '/res/f78f4c64/rsrc/css/phui/phui-icon.css', @@ -3838,7 +3829,7 @@ celerity_register_resource_map(array( ), 'phui-remarkup-preview-css' => array( - 'uri' => '/res/4535e062/rsrc/css/phui/phui-remarkup-preview.css', + 'uri' => '/res/3cba9fbc/rsrc/css/phui/phui-remarkup-preview.css', 'type' => 'css', 'requires' => array( @@ -4081,7 +4072,7 @@ celerity_register_resource_map(array( ), 'sprite-gradient-css' => array( - 'uri' => '/res/af8d50a1/rsrc/css/sprite-gradient.css', + 'uri' => '/res/08c64fb3/rsrc/css/sprite-gradient.css', 'type' => 'css', 'requires' => array( @@ -4172,7 +4163,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '4a060444' => + '4c072d06' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4182,7 +4173,7 @@ celerity_register_resource_map(array( 2 => 'phui-button-css', 3 => 'phabricator-standard-page-view', 4 => 'aphront-dialog-view-css', - 5 => 'aphront-form-view-css', + 5 => 'phui-form-view-css', 6 => 'aphront-panel-view-css', 7 => 'aphront-table-view-css', 8 => 'aphront-tokenizer-control-css', @@ -4205,22 +4196,21 @@ celerity_register_resource_map(array( 25 => 'phabricator-notification-menu-css', 26 => 'lightbox-attachment-css', 27 => 'phabricator-header-view-css', - 28 => 'phabricator-form-view-css', - 29 => 'phabricator-filetree-view-css', - 30 => 'phabricator-nav-view-css', - 31 => 'phabricator-side-menu-view-css', - 32 => 'phabricator-crumbs-view-css', - 33 => 'phabricator-object-item-list-view-css', - 34 => 'global-drag-and-drop-css', - 35 => 'phui-spacing-css', - 36 => 'phui-form-css', - 37 => 'phui-icon-view-css', - 38 => 'phabricator-application-launch-view-css', - 39 => 'phabricator-action-list-view-css', - 40 => 'phabricator-property-list-view-css', - 41 => 'phabricator-tag-view-css', + 28 => 'phabricator-filetree-view-css', + 29 => 'phabricator-nav-view-css', + 30 => 'phabricator-side-menu-view-css', + 31 => 'phabricator-crumbs-view-css', + 32 => 'phabricator-object-item-list-view-css', + 33 => 'global-drag-and-drop-css', + 34 => 'phui-spacing-css', + 35 => 'phui-form-css', + 36 => 'phui-icon-view-css', + 37 => 'phabricator-application-launch-view-css', + 38 => 'phabricator-action-list-view-css', + 39 => 'phabricator-property-list-view-css', + 40 => 'phabricator-tag-view-css', ), - 'uri' => '/res/pkg/4a060444/core.pkg.css', + 'uri' => '/res/pkg/4c072d06/core.pkg.css', 'type' => 'css', ), '4f81c788' => @@ -4411,16 +4401,15 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-dialog-view-css' => '4a060444', - 'aphront-error-view-css' => '4a060444', - 'aphront-form-view-css' => '4a060444', - 'aphront-list-filter-view-css' => '4a060444', - 'aphront-pager-view-css' => '4a060444', - 'aphront-panel-view-css' => '4a060444', - 'aphront-table-view-css' => '4a060444', - 'aphront-tokenizer-control-css' => '4a060444', - 'aphront-tooltip-css' => '4a060444', - 'aphront-typeahead-control-css' => '4a060444', + 'aphront-dialog-view-css' => '4c072d06', + 'aphront-error-view-css' => '4c072d06', + 'aphront-list-filter-view-css' => '4c072d06', + 'aphront-pager-view-css' => '4c072d06', + 'aphront-panel-view-css' => '4c072d06', + 'aphront-table-view-css' => '4c072d06', + 'aphront-tokenizer-control-css' => '4c072d06', + 'aphront-tooltip-css' => '4c072d06', + 'aphront-typeahead-control-css' => '4c072d06', 'differential-changeset-view-css' => '09216861', 'differential-core-view-css' => '09216861', 'differential-inline-comment-editor' => 'd07a3bc2', @@ -4434,7 +4423,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '09216861', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '4a060444', + 'global-drag-and-drop-css' => '4c072d06', 'inline-comment-summary-css' => '09216861', 'javelin-aphlict' => '4f81c788', 'javelin-behavior' => '2dbbb7d1', @@ -4507,55 +4496,55 @@ celerity_register_resource_map(array( 'javelin-util' => '2dbbb7d1', 'javelin-vector' => '2dbbb7d1', 'javelin-workflow' => '2dbbb7d1', - 'lightbox-attachment-css' => '4a060444', + 'lightbox-attachment-css' => '4c072d06', 'maniphest-task-summary-css' => '06bacb9a', 'maniphest-transaction-detail-css' => '06bacb9a', - 'phabricator-action-list-view-css' => '4a060444', - 'phabricator-application-launch-view-css' => '4a060444', + 'phabricator-action-list-view-css' => '4c072d06', + 'phabricator-application-launch-view-css' => '4c072d06', 'phabricator-busy' => '4f81c788', 'phabricator-content-source-view-css' => '09216861', - 'phabricator-core-css' => '4a060444', - 'phabricator-crumbs-view-css' => '4a060444', + 'phabricator-core-css' => '4c072d06', + 'phabricator-crumbs-view-css' => '4c072d06', 'phabricator-drag-and-drop-file-upload' => 'd07a3bc2', 'phabricator-dropdown-menu' => '4f81c788', 'phabricator-file-upload' => '4f81c788', - 'phabricator-filetree-view-css' => '4a060444', - 'phabricator-flag-css' => '4a060444', - 'phabricator-form-view-css' => '4a060444', - 'phabricator-header-view-css' => '4a060444', + 'phabricator-filetree-view-css' => '4c072d06', + 'phabricator-flag-css' => '4c072d06', + 'phabricator-header-view-css' => '4c072d06', 'phabricator-hovercard' => '4f81c788', - 'phabricator-jump-nav' => '4a060444', + 'phabricator-jump-nav' => '4c072d06', 'phabricator-keyboard-shortcut' => '4f81c788', 'phabricator-keyboard-shortcut-manager' => '4f81c788', - 'phabricator-main-menu-view' => '4a060444', + 'phabricator-main-menu-view' => '4c072d06', 'phabricator-menu-item' => '4f81c788', - 'phabricator-nav-view-css' => '4a060444', + 'phabricator-nav-view-css' => '4c072d06', 'phabricator-notification' => '4f81c788', - 'phabricator-notification-css' => '4a060444', - 'phabricator-notification-menu-css' => '4a060444', - 'phabricator-object-item-list-view-css' => '4a060444', + 'phabricator-notification-css' => '4c072d06', + 'phabricator-notification-menu-css' => '4c072d06', + 'phabricator-object-item-list-view-css' => '4c072d06', 'phabricator-object-selector-css' => '09216861', 'phabricator-phtize' => '4f81c788', 'phabricator-prefab' => '4f81c788', 'phabricator-project-tag-css' => '06bacb9a', - 'phabricator-property-list-view-css' => '4a060444', - 'phabricator-remarkup-css' => '4a060444', + 'phabricator-property-list-view-css' => '4c072d06', + 'phabricator-remarkup-css' => '4c072d06', 'phabricator-shaped-request' => 'd07a3bc2', - 'phabricator-side-menu-view-css' => '4a060444', - 'phabricator-standard-page-view' => '4a060444', - 'phabricator-tag-view-css' => '4a060444', + 'phabricator-side-menu-view-css' => '4c072d06', + 'phabricator-standard-page-view' => '4c072d06', + 'phabricator-tag-view-css' => '4c072d06', 'phabricator-textareautils' => '4f81c788', 'phabricator-tooltip' => '4f81c788', - 'phabricator-transaction-view-css' => '4a060444', - 'phabricator-zindex-css' => '4a060444', - 'phui-button-css' => '4a060444', - 'phui-form-css' => '4a060444', - 'phui-icon-view-css' => '4a060444', - 'phui-spacing-css' => '4a060444', - 'sprite-apps-large-css' => '4a060444', - 'sprite-gradient-css' => '4a060444', - 'sprite-icons-css' => '4a060444', - 'sprite-menu-css' => '4a060444', - 'syntax-highlighting-css' => '4a060444', + 'phabricator-transaction-view-css' => '4c072d06', + 'phabricator-zindex-css' => '4c072d06', + 'phui-button-css' => '4c072d06', + 'phui-form-css' => '4c072d06', + 'phui-form-view-css' => '4c072d06', + 'phui-icon-view-css' => '4c072d06', + 'phui-spacing-css' => '4c072d06', + 'sprite-apps-large-css' => '4c072d06', + 'sprite-gradient-css' => '4c072d06', + 'sprite-icons-css' => '4c072d06', + 'sprite-menu-css' => '4c072d06', + 'syntax-highlighting-css' => '4c072d06', ), )); diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 1840909b64..d7d80a080c 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -38,7 +38,6 @@ phutil_register_library_map(array( 'AphrontFormFileControl' => 'view/form/control/AphrontFormFileControl.php', 'AphrontFormImageControl' => 'view/form/control/AphrontFormImageControl.php', 'AphrontFormInsetView' => 'view/form/AphrontFormInsetView.php', - 'AphrontFormLayoutView' => 'view/form/AphrontFormLayoutView.php', 'AphrontFormMarkupControl' => 'view/form/control/AphrontFormMarkupControl.php', 'AphrontFormPasswordControl' => 'view/form/control/AphrontFormPasswordControl.php', 'AphrontFormPolicyControl' => 'view/form/control/AphrontFormPolicyControl.php', @@ -737,8 +736,10 @@ phutil_register_library_map(array( 'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php', 'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php', 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', + 'PHUIFormBoxView' => 'view/form/PHUIFormBoxView.php', 'PHUIFormDividerControl' => 'view/form/control/PHUIFormDividerControl.php', 'PHUIFormFreeformDateControl' => 'view/form/control/PHUIFormFreeformDateControl.php', + 'PHUIFormLayoutView' => 'view/form/PHUIFormLayoutView.php', 'PHUIFormMultiSubmitControl' => 'view/form/control/PHUIFormMultiSubmitControl.php', 'PHUIFormPageView' => 'view/form/PHUIFormPageView.php', 'PHUIIconExample' => 'applications/uiexample/examples/PHUIIconExample.php', @@ -2069,7 +2070,6 @@ phutil_register_library_map(array( 'AphrontFormFileControl' => 'AphrontFormControl', 'AphrontFormImageControl' => 'AphrontFormControl', 'AphrontFormInsetView' => 'AphrontView', - 'AphrontFormLayoutView' => 'AphrontView', 'AphrontFormMarkupControl' => 'AphrontFormControl', 'AphrontFormPasswordControl' => 'AphrontFormControl', 'AphrontFormPolicyControl' => 'AphrontFormControl', @@ -2774,8 +2774,10 @@ phutil_register_library_map(array( 'PHUIDocumentView' => 'AphrontTagView', 'PHUIFeedStoryExample' => 'PhabricatorUIExample', 'PHUIFeedStoryView' => 'AphrontView', + 'PHUIFormBoxView' => 'AphrontView', 'PHUIFormDividerControl' => 'AphrontFormControl', 'PHUIFormFreeformDateControl' => 'AphrontFormControl', + 'PHUIFormLayoutView' => 'AphrontView', 'PHUIFormMultiSubmitControl' => 'AphrontFormControl', 'PHUIFormPageView' => 'AphrontView', 'PHUIIconExample' => 'PhabricatorUIExample', diff --git a/src/applications/audit/controller/PhabricatorAuditListController.php b/src/applications/audit/controller/PhabricatorAuditListController.php index ce2667dc78..41823d76a4 100644 --- a/src/applications/audit/controller/PhabricatorAuditListController.php +++ b/src/applications/audit/controller/PhabricatorAuditListController.php @@ -87,7 +87,6 @@ final class PhabricatorAuditListController extends PhabricatorAuditController { $form = new AphrontFormView(); $form->setUser($user); - $form->setNoShading(true); $show_status = false; $show_user = false; diff --git a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php index 9323ab5a93..cedf46bd33 100644 --- a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php +++ b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php @@ -49,7 +49,7 @@ final class PhabricatorAuthConfirmLinkController ->addCancelButton($panel_uri) ->addSubmitButton(pht('Confirm Account Link')); - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setFullWidth(true) ->appendChild( phutil_tag( diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php index 8ebc2a001d..71ba31657f 100644 --- a/src/applications/auth/controller/PhabricatorEmailLoginController.php +++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php @@ -116,7 +116,7 @@ EOBODY; $error_view->setErrors($errors); } - $email_auth = new AphrontFormLayoutView(); + $email_auth = new PHUIFormLayoutView(); $email_auth->appendChild($error_view); $email_auth ->setUser($request->getUser()) diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php index 37eb76ee06..1836e10153 100644 --- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php +++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php @@ -24,8 +24,6 @@ final class PhabricatorEmailVerificationController $user->getPHID(), $this->code); - $color = PhabricatorActionHeaderView::HEADER_DARK_GREY; - if (!$email) { $title = pht('Unable to Verify Email'); $content = pht( @@ -33,7 +31,6 @@ final class PhabricatorEmailVerificationController 'address has been removed, or the email address is owned by another '. 'user. Make sure you followed the link in the email correctly and are '. 'logged in with the user account associated with the email address.'); - $color = PhabricatorActionHeaderView::HEADER_RED; $continue = pht('Rats!'); } else if ($email->getIsVerified()) { $title = pht('Address Already Verified'); @@ -56,7 +53,6 @@ final class PhabricatorEmailVerificationController $dialog = id(new AphrontDialogView()) ->setUser($user) ->setTitle($title) - ->setHeaderColor($color) ->setMethod('GET') ->addCancelButton('/', $continue) ->appendChild($content); diff --git a/src/applications/auth/controller/config/PhabricatorAuthEditController.php b/src/applications/auth/controller/config/PhabricatorAuthEditController.php index 7ada830569..e96e16d3fe 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthEditController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthEditController.php @@ -202,7 +202,6 @@ final class PhabricatorAuthEditController $form = id(new AphrontFormView()) ->setUser($viewer) - ->setFlexible(true) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel(pht('Provider')) @@ -270,11 +269,15 @@ final class PhabricatorAuthEditController ->setTransactions($xactions); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($errors) + ->setForm($form); + return $this->buildApplicationPage( array( $crumbs, - $errors, - $form, + $form_box, $xaction_view, ), array( diff --git a/src/applications/auth/controller/config/PhabricatorAuthNewController.php b/src/applications/auth/controller/config/PhabricatorAuthNewController.php index 1c37f454cc..d285e7652a 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthNewController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthNewController.php @@ -81,6 +81,10 @@ final class PhabricatorAuthNewController ->addCancelButton($this->getApplicationURI()) ->setValue(pht('Continue'))); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Add Authentication Provider')) + ->setFormError($errors) + ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( @@ -90,8 +94,7 @@ final class PhabricatorAuthNewController return $this->buildApplicationPage( array( $crumbs, - $errors, - $form, + $form_box, ), array( 'title' => pht('Add Authentication Provider'), diff --git a/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php b/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php index deefb54bce..6b68b42493 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php +++ b/src/applications/auth/provider/PhabricatorAuthProviderLDAP.php @@ -104,7 +104,7 @@ final class PhabricatorAuthProviderLDAP $errors[] = pht('Username or password are incorrect.'); } - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setUser($viewer) ->setFullWidth(true) ->appendChild( diff --git a/src/applications/auth/provider/PhabricatorAuthProviderPassword.php b/src/applications/auth/provider/PhabricatorAuthProviderPassword.php index c56f8ea26f..dddcbc18cb 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderPassword.php +++ b/src/applications/auth/provider/PhabricatorAuthProviderPassword.php @@ -115,7 +115,7 @@ final class PhabricatorAuthProviderPassword $errors = id(new AphrontErrorView())->setErrors($errors); } - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setFullWidth(true) ->appendChild($errors) ->appendChild( diff --git a/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php b/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php index 342f364144..9548360b04 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php @@ -126,14 +126,13 @@ final class PhabricatorCalendarEditStatusController $dialog->setSubmitURI( $this->getApplicationURI('status/edit/'.$status->getID().'/')); } - $form = new AphrontFormLayoutView(); + $form = new PHUIFormLayoutView(); if ($error_view) { $form->appendChild($error_view); } } else { $form = id(new AphrontFormView()) - ->setUser($user) - ->setFlexible(true); + ->setUser($user); } $form @@ -164,14 +163,17 @@ final class PhabricatorCalendarEditStatusController } $form->appendChild($submit); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($page_title) + ->setFormError($error_view) + ->setForm($form); + $nav = $this->buildSideNavView($status); $nav->selectFilter($filter); $nav->appendChild( array( - id(new PhabricatorHeaderView())->setHeader($page_title), - $error_view, - $form, + $form_box, )); return $this->buildApplicationPage( diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php index d1aada812a..f668726df5 100644 --- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php +++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php @@ -150,7 +150,6 @@ final class PhabricatorChatLogChannelLogController ->setUser($user) ->setMethod('GET') ->setAction($uri) - ->setNoShading(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Date')) diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php index 57441044c0..075bca74e8 100644 --- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php +++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php @@ -69,7 +69,6 @@ final class PhabricatorConduitConsoleController ->setUser($request->getUser()) ->setAction('/api/'.$this->method) ->addHiddenInput('allowEmptyParams', 1) - ->setFlexible(true) ->appendChild( id(new AphrontFormStaticControl()) ->setLabel('Description') diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php index 3a1110200f..fec7f39c37 100644 --- a/src/applications/config/controller/PhabricatorConfigEditController.php +++ b/src/applications/config/controller/PhabricatorConfigEditController.php @@ -98,7 +98,6 @@ final class PhabricatorConfigEditController } $form = new AphrontFormView(); - $form->setFlexible(true); $error_view = null; if ($errors) { @@ -194,6 +193,11 @@ final class PhabricatorConfigEditController $title = pht('Edit %s', $this->key); $short = pht('Edit'); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( id(new PhabricatorCrumbView()) @@ -212,7 +216,6 @@ final class PhabricatorConfigEditController ->setName($this->key) ->setHref('/config/edit/'.$this->key)); - $xactions = id(new PhabricatorConfigTransactionQuery()) ->withObjectPHIDs(array($config_entry->getPHID())) ->setViewer($user) @@ -226,9 +229,7 @@ final class PhabricatorConfigEditController return $this->buildApplicationPage( array( $crumbs, - id(new PhabricatorHeaderView())->setHeader($title), - $error_view, - $form, + $form_box, $xaction_view, ), array( diff --git a/src/applications/conpherence/controller/ConpherenceNewController.php b/src/applications/conpherence/controller/ConpherenceNewController.php index 25efe8c938..b1a459e6c0 100644 --- a/src/applications/conpherence/controller/ConpherenceNewController.php +++ b/src/applications/conpherence/controller/ConpherenceNewController.php @@ -74,7 +74,7 @@ final class ConpherenceNewController extends ConpherenceController { ->addCancelButton($cancel_uri) ->addSubmitButton(pht('Send Message')); - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setUser($user) ->setFullWidth(true) ->appendChild( diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php index 92e0237fba..e92defbc74 100644 --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -181,7 +181,7 @@ final class ConpherenceUpdateController $user = $request->getUser(); $add_person = $request->getStr('add_person'); - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setUser($user) ->setFullWidth(true) ->appendChild( @@ -222,7 +222,6 @@ final class ConpherenceUpdateController require_celerity_resource('conpherence-update-css'); return id(new AphrontDialogView()) ->setTitle(pht('Remove Participants')) - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED) ->addHiddenInput('action', 'remove_person') ->addHiddenInput('__continue__', true) ->addHiddenInput('remove_person', $remove_person) @@ -233,7 +232,7 @@ final class ConpherenceUpdateController ConpherenceThread $conpherence, $error_view) { - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->appendChild($error_view) ->appendChild( id(new AphrontFormTextControl()) diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php index c65901edb0..d57f7de89c 100644 --- a/src/applications/conpherence/controller/ConpherenceViewController.php +++ b/src/applications/conpherence/controller/ConpherenceViewController.php @@ -137,7 +137,6 @@ final class ConpherenceViewController extends $form = id(new AphrontFormView()) ->setAction($update_uri) - ->setFlexible(true) ->addSigil('conpherence-pontificate') ->setWorkflow(true) ->setUser($user) diff --git a/src/applications/countdown/controller/PhabricatorCountdownEditController.php b/src/applications/countdown/controller/PhabricatorCountdownEditController.php index 77cb811ba7..4e38326525 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownEditController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownEditController.php @@ -17,6 +17,7 @@ final class PhabricatorCountdownEditController $user = $request->getUser(); if ($this->id) { + $page_title = pht('Edit Countdown'); $countdown = id(new PhabricatorCountdownQuery()) ->setViewer($user) ->withIDs(array($this->id)) @@ -32,6 +33,7 @@ final class PhabricatorCountdownEditController return new Aphront404Response(); } } else { + $page_title = pht('Create Countdown'); $countdown = new PhabricatorCountdown(); $countdown->setEpoch(time()); } @@ -108,7 +110,6 @@ final class PhabricatorCountdownEditController $form = id(new AphrontFormView()) ->setUser($user) ->setAction($request->getRequestURI()->getPath()) - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Title')) @@ -127,15 +128,18 @@ final class PhabricatorCountdownEditController ->addCancelButton($cancel_uri) ->setValue($submit_label)); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($page_title) + ->setFormError($error_view) + ->setForm($form); return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, ), array( - 'title' => pht('Edit Countdown'), + 'title' => $page_title, 'device' => true, )); } diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php index 20e8f87b58..43755857d3 100644 --- a/src/applications/differential/controller/DifferentialDiffCreateController.php +++ b/src/applications/differential/controller/DifferentialDiffCreateController.php @@ -41,7 +41,6 @@ final class DifferentialDiffCreateController extends DifferentialController { } $form = new AphrontFormView(); - $form->setFlexible(true); $arcanist_href = PhabricatorEnv::getDoclink( 'article/Arcanist_User_Guide.html'); $arcanist_link = phutil_tag( @@ -83,6 +82,11 @@ final class DifferentialDiffCreateController extends DifferentialController { ->addCancelButton($cancel_uri) ->setValue(pht("Create Diff"))); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Create New Diff')) + ->setFormError($errors) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( id(new PhabricatorCrumbView()) @@ -96,8 +100,7 @@ final class DifferentialDiffCreateController extends DifferentialController { return $this->buildApplicationPage( array( $crumbs, - $errors, - $form + $form_box, ), array( 'title' => pht('Create Diff'), diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php index 346927e909..cb2fd99e01 100644 --- a/src/applications/differential/controller/DifferentialDiffViewController.php +++ b/src/applications/differential/controller/DifferentialDiffViewController.php @@ -72,7 +72,6 @@ final class DifferentialDiffViewController extends DifferentialController { ->setAction('/differential/revision/edit/') ->addHiddenInput('diffID', $diff->getID()) ->addHiddenInput('viaDiffView', 1) - ->setFlexible(true) ->appendRemarkupInstructions( pht( 'Review the diff for correctness. When you are satisfied, either '. diff --git a/src/applications/differential/controller/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php index bda7093d5d..e31a15deef 100644 --- a/src/applications/differential/controller/DifferentialRevisionEditController.php +++ b/src/applications/differential/controller/DifferentialRevisionEditController.php @@ -114,7 +114,6 @@ final class DifferentialRevisionEditController extends DifferentialController { $form = new AphrontFormView(); $form->setUser($request->getUser()); - $form->setFlexible(true); if ($diff) { $form->addHiddenInput('diffID', $diff->getID()); } diff --git a/src/applications/differential/view/DifferentialAddCommentView.php b/src/applications/differential/view/DifferentialAddCommentView.php index 06e7200a01..b17a0f7ea5 100644 --- a/src/applications/differential/view/DifferentialAddCommentView.php +++ b/src/applications/differential/view/DifferentialAddCommentView.php @@ -70,8 +70,8 @@ final class DifferentialAddCommentView extends AphrontView { $form = new AphrontFormView(); $form ->setWorkflow(true) - ->setFlexible(true) ->setUser($this->user) + ->setShaded(true) ->setAction($this->actionURI) ->addHiddenInput('revision_id', $revision->getID()) ->appendChild( diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php index 7fac6961a3..822b1c5650 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -132,8 +132,7 @@ final class DiffusionBrowseController extends DiffusionController { $drequest = $this->getDiffusionRequest(); $form = id(new AphrontFormView()) ->setUser($this->getRequest()->getUser()) - ->setMethod('GET') - ->setNoShading(true); + ->setMethod('GET'); switch ($drequest->getRepository()->getVersionControlSystem()) { case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: diff --git a/src/applications/diffusion/controller/DiffusionCommitEditController.php b/src/applications/diffusion/controller/DiffusionCommitEditController.php index c798cc89fb..52471ed69d 100644 --- a/src/applications/diffusion/controller/DiffusionCommitEditController.php +++ b/src/applications/diffusion/controller/DiffusionCommitEditController.php @@ -55,7 +55,6 @@ final class DiffusionCommitEditController extends DiffusionController { $form = id(new AphrontFormView()) ->setUser($user) ->setAction($request->getRequestURI()->getPath()) - ->setFlexible(true) ->appendChild( id(new AphrontFormTokenizerControl()) ->setLabel(pht('Projects')) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php index 3bce3b2763..ef4507995e 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php @@ -83,7 +83,6 @@ final class DiffusionRepositoryEditBasicController extends DiffusionController { $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setName('name') diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php index 56d0441045..ec9bf7a78e 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php @@ -74,7 +74,6 @@ final class DiffusionRepositoryEditEncodingController $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendRemarkupInstructions($this->getEncodingInstructions()) ->appendChild( id(new AphrontFormTextControl()) diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php index d78a093270..010bd6a3c2 100644 --- a/src/applications/files/controller/PhabricatorFileUploadController.php +++ b/src/applications/files/controller/PhabricatorFileUploadController.php @@ -76,17 +76,15 @@ final class PhabricatorFileUploadController extends PhabricatorFileController { $global_upload = id(new PhabricatorGlobalUploadTargetView()) ->setShowIfSupportedID($support_id); - $panel = new AphrontPanelView(); - $panel->setHeader(pht('New File Upload')); - $panel->setNoBackground(); - $panel->appendChild($form); - $panel->setWidth(AphrontPanelView::WIDTH_FORM); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($errors) + ->setForm($form); return $this->buildApplicationPage( array( $crumbs, - $errors, - $panel, + $form_box, $global_upload, ), array( diff --git a/src/applications/flag/controller/PhabricatorFlagEditController.php b/src/applications/flag/controller/PhabricatorFlagEditController.php index 110d82b2b3..e9f56bf12d 100644 --- a/src/applications/flag/controller/PhabricatorFlagEditController.php +++ b/src/applications/flag/controller/PhabricatorFlagEditController.php @@ -46,7 +46,7 @@ final class PhabricatorFlagEditController extends PhabricatorFlagController { require_celerity_resource('phabricator-flag-css'); - $form = new AphrontFormLayoutView(); + $form = new PHUIFormLayoutView(); $is_new = !$flag->getID(); diff --git a/src/applications/herald/controller/HeraldDeleteController.php b/src/applications/herald/controller/HeraldDeleteController.php index 47fb857849..3abc9dc1eb 100644 --- a/src/applications/herald/controller/HeraldDeleteController.php +++ b/src/applications/herald/controller/HeraldDeleteController.php @@ -43,7 +43,6 @@ final class HeraldDeleteController extends HeraldController { $dialog = new AphrontDialogView(); $dialog->setUser($request->getUser()); $dialog->setTitle(pht('Really delete this rule?')); - $dialog->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED); $dialog->appendChild(pht( "Are you sure you want to delete the rule: %s?", $rule->getName())); diff --git a/src/applications/herald/controller/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php index 2cb59ee912..c14a929edf 100644 --- a/src/applications/herald/controller/HeraldNewController.php +++ b/src/applications/herald/controller/HeraldNewController.php @@ -57,7 +57,6 @@ final class HeraldNewController extends HeraldController { $form = id(new AphrontFormView()) ->setUser($user) ->setAction('/herald/edit/') - ->setFlexible(true) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel(pht('New Rule for')) @@ -70,6 +69,10 @@ final class HeraldNewController extends HeraldController { ->setValue(pht('Create Rule')) ->addCancelButton($this->getApplicationURI())); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Create Herald Rule')) + ->setForm($form); + $crumbs = $this ->buildApplicationCrumbs() ->addCrumb( @@ -79,7 +82,7 @@ final class HeraldNewController extends HeraldController { return $this->buildApplicationPage( array( $crumbs, - $form, + $form_box, ), array( 'title' => pht('Create Herald Rule'), diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php index e4c31e764f..51edfa98d1 100644 --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -182,6 +182,11 @@ final class HeraldRuleController extends HeraldController { ? pht('Edit Herald Rule') : pht('Create Herald Rule'); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this ->buildApplicationCrumbs() ->addCrumb( @@ -191,8 +196,7 @@ final class HeraldRuleController extends HeraldController { return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, ), array( 'title' => pht('Edit Rule'), diff --git a/src/applications/legalpad/controller/LegalpadDocumentEditController.php b/src/applications/legalpad/controller/LegalpadDocumentEditController.php index ed686aaf32..df03f9db82 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentEditController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentEditController.php @@ -113,7 +113,6 @@ final class LegalpadDocumentEditController extends LegalpadController { } $form = id(new AphrontFormView()) - ->setFlexible(true) ->setUser($user) ->appendChild( id(new AphrontFormTextControl()) @@ -168,6 +167,11 @@ final class LegalpadDocumentEditController extends LegalpadController { $form ->appendChild($submit); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs($this->buildSideNav()); $crumbs->addCrumb( id(new PhabricatorCrumbView())->setName($short)); @@ -182,8 +186,7 @@ final class LegalpadDocumentEditController extends LegalpadController { return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, $preview ), array( diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php index 946e4fb5a5..59be4de1d9 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php @@ -177,7 +177,6 @@ final class LegalpadDocumentSignController extends LegalpadController { $data = $signature->getSignatureData(); $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormInsetView()) ->setTitle(pht('Sign and Agree')) diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php index 9e78339e8b..50267bcc5e 100644 --- a/src/applications/macro/controller/PhabricatorMacroEditController.php +++ b/src/applications/macro/controller/PhabricatorMacroEditController.php @@ -153,7 +153,6 @@ final class PhabricatorMacroEditController $form ->setEncType('multipart/form-data') - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Name')) @@ -239,7 +238,6 @@ final class PhabricatorMacroEditController ->setHeader(pht('Upload New File')); $upload_form = id(new AphrontFormView()) - ->setFlexible(true) ->setEncType('multipart/form-data') ->setUser($request->getUser()); @@ -263,11 +261,15 @@ final class PhabricatorMacroEditController $upload = array($upload_header, $upload_form); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, $upload, ), array( diff --git a/src/applications/macro/controller/PhabricatorMacroMemeDialogController.php b/src/applications/macro/controller/PhabricatorMacroMemeDialogController.php index 970cee1a65..4fd9259bb8 100644 --- a/src/applications/macro/controller/PhabricatorMacroMemeDialogController.php +++ b/src/applications/macro/controller/PhabricatorMacroMemeDialogController.php @@ -44,7 +44,7 @@ final class PhabricatorMacroMemeDialogController } } - $view = id(new AphrontFormLayoutView()) + $view = id(new PHUIFormLayoutView()) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Macro')) diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php index ef346d086e..c7397306bb 100644 --- a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php +++ b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php @@ -14,6 +14,7 @@ final class PhabricatorMailingListsEditController $viewer = $request->getUser(); if ($this->id) { + $page_title = pht('Edit Mailing List'); $list = id(new PhabricatorMailingListQuery()) ->setViewer($viewer) ->withIDs(array($this->id)) @@ -22,6 +23,7 @@ final class PhabricatorMailingListsEditController return new Aphront404Response(); } } else { + $page_title = pht('Create Mailing List'); $list = new PhabricatorMetaMTAMailingList(); } @@ -124,14 +126,18 @@ final class PhabricatorMailingListsEditController ->setName(pht('Create Mailing List'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($page_title) + ->setFormError($error_view) + ->setForm($form); + return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, ), array( - 'title' => pht('Edit Mailing List'), + 'title' => $page_title, 'device' => true, )); } diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php index e1ea54c964..effb2220d2 100644 --- a/src/applications/maniphest/controller/ManiphestExportController.php +++ b/src/applications/maniphest/controller/ManiphestExportController.php @@ -76,7 +76,7 @@ final class ManiphestExportController extends ManiphestController { $dialog->appendChild(phutil_tag('p', array(), pht( 'Do you want to export the query results to Excel?'))); - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel(pht('Format:')) diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index 1029f2655a..9bbef02099 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -198,6 +198,7 @@ final class ManiphestTaskDetailController extends ManiphestController { $comment_form = new AphrontFormView(); $comment_form ->setUser($user) + ->setShaded(true) ->setAction('/maniphest/transaction/save/') ->setEncType('multipart/form-data') ->addHiddenInput('taskID', $task->getID()) diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php index 3cf3de58c6..8283cf13ec 100644 --- a/src/applications/maniphest/controller/ManiphestTaskEditController.php +++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php @@ -381,10 +381,9 @@ final class ManiphestTaskEditController extends ManiphestController { $project_tokenizer_id = celerity_generate_unique_node_id(); if ($request->isAjax()) { - $form = new AphrontFormLayoutView(); + $form = new PHUIFormLayoutView(); } else { $form = new AphrontFormView(); - $form->setFlexible(true); $form ->setUser($user) ->addHiddenInput('template', $template_id); @@ -536,6 +535,11 @@ final class ManiphestTaskEditController extends ManiphestController { ->addCancelButton($cancel_uri) ->setValue($button_name)); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($header_name) + ->setFormError($error_view) + ->setForm($form); + $preview = id(new PHUIRemarkupPreviewPanel()) ->setHeader(pht('Description Preview')) ->setControlID('description-textarea') @@ -561,8 +565,7 @@ final class ManiphestTaskEditController extends ManiphestController { return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, $preview, ), array( diff --git a/src/applications/maniphest/controller/ManiphestTaskListController.php b/src/applications/maniphest/controller/ManiphestTaskListController.php index 08d11af402..f2f6893f0f 100644 --- a/src/applications/maniphest/controller/ManiphestTaskListController.php +++ b/src/applications/maniphest/controller/ManiphestTaskListController.php @@ -124,7 +124,6 @@ final class ManiphestTaskListController extends ManiphestController { $form = id(new AphrontFormView()) ->setUser($user) - ->setNoShading(true) ->setAction( $request->getRequestURI() ->alter('key', null) diff --git a/src/applications/owners/controller/PhabricatorOwnersDeleteController.php b/src/applications/owners/controller/PhabricatorOwnersDeleteController.php index f3f80b777a..dd1cf89b59 100644 --- a/src/applications/owners/controller/PhabricatorOwnersDeleteController.php +++ b/src/applications/owners/controller/PhabricatorOwnersDeleteController.php @@ -29,7 +29,6 @@ final class PhabricatorOwnersDeleteController $dialog = id(new AphrontDialogView()) ->setUser($user) ->setTitle('Really delete this package?') - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED) ->appendChild(hsprintf( '

%s

', $text)) diff --git a/src/applications/owners/controller/PhabricatorOwnersEditController.php b/src/applications/owners/controller/PhabricatorOwnersEditController.php index a87b20fbd4..d10a202f36 100644 --- a/src/applications/owners/controller/PhabricatorOwnersEditController.php +++ b/src/applications/owners/controller/PhabricatorOwnersEditController.php @@ -181,7 +181,6 @@ final class PhabricatorOwnersEditController $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Name')) @@ -252,13 +251,13 @@ final class PhabricatorOwnersEditController ->addCancelButton($cancel_uri) ->setValue(pht('Save Package'))); - $header = id(new PhabricatorHeaderView()) - ->setHeader($title); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); $nav = $this->buildSideNavView(); - $nav->appendChild($error_view); - $nav->appendChild($header); - $nav->appendChild($form); + $nav->appendChild($form_box); return $this->buildApplicationPage( array( diff --git a/src/applications/owners/controller/PhabricatorOwnersListController.php b/src/applications/owners/controller/PhabricatorOwnersListController.php index 7783d141d9..1a3bc58f6d 100644 --- a/src/applications/owners/controller/PhabricatorOwnersListController.php +++ b/src/applications/owners/controller/PhabricatorOwnersListController.php @@ -168,7 +168,6 @@ final class PhabricatorOwnersListController ->setUser($user) ->setAction('/owners/view/search/') ->setMethod('GET') - ->setNoShading(true) ->appendChild( id(new AphrontFormTextControl()) ->setName('name') diff --git a/src/applications/paste/controller/PhabricatorPasteEditController.php b/src/applications/paste/controller/PhabricatorPasteEditController.php index 1fd64e01f1..78865671aa 100644 --- a/src/applications/paste/controller/PhabricatorPasteEditController.php +++ b/src/applications/paste/controller/PhabricatorPasteEditController.php @@ -131,7 +131,6 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController { } $form = new AphrontFormView(); - $form->setFlexible(true); $langs = array( '' => pht('(Detect From Filename in Title)'), @@ -200,12 +199,16 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController { $short = pht('Edit'); } else { $submit->setValue(pht('Create Paste')); - $title = pht('Create Paste'); + $title = pht('Create New Paste'); $short = pht('Create'); } - $form - ->appendChild($submit); + $form->appendChild($submit); + + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); if (!$is_create) { @@ -220,9 +223,7 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController { return $this->buildApplicationPage( array( $crumbs, - id(new PhabricatorHeaderView())->setHeader($title), - $error_view, - $form, + $form_box, ), array( 'title' => $title, diff --git a/src/applications/people/controller/PhabricatorPeopleEditController.php b/src/applications/people/controller/PhabricatorPeopleEditController.php index 4b060b2488..0adcf35395 100644 --- a/src/applications/people/controller/PhabricatorPeopleEditController.php +++ b/src/applications/people/controller/PhabricatorPeopleEditController.php @@ -343,14 +343,18 @@ final class PhabricatorPeopleEditController id(new AphrontFormSubmitControl()) ->setValue(pht('Save'))); - $header = new PhabricatorHeaderView(); if ($user->getID()) { - $header->setHeader(pht('Edit User')); + $title = pht('Edit User'); } else { - $header->setHeader(pht('Create New User')); + $title = pht('Create New User'); } - return array($error_view, $form); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + + return array($form_box); } private function processRoleRequest(PhabricatorUser $user) { @@ -448,10 +452,14 @@ final class PhabricatorPeopleEditController ->setValue(pht('Edit Role'))); } - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Edit Role')); + $title = pht('Edit Role'); - return array($error_view, $header, $form); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + + return array($form_box); } private function processCertificateRequest($user) { @@ -486,10 +494,13 @@ final class PhabricatorPeopleEditController pht('You may only view the certificates of System Agents.'))); } - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Conduit Certificate')); + $title = pht('Conduit Certificate'); - return array($header, $form); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setForm($form); + + return array($form_box); } private function processRenameRequest(PhabricatorUser $user) { @@ -581,10 +592,12 @@ final class PhabricatorPeopleEditController id(new AphrontFormSubmitControl()) ->setValue(pht('Change Username'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Change Username')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Change Username')) + ->setFormError($errors) + ->setForm($form); - return array($errors, $header, $form); + return array($form_box); } private function processDeleteRequest(PhabricatorUser $user) { @@ -672,10 +685,12 @@ final class PhabricatorPeopleEditController id(new AphrontFormSubmitControl()) ->setValue(pht('Delete User'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Delete User')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Delete User')) + ->setFormError($errors) + ->setForm($form); - return array($errors, $header, $form); + return array($form_box); } private function getRoleInstructions() { diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php index 30efa91078..675512c63b 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php @@ -74,10 +74,14 @@ final class PhabricatorPeopleProfileEditController ->addCancelButton($profile_uri) ->setValue(pht('Save Profile'))); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Edit Your Profile')) + ->setForm($form); + return $this->buildApplicationPage( array( $crumbs, - $form, + $form_box, ), array( 'title' => $title, diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php index 0631e5fe13..7c3ffe2b27 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php @@ -98,7 +98,7 @@ final class PhabricatorPeopleProfilePictureController id(new PhabricatorCrumbView()) ->setName($title)); - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setUser($viewer); $default_image = PhabricatorFile::loadBuiltin($viewer, 'profile.png'); @@ -265,7 +265,6 @@ final class PhabricatorPeopleProfilePictureController $upload_form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->setEncType('multipart/form-data') ->appendChild( id(new AphrontFormFileControl()) diff --git a/src/applications/phame/controller/blog/PhameBlogDeleteController.php b/src/applications/phame/controller/blog/PhameBlogDeleteController.php index 4290681085..e6d9b4dff6 100644 --- a/src/applications/phame/controller/blog/PhameBlogDeleteController.php +++ b/src/applications/phame/controller/blog/PhameBlogDeleteController.php @@ -38,7 +38,6 @@ final class PhameBlogDeleteController extends PhameController { $dialog = id(new AphrontDialogView()) ->setUser($user) ->setTitle(pht('Delete Blog?')) - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED) ->appendChild( pht( 'Really delete the blog "%s"? It will be gone forever.', diff --git a/src/applications/phame/controller/blog/PhameBlogEditController.php b/src/applications/phame/controller/blog/PhameBlogEditController.php index 133632b458..58a6725e4b 100644 --- a/src/applications/phame/controller/blog/PhameBlogEditController.php +++ b/src/applications/phame/controller/blog/PhameBlogEditController.php @@ -107,7 +107,6 @@ final class PhameBlogEditController $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Name')) @@ -171,6 +170,11 @@ final class PhameBlogEditController $error_view = null; } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($page_title) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( id(new PhabricatorCrumbView()) @@ -182,8 +186,7 @@ final class PhameBlogEditController $nav->appendChild( array( $crumbs, - $error_view, - $form, + $form_box, )); return $this->buildApplicationPage( diff --git a/src/applications/phame/controller/post/PhamePostDeleteController.php b/src/applications/phame/controller/post/PhamePostDeleteController.php index 6baa5fe8e1..8faa715a5e 100644 --- a/src/applications/phame/controller/post/PhamePostDeleteController.php +++ b/src/applications/phame/controller/post/PhamePostDeleteController.php @@ -38,7 +38,6 @@ final class PhamePostDeleteController extends PhameController { $dialog = id(new AphrontDialogView()) ->setUser($user) ->setTitle(pht('Delete Post?')) - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED) ->appendChild( pht( 'Really delete the post "%s"? It will be gone forever.', diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php index 835b630ed0..39cdc8e720 100644 --- a/src/applications/phame/controller/post/PhamePostEditController.php +++ b/src/applications/phame/controller/post/PhamePostEditController.php @@ -100,7 +100,6 @@ final class PhamePostEditController $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->addHiddenInput('blog', $request->getInt('blog')) ->appendChild( id(new AphrontFormMarkupControl()) @@ -174,6 +173,11 @@ final class PhamePostEditController $error_view = null; } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($page_title) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( id(new PhabricatorCrumbView()) @@ -184,8 +188,7 @@ final class PhamePostEditController $nav->appendChild( array( $crumbs, - $error_view, - $form, + $form_box, $preview_panel, )); diff --git a/src/applications/phame/controller/post/PhamePostNewController.php b/src/applications/phame/controller/post/PhamePostNewController.php index e335f36190..bfc69fbea6 100644 --- a/src/applications/phame/controller/post/PhamePostNewController.php +++ b/src/applications/phame/controller/post/PhamePostNewController.php @@ -94,7 +94,6 @@ final class PhamePostNewController extends PhameController { $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel(pht('Blog')) @@ -117,7 +116,12 @@ final class PhamePostNewController extends PhameController { ->setValue(pht('Continue'))); } - $nav->appendChild($form); + + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setForm($form); + + $nav->appendChild($form_box); } return $this->buildApplicationPage( diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php index dc657e3b75..7d24c845ca 100644 --- a/src/applications/phame/controller/post/PhamePostPublishController.php +++ b/src/applications/phame/controller/post/PhamePostPublishController.php @@ -42,7 +42,6 @@ final class PhamePostPublishController extends PhameController { $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormSubmitControl()) ->setValue(pht('Publish Post')) diff --git a/src/applications/phlux/controller/PhluxEditController.php b/src/applications/phlux/controller/PhluxEditController.php index 38ab9da6ff..4c57f52ae6 100644 --- a/src/applications/phlux/controller/PhluxEditController.php +++ b/src/applications/phlux/controller/PhluxEditController.php @@ -176,15 +176,15 @@ final class PhluxEditController extends PhluxController { ->setHref($request->getRequestURI())); } - $header = id(new PhabricatorHeaderView()) - ->setHeader($title); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($errors) + ->setForm($form); return $this->buildApplicationPage( array( $crumbs, - $header, - $errors, - $form, + $form_box, ), array( 'title' => $title, diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php index e5b6ce464a..ad924c2690 100644 --- a/src/applications/pholio/controller/PholioMockEditController.php +++ b/src/applications/pholio/controller/PholioMockEditController.php @@ -285,7 +285,6 @@ final class PholioMockEditController extends PholioController { require_celerity_resource('pholio-edit-css'); $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild($order_control) ->appendChild( id(new AphrontFormTextControl()) @@ -322,6 +321,11 @@ final class PholioMockEditController extends PholioController { ->setError($e_images)) ->appendChild($submit); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( id(new PhabricatorCrumbView()) @@ -330,8 +334,7 @@ final class PholioMockEditController extends PholioController { $content = array( $crumbs, - $error_view, - $form, + $form_box, ); return $this->buildApplicationPage( diff --git a/src/applications/phortune/controller/PhortuneAccountBuyController.php b/src/applications/phortune/controller/PhortuneAccountBuyController.php index 3937edbb0e..de0c6ae859 100644 --- a/src/applications/phortune/controller/PhortuneAccountBuyController.php +++ b/src/applications/phortune/controller/PhortuneAccountBuyController.php @@ -160,9 +160,7 @@ final class PhortuneAccountBuyController $user); } - $provider_form = id(new AphrontFormLayoutView()) - ->setPadded(true) - ->setBackgroundShading(true); + $provider_form = new PHUIFormLayoutView(); $provider_form->appendChild( id(new AphrontFormMarkupControl()) ->setLabel('Pay With') diff --git a/src/applications/phrequent/controller/PhrequentListController.php b/src/applications/phrequent/controller/PhrequentListController.php index cdce5310ea..3c9724c1c7 100644 --- a/src/applications/phrequent/controller/PhrequentListController.php +++ b/src/applications/phrequent/controller/PhrequentListController.php @@ -144,7 +144,6 @@ final class PhrequentListController extends PhrequentController { $form = id(new AphrontFormView()) ->setUser($user) - ->setNoShading(true) ->setAction($this->getApplicationURI("/view/custom/")); $user_handles = id(new PhabricatorObjectHandleData($user_phids)) diff --git a/src/applications/phriction/controller/PhrictionDeleteController.php b/src/applications/phriction/controller/PhrictionDeleteController.php index 6df2dab66e..9988470f18 100644 --- a/src/applications/phriction/controller/PhrictionDeleteController.php +++ b/src/applications/phriction/controller/PhrictionDeleteController.php @@ -50,7 +50,6 @@ final class PhrictionDeleteController extends PhrictionController { $dialog = id(new AphrontDialogView()) ->setUser($user) ->setTitle(pht('Delete Document?')) - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED) ->appendChild( pht('Really delete this document? You can recover it later by '. 'reverting to a previous version.')) diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php index 7ff2bd3916..77daf426cf 100644 --- a/src/applications/phriction/controller/PhrictionEditController.php +++ b/src/applications/phriction/controller/PhrictionEditController.php @@ -226,8 +226,10 @@ final class PhrictionEditController ->addCancelButton($cancel_uri) ->setValue($submit_button)); - $header = id(new PhabricatorHeaderView()) - ->setHeader($panel_header); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Edit Document')) + ->setFormError($error_view) + ->setForm($form); $preview = id(new PHUIRemarkupPreviewPanel()) ->setHeader(pht('Document Preview')) @@ -254,8 +256,7 @@ final class PhrictionEditController array( $crumbs, $draft_note, - $error_view, - $form, + $form_box, $preview, ), array( diff --git a/src/applications/phriction/controller/PhrictionMoveController.php b/src/applications/phriction/controller/PhrictionMoveController.php index 93981b7b22..b870c48d33 100644 --- a/src/applications/phriction/controller/PhrictionMoveController.php +++ b/src/applications/phriction/controller/PhrictionMoveController.php @@ -118,7 +118,7 @@ final class PhrictionMoveController $descr_caption = $is_serious ? pht('A reason for the move.') : pht('You better give a good reason for this.'); - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->setUser($user) ->appendChild( id(new AphrontFormStaticControl()) diff --git a/src/applications/phriction/controller/PhrictionNewController.php b/src/applications/phriction/controller/PhrictionNewController.php index 1d9a3b5b82..0497600ba5 100644 --- a/src/applications/phriction/controller/PhrictionNewController.php +++ b/src/applications/phriction/controller/PhrictionNewController.php @@ -44,7 +44,7 @@ final class PhrictionNewController extends PhrictionController { $slug = ''; } - $view = id(new AphrontFormLayoutView()) + $view = id(new PHUIFormLayoutView()) ->appendChild(id(new AphrontFormTextControl()) ->setLabel('/w/') ->setValue($slug) diff --git a/src/applications/ponder/controller/PonderAnswerEditController.php b/src/applications/ponder/controller/PonderAnswerEditController.php index b25252fdd9..aa684801f4 100644 --- a/src/applications/ponder/controller/PonderAnswerEditController.php +++ b/src/applications/ponder/controller/PonderAnswerEditController.php @@ -95,6 +95,11 @@ final class PonderAnswerEditController extends PonderController { id(new PhabricatorCrumbView()) ->setName(pht('Edit Answer'))); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Edit Answer')) + ->setFormError($errors) + ->setForm($form); + $preview = id(new PHUIRemarkupPreviewPanel()) ->setHeader(pht('Answer Preview')) ->setControlID($answer_content_id) @@ -103,8 +108,7 @@ final class PonderAnswerEditController extends PonderController { return $this->buildApplicationPage( array( $crumbs, - $errors, - $form, + $form_box, $preview, ), array( diff --git a/src/applications/ponder/controller/PonderQuestionEditController.php b/src/applications/ponder/controller/PonderQuestionEditController.php index 2a7a8c759d..f5661eec6d 100644 --- a/src/applications/ponder/controller/PonderQuestionEditController.php +++ b/src/applications/ponder/controller/PonderQuestionEditController.php @@ -85,7 +85,6 @@ final class PonderQuestionEditController extends PonderController { $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Question')) @@ -109,6 +108,11 @@ final class PonderQuestionEditController extends PonderController { ->setControlID('content') ->setPreviewURI($this->getApplicationURI('preview/')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Ask New Question')) + ->setFormError($error_view) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $id = $question->getID(); @@ -129,12 +133,11 @@ final class PonderQuestionEditController extends PonderController { return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, $preview, ), array( - 'title' => pht('Ask a Question'), + 'title' => pht('Ask New Question'), 'device' => true, )); } diff --git a/src/applications/ponder/view/PonderAddAnswerView.php b/src/applications/ponder/view/PonderAddAnswerView.php index a5fb0109a4..5980f414b6 100644 --- a/src/applications/ponder/view/PonderAddAnswerView.php +++ b/src/applications/ponder/view/PonderAddAnswerView.php @@ -26,7 +26,6 @@ final class PonderAddAnswerView extends AphrontView { $form = new AphrontFormView(); $form - ->setFlexible(true) ->setUser($this->user) ->setAction($this->actionURI) ->setWorkflow(true) diff --git a/src/applications/project/controller/PhabricatorProjectCreateController.php b/src/applications/project/controller/PhabricatorProjectCreateController.php index 899d94eb27..388ac23b86 100644 --- a/src/applications/project/controller/PhabricatorProjectCreateController.php +++ b/src/applications/project/controller/PhabricatorProjectCreateController.php @@ -68,7 +68,7 @@ final class PhabricatorProjectCreateController } if ($request->isAjax()) { - $form = new AphrontFormLayoutView(); + $form = new PHUIFormLayoutView(); } else { $form = new AphrontFormView(); $form->setUser($user); @@ -113,11 +113,15 @@ final class PhabricatorProjectCreateController ->setName(pht('Create Project')) ->setHref($this->getApplicationURI().'create/')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Create New Project')) + ->setFormError($error_view) + ->setForm($form); + return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, ), array( 'title' => pht('Create New Project'), diff --git a/src/applications/project/controller/PhabricatorProjectMembersEditController.php b/src/applications/project/controller/PhabricatorProjectMembersEditController.php index f4448877a7..a96d9ff099 100644 --- a/src/applications/project/controller/PhabricatorProjectMembersEditController.php +++ b/src/applications/project/controller/PhabricatorProjectMembersEditController.php @@ -91,7 +91,6 @@ final class PhabricatorProjectMembersEditController $form = new AphrontFormView(); $form ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormTokenizerControl()) ->setName('phids') @@ -101,17 +100,19 @@ final class PhabricatorProjectMembersEditController id(new AphrontFormSubmitControl()) ->addCancelButton('/project/view/'.$project->getID().'/') ->setValue(pht('Add Members'))); - $faux_form = id(new AphrontFormLayoutView()) + $faux_form = id(new AphrontFormView()) + ->setUser($user) ->appendChild( id(new AphrontFormInsetView()) - ->setTitle(pht('Current Members (%d)', count($handles))) ->appendChild($list)); - $box = new PHUIBoxView(); - $box->appendChild($faux_form); - $box->setShadow(true); - $box->addPadding(PHUI::PADDING_LARGE); - $box->addMargin(PHUI::MARGIN_LARGE); + $box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Current Members (%d)', count($handles))) + ->setForm($faux_form); + + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setForm($form); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); $crumbs->addCrumb( @@ -126,7 +127,7 @@ final class PhabricatorProjectMembersEditController return $this->buildApplicationPage( array( $crumbs, - $form, + $form_box, $box, ), array( diff --git a/src/applications/project/controller/PhabricatorProjectProfileEditController.php b/src/applications/project/controller/PhabricatorProjectProfileEditController.php index 0e3e13a84c..1973e4a62e 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileEditController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileEditController.php @@ -151,7 +151,6 @@ final class PhabricatorProjectProfileEditController ->setUser($user) ->setAction($action) ->setEncType('multipart/form-data') - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Name')) @@ -220,6 +219,10 @@ final class PhabricatorProjectProfileEditController ->addCancelButton('/project/view/'.$project->getID().'/') ->setValue(pht('Save'))); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); $crumbs->addCrumb( @@ -234,8 +237,7 @@ final class PhabricatorProjectProfileEditController return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, ), array( 'title' => $title, diff --git a/src/applications/releeph/controller/project/ReleephProjectCreateController.php b/src/applications/releeph/controller/project/ReleephProjectCreateController.php index 04c4567867..64a686e884 100644 --- a/src/applications/releeph/controller/project/ReleephProjectCreateController.php +++ b/src/applications/releeph/controller/project/ReleephProjectCreateController.php @@ -92,7 +92,6 @@ final class ReleephProjectCreateController extends ReleephProjectController { $form = id(new AphrontFormView()) ->setUser($request->getUser()) - ->setFlexible(true) ->appendChild($project_name_input) ->appendChild($arc_project_input) ->appendChild( diff --git a/src/applications/repository/controller/PhabricatorRepositoryCreateController.php b/src/applications/repository/controller/PhabricatorRepositoryCreateController.php index 67bb810a6c..d49728a762 100644 --- a/src/applications/repository/controller/PhabricatorRepositoryCreateController.php +++ b/src/applications/repository/controller/PhabricatorRepositoryCreateController.php @@ -66,12 +66,10 @@ final class PhabricatorRepositoryCreateController $error_view->setTitle('Form Errors'); } - $form = new AphrontFormView(); $form ->setUser($user) ->setAction('/repository/create/') - ->setFlexible(true) ->appendChild( id(new AphrontFormTextControl()) ->setLabel('Name') @@ -103,14 +101,14 @@ final class PhabricatorRepositoryCreateController ->setValue('Create Repository') ->addCancelButton('/repository/')); - $header = id(new PhabricatorHeaderView()) - ->setHeader(pht('Create Repository')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Create Repository')) + ->setFormError($error_view) + ->setForm($form); return $this->buildApplicationPage( array( - $error_view, - $header, - $form, + $form_box, ), array( 'title' => pht('Create Repository'), diff --git a/src/applications/repository/controller/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/PhabricatorRepositoryEditController.php index 11ec24fd63..e37fd9a052 100644 --- a/src/applications/repository/controller/PhabricatorRepositoryEditController.php +++ b/src/applications/repository/controller/PhabricatorRepositoryEditController.php @@ -155,12 +155,12 @@ final class PhabricatorRepositoryEditController $nav = $this->sideNav; - $header = id(new PhabricatorHeaderView()) - ->setHeader(pht('Edit Repository')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Edit Repository')) + ->setFormError($error_view) + ->setForm($form); - $nav->appendChild($error_view); - $nav->appendChild($header); - $nav->appendChild($form); + $nav->appendChild($form_box); return $this->buildApplicationPage( $nav, @@ -358,7 +358,6 @@ final class PhabricatorRepositoryEditController $form ->setUser($user) ->setAction('/repository/edit/'.$repository->getID().'/tracking/') - ->setFlexible(true) ->appendChild(hsprintf( '

Phabricator can track '. 'repositories, importing commits as they happen and notifying '. diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php index 969bb7c244..dfc97ec9c8 100644 --- a/src/applications/search/controller/PhabricatorApplicationSearchController.php +++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php @@ -133,7 +133,6 @@ final class PhabricatorApplicationSearchController 'query/advanced'); $form = id(new AphrontFormView()) - ->setNoShading(true) ->setUser($user); $engine->buildSearchForm($form, $saved_query); diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php index 62b7eca832..b98d1fd795 100644 --- a/src/applications/search/controller/PhabricatorSearchController.php +++ b/src/applications/search/controller/PhabricatorSearchController.php @@ -143,7 +143,6 @@ final class PhabricatorSearchController $search_form ->setUser($user) ->setAction('/search/') - ->setNoShading(true) ->appendChild( phutil_tag( 'input', diff --git a/src/applications/search/controller/PhabricatorSearchEditController.php b/src/applications/search/controller/PhabricatorSearchEditController.php index 920a9ec33c..bf9bec53f8 100644 --- a/src/applications/search/controller/PhabricatorSearchEditController.php +++ b/src/applications/search/controller/PhabricatorSearchEditController.php @@ -92,6 +92,11 @@ final class PhabricatorSearchEditController $title = pht('Save Query'); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($errors) + ->setForm($form); + $crumbs = $this->buildApplicationCrumbs(); $crumbs->addCrumb( id(new PhabricatorCrumbView()) @@ -100,8 +105,7 @@ final class PhabricatorSearchEditController return $this->buildApplicationPage( array( $crumbs, - $errors, - $form, + $form_box, ), array( 'title' => $title, diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php index 94a56887b1..d5adc5e489 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php @@ -88,7 +88,6 @@ final class PhabricatorSettingsPanelAccount $form = new AphrontFormView(); $form ->setUser($user) - ->setFlexible(true) ->appendChild( id(new AphrontFormSelectControl()) ->setLabel(pht('Timezone')) @@ -111,13 +110,13 @@ final class PhabricatorSettingsPanelAccount id(new AphrontFormSubmitControl()) ->setValue(pht('Save Account Settings'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Account Settings')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Account Settings')) + ->setForm($form); return array( $notice, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php index a4851f2c44..ced2a8ba13 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php @@ -78,8 +78,9 @@ final class PhabricatorSettingsPanelConduit ->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT) ->setValue($user->getConduitCertificate())); - $header1 = new PhabricatorHeaderView(); - $header1->setHeader(pht('Arcanist Certificate')); + $cert_form = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Arcanist Certificate')) + ->setForm($cert_form); $regen_instruction = pht('You can regenerate this certificate, which '. 'will invalidate the old certificate and create a new one.'); @@ -95,14 +96,13 @@ final class PhabricatorSettingsPanelConduit id(new AphrontFormSubmitControl()) ->setValue(pht('Regenerate Certificate'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Regenerate Certificate')); + $regen_form = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Regenerate Certificate')) + ->setForm($regen_form); return array( $notice, - $header1, $cert_form, - $header, $regen_form, ); } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php index dd44bc0b83..35e4fd1fc6 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php @@ -56,9 +56,6 @@ final class PhabricatorSettingsPanelConpherencePreferences id(new AphrontFormSubmitControl()) ->setValue(pht('Save Preferences'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Conpherence Preferences')); - $error_view = null; if ($request->getBool('saved')) { $error_view = id(new AphrontErrorView()) @@ -67,10 +64,13 @@ final class PhabricatorSettingsPanelConpherencePreferences ->setErrors(array(pht('Your preferences have been saved.'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Conpherence Preferences')) + ->setFormError($error_view) + ->setForm($form); + return array( - $error_view, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDeveloperPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDeveloperPreferences.php index e9cefcc8dd..f07a7459c4 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelDeveloperPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDeveloperPreferences.php @@ -69,7 +69,6 @@ final class PhabricatorSettingsPanelDeveloperPreferences $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendRemarkupInstructions($instructions) ->appendChild( id(new AphrontFormSelectControl()) @@ -86,9 +85,6 @@ final class PhabricatorSettingsPanelDeveloperPreferences id(new AphrontFormSubmitControl()) ->setValue(pht('Save Preferences'))); - $header = id(new PhabricatorHeaderView()) - ->setHeader(pht('Developer Settings')); - $error_view = null; if ($request->getBool('saved')) { $error_view = id(new AphrontErrorView()) @@ -97,10 +93,13 @@ final class PhabricatorSettingsPanelDeveloperPreferences ->setErrors(array(pht('Your preferences have been saved.'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Developer Settings')) + ->setFormError($error_view) + ->setForm($form); + return array( - $error_view, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php index 4254e8e355..d5cb42e02f 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php @@ -58,9 +58,6 @@ final class PhabricatorSettingsPanelDiffPreferences id(new AphrontFormSubmitControl()) ->setValue(pht('Save Preferences'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Diff Preferences')); - $error_view = null; if ($request->getBool('saved')) { $error_view = id(new AphrontErrorView()) @@ -69,10 +66,13 @@ final class PhabricatorSettingsPanelDiffPreferences ->setErrors(array(pht('Your preferences have been saved.'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Diff Preferences')) + ->setFormError($error_view) + ->setForm($form); + return array( - $error_view, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php index 1ae560e533..b356c6e7a3 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php @@ -137,9 +137,6 @@ EXAMPLE; id(new AphrontFormSubmitControl()) ->setValue(pht('Save Preferences'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Display Preferences')); - $error_view = null; if ($request->getStr('saved') === 'true') { $error_view = id(new AphrontErrorView()) @@ -148,10 +145,13 @@ EXAMPLE; ->setErrors(array(pht('Your preferences have been saved.'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Display Preferences')) + ->setFormError($error_view) + ->setForm($form); + return array( - $error_view, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php index d3142fb999..02495e88bf 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php @@ -210,7 +210,7 @@ final class PhabricatorSettingsPanelEmailAddresses ->setErrors($errors); } - $form = id(new AphrontFormLayoutView()) + $form = id(new PHUIFormLayoutView()) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Email')) diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php index 3ce441dbd8..0586d1fc66 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php @@ -216,15 +216,15 @@ final class PhabricatorSettingsPanelEmailPreferences id(new AphrontFormSubmitControl()) ->setValue(pht('Save Preferences'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Email Preferences')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Email Preferences')) + ->setFormError($notice) + ->setForm($form); return id(new AphrontNullView()) ->appendChild( array( - $notice, - $header, - $form, + $form_box, )); } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php index bce927a3b7..0b2ee8b7ea 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php @@ -48,11 +48,7 @@ final class PhabricatorSettingsPanelHomePreferences ->setURI($this->getPanelURI('?saved=true')); } - $header = id(new PhabricatorHeaderView()) - ->setHeader(pht('Home Page Preferences')); - $form = id(new AphrontFormView()) - ->setFlexible(true) ->setUser($user); $group_map = PhabricatorApplication::getApplicationGroups(); @@ -204,10 +200,13 @@ final class PhabricatorSettingsPanelHomePreferences ->setErrors(array(pht('Your preferences have been saved.'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Home Page Preferences')) + ->setFormError($error_view) + ->setForm($form); + return array( - $header, - $error_view, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php b/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php index 1b3e7dd1fc..a36bce7c9b 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php @@ -159,13 +159,13 @@ final class PhabricatorSettingsPanelPassword id(new AphrontFormSubmitControl()) ->setValue(pht('Save'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Change Password')); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Delete User')) + ->setFormError($notice) + ->setForm($form); return array( - $notice, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php index 0d851f4ff4..3b2b18a5d9 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php @@ -50,9 +50,6 @@ final class PhabricatorSettingsPanelSearchPreferences id(new AphrontFormSubmitControl()) ->setValue(pht('Save'))); - $header = new PhabricatorHeaderView(); - $header->setHeader(pht('Search Preferences')); - $error_view = null; if ($request->getStr('saved') === 'true') { $error_view = id(new AphrontErrorView()) @@ -61,10 +58,13 @@ final class PhabricatorSettingsPanelSearchPreferences ->setErrors(array(pht('Your preferences have been saved.'))); } + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText(pht('Search Preferences')) + ->setFormError($error_view) + ->setForm($form); + return array( - $error_view, - $header, - $form, + $form_box, ); } } diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php index 1c732c88a0..298fd63453 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php @@ -136,7 +136,6 @@ final class PhabricatorSlowvoteEditController $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild($instructions) ->appendChild( id(new AphrontFormTextAreaControl()) @@ -232,11 +231,15 @@ final class PhabricatorSlowvoteEditController id(new PhabricatorCrumbView()) ->setName($title)); + $form_box = id(new PHUIFormBoxView()) + ->setHeaderText($title) + ->setFormError($error_view) + ->setForm($form); + return $this->buildApplicationPage( array( $crumbs, - $error_view, - $form, + $form_box, ), array( 'title' => $title, diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php index 80f89e9b02..a03ee84e67 100644 --- a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php +++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php @@ -65,7 +65,7 @@ final class PhabricatorApplicationTransactionCommentEditController $dialog ->addHiddenInput('anchor', $request->getStr('anchor')) ->appendChild( - id(new AphrontFormLayoutView()) + id(new PHUIFormLayoutView()) ->setFullWidth(true) ->appendChild( id(new PhabricatorRemarkupControl()) diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php index 767b75d779..dda88cdc3b 100644 --- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php +++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php @@ -146,9 +146,9 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView { return id(new AphrontFormView()) ->setUser($this->getUser()) - ->setFlexible(true) ->addSigil('transaction-append') ->setWorkflow(true) + ->setShaded(true) ->setMetadata( array( 'objectPHID' => $this->getObjectPHID(), diff --git a/src/applications/uiexample/examples/PhabricatorFormExample.php b/src/applications/uiexample/examples/PhabricatorFormExample.php index ab067bd22d..8956f4387b 100644 --- a/src/applications/uiexample/examples/PhabricatorFormExample.php +++ b/src/applications/uiexample/examples/PhabricatorFormExample.php @@ -40,7 +40,6 @@ final class PhabricatorFormExample extends PhabricatorUIExample { $form = id(new AphrontFormView()) ->setUser($user) - ->setFlexible(true) ->appendChild($start_time) ->appendChild($end_time) ->appendChild($null_time) diff --git a/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php b/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php index bd87e7e2e0..6b3dc1a54b 100644 --- a/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php +++ b/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php @@ -99,7 +99,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample { ->setFluidLayout(true) ->setShadow(true); - $shipping = id(new AphrontFormLayoutView()) + $shipping = id(new PHUIFormLayoutView()) ->setUser($user) ->setFullWidth(true) ->appendChild( @@ -128,7 +128,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample { ->setDisableAutocomplete(true) ->setSigil('postal-input')); - $cc = id(new AphrontFormLayoutView()) + $cc = id(new PHUIFormLayoutView()) ->setUser($user) ->setFullWidth(true) ->appendChild( diff --git a/src/applications/uiexample/examples/PhabricatorUIListFilterExample.php b/src/applications/uiexample/examples/PhabricatorUIListFilterExample.php index 7af6c12b71..81ce37b04c 100644 --- a/src/applications/uiexample/examples/PhabricatorUIListFilterExample.php +++ b/src/applications/uiexample/examples/PhabricatorUIListFilterExample.php @@ -17,7 +17,6 @@ final class PhabricatorUIListFilterExample extends PhabricatorUIExample { $filter = new AphrontListFilterView(); $form = new AphrontFormView(); - $form->setNoShading(true); $form->setUser($this->getRequest()->getUser()); $form ->appendChild( diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index 9e0a89a27e..7a184675a1 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -526,6 +526,7 @@ final class CeleritySpriteGenerator { 'yellow-header' => 70, 'grey-header' => 70, 'dark-grey-header' => 70, + 'lightblue-header' => 70, ); $extra_css = array( diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php index 6c3d4372d5..1a590c4b6c 100644 --- a/src/view/AphrontDialogView.php +++ b/src/view/AphrontDialogView.php @@ -11,7 +11,7 @@ final class AphrontDialogView extends AphrontView { private $class; private $renderAsForm = true; private $formID; - private $headerColor = PhabricatorActionHeaderView::HEADER_DARK_GREY; + private $headerColor = PhabricatorActionHeaderView::HEADER_LIGHTBLUE; private $footers = array(); private $isStandalone; private $method = 'POST'; diff --git a/src/view/form/AphrontFormLayoutView.php b/src/view/form/AphrontFormLayoutView.php deleted file mode 100644 index 5cc4d1b0a1..0000000000 --- a/src/view/form/AphrontFormLayoutView.php +++ /dev/null @@ -1,53 +0,0 @@ - tag. Useful on its own for creating forms in other forms (like - * dialogs) or forms which aren't submittable. - */ -final class AphrontFormLayoutView extends AphrontView { - - private $backgroundShading; - private $padded; - private $fullWidth; - - public function setBackgroundShading($shading) { - $this->backgroundShading = $shading; - return $this; - } - - public function setPadded($padded) { - $this->padded = $padded; - return $this; - } - - public function setFullWidth($width) { - $this->fullWidth = $width; - return $this; - } - - public function render() { - $classes = array('aphront-form-view'); - - if ($this->backgroundShading) { - $classes[] = 'aphront-form-view-shaded'; - } - - if ($this->padded) { - $classes[] = 'aphront-form-view-padded'; - } - - if ($this->fullWidth) { - $classes[] = 'aphront-form-full-width'; - } - - $classes = implode(' ', $classes); - - return phutil_tag( - 'div', - array( - 'class' => $classes, - ), - $this->renderChildren()); - } -} diff --git a/src/view/form/AphrontFormView.php b/src/view/form/AphrontFormView.php index 25c872671b..4dbd0f4cfb 100644 --- a/src/view/form/AphrontFormView.php +++ b/src/view/form/AphrontFormView.php @@ -9,8 +9,7 @@ final class AphrontFormView extends AphrontView { private $encType; private $workflow; private $id; - private $flexible; - private $noShading; + private $shaded = false; private $sigils = array(); private $metadata; @@ -24,16 +23,6 @@ final class AphrontFormView extends AphrontView { return $this->metadata; } - public function setFlexible($flexible) { - $this->flexible = $flexible; - return $this; - } - - public function setNoShading($shading) { - $this->noShading = $shading; - return $this; - } - public function setID($id) { $this->id = $id; return $this; @@ -54,6 +43,11 @@ final class AphrontFormView extends AphrontView { return $this; } + public function setShaded($shaded) { + $this->shaded = $shaded; + return $this; + } + public function addHiddenInput($key, $value) { $this->data[$key] = $value; return $this; @@ -88,20 +82,9 @@ final class AphrontFormView extends AphrontView { } public function render() { - if ($this->flexible) { - require_celerity_resource('phabricator-form-view-css'); - } - require_celerity_resource('aphront-form-view-css'); - $layout = new AphrontFormLayoutView(); - - if ((!$this->flexible) && (!$this->noShading)) { - $layout - ->setBackgroundShading(true) - ->setPadded(true); - } - - $layout + require_celerity_resource('phui-form-view-css'); + $layout = id (new PHUIFormLayoutView()) ->appendChild($this->renderDataInputs()) ->appendChild($this->renderChildren()); @@ -117,7 +100,7 @@ final class AphrontFormView extends AphrontView { return phabricator_form( $this->user, array( - 'class' => $this->flexible ? 'phabricator-form-view' : null, + 'class' => $this->shaded ? 'phui-form-shaded' : null, 'action' => $this->action, 'method' => $this->method, 'enctype' => $this->encType, diff --git a/src/view/form/PHUIFormBoxView.php b/src/view/form/PHUIFormBoxView.php new file mode 100644 index 0000000000..60f4894484 --- /dev/null +++ b/src/view/form/PHUIFormBoxView.php @@ -0,0 +1,43 @@ +headerText = $text; + return $this; + } + + public function setFormError($error) { + $this->formError = $error; + return $this; + } + + public function setForm(AphrontFormView $form) { + $this->form = $form; + return $this; + } + + public function render() { + + $error = $this->formError ? $this->formError : null; + + $header = id(new PhabricatorActionHeaderView()) + ->setHeaderTitle($this->headerText) + ->setHeaderColor(PhabricatorActionHeaderView::HEADER_LIGHTBLUE); + + $content = id(new PHUIBoxView()) + ->appendChild(array($header, $error, $this->form)) + ->setBorder(true) + ->addMargin(PHUI::MARGIN_LARGE_TOP) + ->addMargin(PHUI::MARGIN_LARGE_LEFT) + ->addMargin(PHUI::MARGIN_LARGE_RIGHT) + ->addClass('phui-form-box'); + + return $content; + + } +} diff --git a/src/view/form/PHUIFormLayoutView.php b/src/view/form/PHUIFormLayoutView.php new file mode 100644 index 0000000000..15347b12f5 --- /dev/null +++ b/src/view/form/PHUIFormLayoutView.php @@ -0,0 +1,32 @@ + tag. Useful on its own for creating forms in other forms (like + * dialogs) or forms which aren't submittable. + */ +final class PHUIFormLayoutView extends AphrontView { + + private $fullWidth; + + public function setFullWidth($width) { + $this->fullWidth = $width; + return $this; + } + + public function render() { + $classes = array('phui-form-view'); + + if ($this->fullWidth) { + $classes[] = 'phui-form-full-width'; + } + + return phutil_tag( + 'div', + array( + 'class' => implode(' ', $classes), + ), + $this->renderChildren()); + + } +} diff --git a/src/view/layout/PhabricatorActionHeaderView.php b/src/view/layout/PhabricatorActionHeaderView.php index 84db5b1c7d..4ce655df4f 100644 --- a/src/view/layout/PhabricatorActionHeaderView.php +++ b/src/view/layout/PhabricatorActionHeaderView.php @@ -11,6 +11,7 @@ final class PhabricatorActionHeaderView extends AphrontView { const HEADER_GREEN = 'green'; const HEADER_RED = 'red'; const HEADER_YELLOW = 'yellow'; + const HEADER_LIGHTBLUE ='lightblue'; private $headerTitle; private $headerHref; diff --git a/src/view/phui/PHUIBoxView.php b/src/view/phui/PHUIBoxView.php index 6dbf90f34a..cc0771a161 100644 --- a/src/view/phui/PHUIBoxView.php +++ b/src/view/phui/PHUIBoxView.php @@ -5,6 +5,7 @@ final class PHUIBoxView extends AphrontTagView { private $margin = array(); private $padding = array(); private $shadow = false; + private $border = false; public function addMargin($margin) { $this->margin[] = $margin; @@ -21,6 +22,11 @@ final class PHUIBoxView extends AphrontTagView { return $this; } + public function setBorder($border) { + $this->border = $border; + return $this; + } + public function getTagContent() { require_celerity_resource('phui-box-css'); @@ -30,6 +36,9 @@ final class PHUIBoxView extends AphrontTagView { if ($this->shadow) { $outer_classes[] = 'phui-box-shadow'; } + if ($this->border) { + $outer_classes[] = 'phui-box-border'; + } foreach ($this->margin as $margin) { $outer_classes[] = $margin; } diff --git a/src/view/phui/PHUIRemarkupPreviewPanel.php b/src/view/phui/PHUIRemarkupPreviewPanel.php index fa528a3c1a..0a98f1decb 100644 --- a/src/view/phui/PHUIRemarkupPreviewPanel.php +++ b/src/view/phui/PHUIRemarkupPreviewPanel.php @@ -115,9 +115,16 @@ final class PHUIRemarkupPreviewPanel extends AphrontTagView { switch ($this->skin) { case 'document': - $content = id(new PHUIDocumentView())->appendChild($content); + $content = id(new PHUIDocumentView()) + ->appendChild($content); break; default: + $content = id(new PHUIBoxView()) + ->appendChild($content) + ->setBorder(true) + ->addMargin(PHUI::MARGIN_LARGE) + ->addPadding(PHUI::PADDING_LARGE) + ->addClass('phui-panel-preview'); break; } diff --git a/webroot/rsrc/css/aphront/dialog-view.css b/webroot/rsrc/css/aphront/dialog-view.css index 42ccabc64d..4d2daba8bb 100644 --- a/webroot/rsrc/css/aphront/dialog-view.css +++ b/webroot/rsrc/css/aphront/dialog-view.css @@ -5,7 +5,8 @@ .aphront-dialog-view { width: 540px; margin: 32px auto 16px; - border-radius: 6px; + border: 1px solid #bfcfda; + border-bottom: 1px solid #95a6c5; box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25), inset 0 1px 0 rgba(255, 255, 255, 0.5); } @@ -15,27 +16,21 @@ width: auto; } -/* The "standalone" dialog (which is delivered over Ajax and appears above - an existing page) has a more pronounced shadow than dialogs do when they - are embedded in a page. */ .aphront-dialog-view-standalone { - box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4), - inset 0 1px 0 rgba(255, 255, 255, 0.5); margin: auto; } - .aphront-dialog-head .phabricator-action-header { border-bottom: 1px solid #d4dadf; padding: 4px 16px; white-space: nowrap; - border-top-left-radius: 6px; - border-top-right-radius: 6px; } .aphront-dialog-head .phabricator-action-header .phabricator-action-header-title { font-size: 15px; + color: #6b748c; + text-shadow: 0 1px 2px #fff; } .aphront-dialog-view-width-form { @@ -54,11 +49,9 @@ .aphront-dialog-tail { border: none; - background: #fff; + background: #f7f7f7; padding: 8px 16px; border-top: 1px solid #d4dadf; - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; } .aphront-dialog-foot { @@ -69,7 +62,7 @@ .aphront-dialog-tail button, .aphront-dialog-tail a.button { float: right; - margin-left: .5em; + margin-left: 8px; } .jx-client-dialog { @@ -78,13 +71,13 @@ } .jx-mask { - opacity: .37; - background: #222; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; + opacity: .75; + background: #fff; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; } .jx-dark-mask { diff --git a/webroot/rsrc/css/aphront/error-view.css b/webroot/rsrc/css/aphront/error-view.css index df6f9fa930..90d266bc9a 100644 --- a/webroot/rsrc/css/aphront/error-view.css +++ b/webroot/rsrc/css/aphront/error-view.css @@ -13,19 +13,18 @@ form.aphront-dialog-view .aphront-error-view { } .aphront-error-view { - margin: 20px; + margin: 16px; } .aphront-error-view-dialogue { margin: 0px 0px 16px 0px; } .device-phone .aphront-error-view { - margin: 10px; + margin: 8px; } .aphront-error-view-body { - padding: 10px; - line-height: 1.6em; + padding: 12px; } .aphront-error-view-head { @@ -35,7 +34,7 @@ form.aphront-dialog-view .aphront-error-view { } .aphront-error-view-list { - margin: 0 0 0 20px; + margin: 0 0 0 16px; list-style: disc; } @@ -70,12 +69,7 @@ form.aphront-dialog-view .aphront-error-view { } .aphront-error-severity-nodata { - border-color: #dfdfdf; - background: #f3f3f3; - color: #666; -} - -.make-me-sneeze .aphront-error-severity-nodata { - background: #fff; - border-color: #e6e6e6; + border-color: #ccc; + color: #6b748c; + background-color: #fff; } diff --git a/webroot/rsrc/css/aphront/list-filter-view.css b/webroot/rsrc/css/aphront/list-filter-view.css index 44cd39742d..cf46cd4e0e 100644 --- a/webroot/rsrc/css/aphront/list-filter-view.css +++ b/webroot/rsrc/css/aphront/list-filter-view.css @@ -20,23 +20,23 @@ margin: 0 -2px; } -.aphront-list-filter-view-content .aphront-form-view { +.aphront-list-filter-view-content .phui-form-view { border-left: none; border-right: none; padding: 12px 0 6px; } -.aphront-list-filter-view-content .aphront-form-view .aphront-form-label { +.aphront-list-filter-view-content .phui-form-view .aphront-form-label { width: 12%; } -.aphront-list-filter-view-content .aphront-form-view .aphront-form-input { +.aphront-list-filter-view-content .phui-form-view .aphront-form-input { width: 70%; margin-left: 13%; margin-right: 17%; } -.device-phone .aphront-list-filter-view-content .aphront-form-view +.device-phone .aphront-list-filter-view-content .phui-form-view .aphront-form-input { width: 98%; margin-left: 0; diff --git a/webroot/rsrc/css/aphront/panel-view.css b/webroot/rsrc/css/aphront/panel-view.css index a5bd4d39ea..776f914164 100644 --- a/webroot/rsrc/css/aphront/panel-view.css +++ b/webroot/rsrc/css/aphront/panel-view.css @@ -70,7 +70,7 @@ border-radius: 3px; } -.aphront-panel-accent .aphront-form-view { +.aphront-panel-accent .phui-form-view { background: #f7f7f7; border: 1px solid #c4c4c0; border-radius: 3px; @@ -107,7 +107,7 @@ border-color: #669966; } -.aphront-panel-view-drag-and-drop .aphront-form-view { +.aphront-panel-view-drag-and-drop .phui-form-view { background: #ccffcc; border-color: #669966; } diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index 757d315f7c..89e0c8a3b5 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -74,7 +74,7 @@ display: block; } -.conpherence-message-pane .phabricator-form-view { +.conpherence-message-pane .phui-form-view { border-width: 0; background: none; height: 190px; @@ -89,7 +89,7 @@ height: 0px; } -.device .conpherence-message-pane .phabricator-form-view { +.device .conpherence-message-pane .phui-form-view { left: 0; right: 0; background-color: #d8dce2; @@ -97,7 +97,7 @@ width: 100%; } -.conpherence-layout .conpherence-message-pane .phabricator-form-view +.conpherence-layout .conpherence-message-pane .phui-form-view div.aphront-form-input { margin: 0; width: 100%; @@ -188,8 +188,8 @@ .conpherence-message-pane .remarkup-assist-textarea { height: 124px; padding: 6px; - border-width: 0 0 1px 0; - border-color: #e7e7e7; + border-width: 1px 0; + border-color: #BFCFDA; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css index 50bec2ef17..08e2c2367a 100644 --- a/webroot/rsrc/css/core/core.css +++ b/webroot/rsrc/css/core/core.css @@ -61,11 +61,12 @@ h1, h2, h3, h4, h5, h6 { } body { - font: 13px/1.231 'Helvetica Neue', Arial, sans-serif; + font: 13px/1.231 'Helvetica Neue', Helvetica, Arial, sans-serif; direction: ltr; text-align: left; unicode-bidi: embed; - background: #EBECEE; + background: #ebecee; + text-rendering: optimizeLegibility; } textarea { diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css index 9ff484a5c0..5533f3ae56 100644 --- a/webroot/rsrc/css/core/remarkup.css +++ b/webroot/rsrc/css/core/remarkup.css @@ -255,12 +255,11 @@ padding: 3px 6px; } - .remarkup-assist-textarea { - border-left-color: #96A6C5; - border-right-color: #96A6C5; - border-bottom-color: #96A6C5; - border-top-color: #c9d4e9; + border-left-color: #95a6c5; + border-right-color: #95a6c5; + border-bottom-color: #95a6c5; + border-top-color: #bfcfda; border-radius: 0; /* Prevent Safari and Chrome users from dragging the textarea any wider, @@ -278,11 +277,11 @@ border-width: 1px 1px 0; border-style: solid; - border-top-color: #96A6C5; - border-left-color: #96A6C5; - border-right-color: #96A6C5; + border-top-color: #95a6c5; + border-left-color: #95a6c5; + border-right-color: #95a6c5; - background: #f5f5f5; + background: #F8F9FC; overflow: hidden; } @@ -339,6 +338,11 @@ opacity: 1.0; } +.remarkup-assist-textarea { + box-shadow: none; + -webkit-box-shadow: none; +} + .remarkup-control-order-mode { position: fixed; top: -1px; diff --git a/webroot/rsrc/css/layout/phabricator-form-view.css b/webroot/rsrc/css/layout/phabricator-form-view.css deleted file mode 100644 index 4a87d5a85c..0000000000 --- a/webroot/rsrc/css/layout/phabricator-form-view.css +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @provides phabricator-form-view-css - */ - -.phabricator-form-view { - padding: 20px; - background: #f4f5f8; - border-width: 1px 0; - border-style: solid; - border-color: rgb(199, 201, 214); -} - -.device-phone .phabricator-form-view { - padding: 10px 5px 10px 10px; -} - -.device .phabricator-form-view .aphront-form-control .aphront-form-label { - display: block; - float: none; - text-align: left; - margin: 0; - padding: 0; -} - -.device .phabricator-form-view .aphront-form-control .aphront-form-caption { - display: block; - float: none; - text-align: left; - margin: 0; - padding: 0; -} - -.device .phabricator-form-view .aphront-form-control .aphront-form-input { - float: none; - display: block; - text-align: left; - margin: .25em 0 0 0; - width: 99%; - padding: 0; -} - -.device .phabricator-form-view .aphront-form-control .aphront-form-error { - float: none; - text-align: left; - display: block; - margin: 0; - padding: 0; -} diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css index 920861c0f2..77fa77a2b4 100644 --- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css +++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css @@ -27,7 +27,7 @@ padding: 6px 8px 4px 12px; color: #f7f7f7; text-transform: uppercase; - font-size: 12px; + font-size: 11px; font-weight: bold; border-style: solid; background-color: #000; diff --git a/webroot/rsrc/css/phui/phui-box.css b/webroot/rsrc/css/phui/phui-box.css index 31c917cf5c..3997916825 100644 --- a/webroot/rsrc/css/phui/phui-box.css +++ b/webroot/rsrc/css/phui/phui-box.css @@ -12,3 +12,19 @@ background-color: #fff; box-shadow: 0 1px 2px rgba(0,0,0,0.2); } + +.phui-box-border { + border: 1px solid #bfcfda; + border-bottom: 1px solid #95a6c5; +} + +.phui-box-border .phui-box-inner { + background-color: #fff; +} + +.device-phone .phui-box { + border-left: none; + border-right: none; + margin-left: 0; + margin-right: 0; +} diff --git a/webroot/rsrc/css/aphront/form-view.css b/webroot/rsrc/css/phui/phui-form-view.css similarity index 80% rename from webroot/rsrc/css/aphront/form-view.css rename to webroot/rsrc/css/phui/phui-form-view.css index 2a6f4e6789..2732a56869 100644 --- a/webroot/rsrc/css/aphront/form-view.css +++ b/webroot/rsrc/css/phui/phui-form-view.css @@ -1,37 +1,35 @@ /** - * @provides aphront-form-view-css + * @provides phui-form-view-css */ -/** - * These styles are overrides for .aphront-form-view - */ -.aphront-form-view-shaded { - border-top: 1px solid #d4dae0; - border-bottom: 1px solid #d4dae0; - background: #f4f5f8; +.phui-form-view { + padding: 16px; + background: #fff; } -.aphront-panel-width-form .aphront-form-view-shaded { - border: 1px solid #d4dae0; +.phui-form-view.phui-form-full-width { + padding: 0; } -.aphront-form-view-padded { - padding: 1em; +/* only used in transaction comments */ +.phui-form-shaded .phui-form-view { + border-bottom: 1px solid #D4DAE0; + background: #F4F5F8; } -.aphront-form-view label.aphront-form-label { +.phui-form-view label.aphront-form-label { padding-top: 5px; width: 19%; float: left; text-align: right; font-weight: bold; font-size: 13px; - color: #757c88; - text-shadow: 0 1px rgba(255,255,255,1); + color: #6b748c; + -webkit-font-smoothing: antialiased; } -.device-phone .aphront-form-view label.aphront-form-label, -.aphront-form-full-width.aphront-form-view label.aphront-form-label { +.device-phone .phui-form-view label.aphront-form-label, +.phui-form-full-width.phui-form-view label.aphront-form-label { display: block; float: none; text-align: left; @@ -46,7 +44,7 @@ } .device-phone .aphront-form-input, -.aphront-form-full-width .aphront-form-input { +.phui-form-full-width .aphront-form-input { margin-left: 0%; margin-right: 0%; width: 100%; @@ -60,12 +58,16 @@ padding-top: 5px; } -.aphront-dialog-body .aphront-form-full-width { +.aphront-dialog-body .phui-form-full-width { margin-top: -10px; } +.aphront-dialog-body .phui-form-view { + padding: 0; +} + .device-phone .aphront-form-error, -.aphront-form-full-width .aphront-form-error { +.phui-form-full-width .aphront-form-error { float: none; width: 100%; } @@ -76,8 +78,9 @@ .aphront-form-required { font-weight: normal; - color: #888888; + color: #6b748c; font-size: 11px; + -webkit-font-smoothing: antialiased; } .aphront-form-input input { @@ -95,14 +98,14 @@ padding: 4px; } -.aphront-form-full-width .aphront-form-control { +.phui-form-full-width .aphront-form-control { padding: 4px 0; } .aphront-form-control-submit button, .aphront-form-control-submit a.button { float: right; - margin: 0.5em 0 0 2%; + margin: 4px 0 0 8px; } .phui-form-control-multi-submit input { @@ -123,22 +126,24 @@ padding-top: 2px; } -.aphront-form-view .aphront-form-caption { +.phui-form-view .aphront-form-caption { font-size: 12px; - color: #888; - padding: 2px; + color: #6b748c; + padding: 8px 4px; text-align: right; margin-right: 20%; margin-left: 20%; + -webkit-font-smoothing: antialiased; + line-height: 15px; } -.device-phone .aphront-form-view .aphront-form-caption, -.aphront-form-full-width .aphront-form-view .aphront-form-caption { +.device-phone .phui-form-view .aphront-form-caption, +.phui-form-full-width .phui-form-view .aphront-form-caption { margin-right: 0%; } /* override for when inside an aphront-panel-view */ -.aphront-panel-view .aphront-form-view h1 { +.aphront-panel-view .phui-form-view h1 { padding: 0em 0em .8em 0em; } @@ -148,10 +153,8 @@ padding: 10px 4px; } - - .device .aphront-form-instructions, -.aphront-form-full-width .aphront-form-instructions { +.phui-form-full-width .aphront-form-instructions { width: 100%; margin: 0; } @@ -199,14 +202,12 @@ table.aphront-form-control-checkbox-layout th { color: #222222; } - .aphront-form-control-radio-layout td input, .aphront-form-control-checkbox-layout td input { margin-top: 4px; width: auto; } - .aphront-form-control-radio-layout label.disabled, .aphront-form-control-checkbox-layout label.disabled { color: #777777; @@ -236,8 +237,8 @@ table.aphront-form-control-checkbox-layout th { } .aphront-form-inset { - margin: 0 0 10px; - padding: 10px; + margin: 0 0 8px; + padding: 8px; background: #fff; border: 1px solid #d4dae0; } @@ -245,7 +246,7 @@ table.aphront-form-control-checkbox-layout th { .aphront-form-inset h1 { color: #777; font-weight: normal; - padding-bottom: 10px; + padding-bottom: 8px; } .aphront-form-drag-and-drop-file-list { @@ -260,8 +261,8 @@ table.aphront-form-control-checkbox-layout th { .drag-and-drop-file-target { border: 1px dashed #bfbfbf; - padding-top: 10px; - padding-bottom: 10px; + padding-top: 12px; + padding-bottom: 12px; } .aphront-textarea-drag-and-drop { @@ -424,3 +425,17 @@ table.aphront-form-control-checkbox-layout th { .recaptcha_only_if_privacy { display: none; } + +.phui-form-box .phabricator-action-header { + padding: 4px 5px 4px 12px; + border-bottom: 1px solid #bfcfda; +} + +.phui-form-box .phabricator-action-header h3 { + color: #6b748c; + text-shadow: 0 1px 2px #fff; +} + +.phui-form-box .aphront-error-view { + margin-bottom: 0; +} diff --git a/webroot/rsrc/css/phui/phui-form.css b/webroot/rsrc/css/phui/phui-form.css index 92bdacc40e..8ec1f4a063 100644 --- a/webroot/rsrc/css/phui/phui-form.css +++ b/webroot/rsrc/css/phui/phui-form.css @@ -24,7 +24,8 @@ div.jx-tokenizer-container { line-height: 18px; color: #333; vertical-align: middle; - font: 13px 'Helvetica Neue', Arial, sans-serif; + font: 13px 'Helvetica Neue', Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; } textarea, @@ -45,7 +46,7 @@ input[type="color"], div.jx-tokenizer-container { padding: 4px 6px; background-color: #ffffff; - border: 1px solid #96A6C5; + border: 1px solid #95a6c5; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); diff --git a/webroot/rsrc/css/phui/phui-remarkup-preview.css b/webroot/rsrc/css/phui/phui-remarkup-preview.css index 89cdcb6582..10f25f4329 100644 --- a/webroot/rsrc/css/phui/phui-remarkup-preview.css +++ b/webroot/rsrc/css/phui/phui-remarkup-preview.css @@ -3,15 +3,16 @@ */ .phui-preview-header { - color: #666666; - margin-bottom: 12px; - font-size: 11px; + font-size: 12px; + font-weight: bold; + color: #9ca5b5; + text-transform: uppercase; + padding-bottom: 8px; + display: block; } -.phui-remarkup-preview { - background: #fbfbfb; - border-bottom: 1px solid #aaaaaa; - padding: 12px; +.phui-document-inner .phui-preview-header { + padding: 16px 0 0 16px; } .phui-remarkup-preview-skin-document { @@ -19,17 +20,12 @@ border: none; } -.phui-remarkup-preview-skin-document .phui-preview-header { - padding: 8px; - background: #f3f3f3; -} - -.device-phone .aphront-panel-preview { +.device-phone .phui-panel-preview { display: none; } .phui-preview-loading-text { - color: #666666; + color: #999; } /** diff --git a/webroot/rsrc/css/sprite-gradient.css b/webroot/rsrc/css/sprite-gradient.css index 341d262cac..917eee645e 100644 --- a/webroot/rsrc/css/sprite-gradient.css +++ b/webroot/rsrc/css/sprite-gradient.css @@ -35,14 +35,18 @@ background-position: 0px -296px; } +.gradient-lightblue-header { + background-position: 0px -367px; +} + .gradient-menu-label, .phabricator-side-menu .phui-list-item-type-label { background-position: 0px 0px; } .gradient-red-header { - background-position: 0px -367px; + background-position: 0px -438px; } .gradient-yellow-header { - background-position: 0px -438px; + background-position: 0px -509px; } diff --git a/webroot/rsrc/image/sprite-gradient.png b/webroot/rsrc/image/sprite-gradient.png index f3aada92aeffdfc6b5a34d6f247e45b5a9ad714b..6ba747324293dea2a20566aa4da7218212fc3504 100644 GIT binary patch delta 548 zcmV+<0^9wQ1g`{;7JmXn2nGNE05LX&I{*Ly_DMuRRA}DqSwT(%F${FtR4V-d2m~MC z0X%{Oa0H3x@C)7pJc1(!E?kQCvLZIOs

  • -e%hcvbP=0Oq|$pvuQXwITIoxBB2lh z#p!fP%TJ7x$tu7stAGe=25W|ra7s|3fRr?YjfVn~F-<5^7JqG;*c&OHzG%j1JYKv6 z$~@ul_;kf29?WK|9^)AGD1%LumT1Oc6J;1z*EjdH?g?-2AF`a)kxp?GQl{#CBZdi` zO!i582=aiY84q%sZV!xCa>Dt`rLOWS8o10!8h6{tXAz_zXVe7-0{5uw;L&3X^hVDYfMNd7cqHm z@xNyKry0FSY}>kgJQwFV*?tre{A?2RyPwR*2=vG>l9!R7B*S3H_=2IEI83CZ8RTUo zTMp0^O7yVxWKevQoY}(&ZmiTHf zBO!Cc3NH|mBsYq9B?Ut7GFySe7Lb&fZEh5CN^k{rsY3q(RbczJ^>TMBzGh%|gNUEu zmvDhmum}79!|BDe7mpH*dL>_h{kN^xXA*Rkr2&S3xe$R8#vW;VQwt=wL<)EqNr%w8 mETKPhFdh4Ki&bFfZR;Cp2*+D^zG|`n0000Y`D delta 520 zcmV+j0{8u|1d{}i7JmW#2nGNE06iPs8vp{@S$M?!F-1m7CaNO;tZNayd3noMHou%Z>J8(Ox?s@CF86R( zWrf5q%$HCWHh--cF{-1*0`jsTFcOFX7=SGU6gr>JSD&GoNmwivn>}cQ_0x7DIcUai zBz>vlxZd`l8J$Qd^!D{SKW+KvWNwPYZJX%qfLS6nBd$jS1A8Es5nV|G1G_b5{JN!6 z9aO0xLrNKWj;5((Q&)m%`|?K~fWrkS)L@GV%jL4rw0~khtpIxaE9lF~aZi#xeGUU~ zL;!_;JUzl`%fC_skEZKEmr*XEb5KPV--8+ZG3~@-8;s#@YXEi)Q0V7-zAH8Lga{-T zpw7aTFoQfI0_CO*xTY<#lzWh*qV$>}ET1`d_WSZ_55VC96n|dfoZs1+u5