diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 3cd43ce6d0..f59f0cbb3d 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '59173e43', + 'core.pkg.css' => '5ae77fb9', 'core.pkg.js' => 'cbdbd552', 'darkconsole.pkg.js' => 'df001cab', 'differential.pkg.css' => '8af45893', @@ -126,7 +126,7 @@ return array( 'rsrc/css/phui/phui-document.css' => 'a5615198', 'rsrc/css/phui/phui-feed-story.css' => '55dc7732', 'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce', - 'rsrc/css/phui/phui-form-view.css' => 'a2d72756', + 'rsrc/css/phui/phui-form-view.css' => 'a3efd18c', 'rsrc/css/phui/phui-form.css' => 'b78ec020', 'rsrc/css/phui/phui-header-view.css' => '39594ac0', 'rsrc/css/phui/phui-icon.css' => 'b4963a4f', @@ -770,7 +770,7 @@ return array( 'phui-font-icon-base-css' => '3dad2ae3', 'phui-fontkit-css' => '9c3d2dce', 'phui-form-css' => 'b78ec020', - 'phui-form-view-css' => 'a2d72756', + 'phui-form-view-css' => 'a3efd18c', 'phui-header-view-css' => '39594ac0', 'phui-icon-view-css' => 'b4963a4f', 'phui-image-mask-css' => '5a8b09c8', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 0b9ad35307..79ca74ca44 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -105,7 +105,6 @@ phutil_register_library_map(array( 'AphrontFormDividerControl' => 'view/form/control/AphrontFormDividerControl.php', 'AphrontFormFileControl' => 'view/form/control/AphrontFormFileControl.php', 'AphrontFormImageControl' => 'view/form/control/AphrontFormImageControl.php', - 'AphrontFormInsetView' => 'view/form/AphrontFormInsetView.php', 'AphrontFormMarkupControl' => 'view/form/control/AphrontFormMarkupControl.php', 'AphrontFormPasswordControl' => 'view/form/control/AphrontFormPasswordControl.php', 'AphrontFormPolicyControl' => 'view/form/control/AphrontFormPolicyControl.php', @@ -1107,6 +1106,7 @@ phutil_register_library_map(array( 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', 'PHUIFormDividerControl' => 'view/form/control/PHUIFormDividerControl.php', 'PHUIFormFreeformDateControl' => 'view/form/control/PHUIFormFreeformDateControl.php', + 'PHUIFormInsetView' => 'view/form/PHUIFormInsetView.php', 'PHUIFormLayoutView' => 'view/form/PHUIFormLayoutView.php', 'PHUIFormMultiSubmitControl' => 'view/form/control/PHUIFormMultiSubmitControl.php', 'PHUIFormPageView' => 'view/form/PHUIFormPageView.php', @@ -3099,7 +3099,6 @@ phutil_register_library_map(array( 'AphrontFormDividerControl' => 'AphrontFormControl', 'AphrontFormFileControl' => 'AphrontFormControl', 'AphrontFormImageControl' => 'AphrontFormControl', - 'AphrontFormInsetView' => 'AphrontView', 'AphrontFormMarkupControl' => 'AphrontFormControl', 'AphrontFormPasswordControl' => 'AphrontFormControl', 'AphrontFormPolicyControl' => 'AphrontFormControl', @@ -4166,6 +4165,7 @@ phutil_register_library_map(array( 'PHUIFeedStoryView' => 'AphrontView', 'PHUIFormDividerControl' => 'AphrontFormControl', 'PHUIFormFreeformDateControl' => 'AphrontFormControl', + 'PHUIFormInsetView' => 'AphrontView', 'PHUIFormLayoutView' => 'AphrontView', 'PHUIFormMultiSubmitControl' => 'AphrontFormControl', 'PHUIFormPageView' => 'AphrontView', diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php index b76a27d812..72a97b1523 100644 --- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php +++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php @@ -558,12 +558,12 @@ final class PhabricatorAuthRegisterController 'administrator.', $user->getUsername())); - $body->addTextSection( + $body->addLinkSection( pht('APPROVAL QUEUE'), PhabricatorEnv::getProductionURI( '/people/query/approval/')); - $body->addTextSection( + $body->addLinkSection( pht('DISABLE APPROVAL QUEUE'), PhabricatorEnv::getProductionURI( '/config/edit/auth.require-approval/')); diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php index dd33091dee..beed090203 100644 --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -169,7 +169,7 @@ final class HeraldRuleController extends HeraldController { phutil_tag('strong', array(), $content_type_name)))) ->appendChild($trigger_object_control) ->appendChild( - id(new AphrontFormInsetView()) + id(new PHUIFormInsetView()) ->setTitle(pht('Conditions')) ->setRightButton(javelin_tag( 'a', @@ -190,7 +190,7 @@ final class HeraldRuleController extends HeraldController { ), ''))) ->appendChild( - id(new AphrontFormInsetView()) + id(new PHUIFormInsetView()) ->setTitle(pht('Action')) ->setRightButton(javelin_tag( 'a', diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php index dc41515f3a..a93b9be0d7 100644 --- a/src/applications/maniphest/controller/ManiphestBatchEditController.php +++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php @@ -118,7 +118,7 @@ final class ManiphestBatchEditController extends ManiphestController { phutil_tag('p', array(), pht('These tasks will be edited:'))); $form->appendChild($list); $form->appendChild( - id(new AphrontFormInsetView()) + id(new PHUIFormInsetView()) ->setTitle('Actions') ->setRightButton(javelin_tag( 'a', diff --git a/src/applications/owners/controller/PhabricatorOwnersEditController.php b/src/applications/owners/controller/PhabricatorOwnersEditController.php index 10ce29c9a5..6e1163ddc0 100644 --- a/src/applications/owners/controller/PhabricatorOwnersEditController.php +++ b/src/applications/owners/controller/PhabricatorOwnersEditController.php @@ -211,7 +211,7 @@ final class PhabricatorOwnersEditController ? 'enabled' : 'disabled')) ->appendChild( - id(new AphrontFormInsetView()) + id(new PHUIFormInsetView()) ->setTitle(pht('Paths')) ->addDivAttributes(array('id' => 'path-editor')) ->setRightButton(javelin_tag( diff --git a/src/applications/policy/controller/PhabricatorPolicyEditController.php b/src/applications/policy/controller/PhabricatorPolicyEditController.php index d1b0d6dc14..fc104647ff 100644 --- a/src/applications/policy/controller/PhabricatorPolicyEditController.php +++ b/src/applications/policy/controller/PhabricatorPolicyEditController.php @@ -153,7 +153,7 @@ final class PhabricatorPolicyEditController 'sigil' => 'rules', ))) ->appendChild( - id(new AphrontFormInsetView()) + id(new PHUIFormInsetView()) ->setTitle(pht('Rules')) ->setRightButton( javelin_tag( diff --git a/src/view/form/AphrontFormInsetView.php b/src/view/form/PHUIFormInsetView.php similarity index 95% rename from src/view/form/AphrontFormInsetView.php rename to src/view/form/PHUIFormInsetView.php index 1e504c4598..89a23feb2b 100644 --- a/src/view/form/AphrontFormInsetView.php +++ b/src/view/form/PHUIFormInsetView.php @@ -1,6 +1,6 @@ divAttributes; - $classes = array('aphront-form-inset'); + $classes = array('phui-form-inset'); if (isset($div_attributes['class'])) { $classes[] = $div_attributes['class']; } diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css index 331c33ec03..e7608b14d0 100644 --- a/webroot/rsrc/css/phui/phui-form-view.css +++ b/webroot/rsrc/css/phui/phui-form-view.css @@ -251,14 +251,14 @@ table.aphront-form-control-checkbox-layout th { position: relative; } -.aphront-form-inset { +.phui-form-inset { margin: 0 0 8px; padding: 8px; background: #fff; border: 1px solid #d4dae0; } -.aphront-form-inset h1 { +.phui-form-inset h1 { color: {$greytext}; font-weight: normal; padding-bottom: 8px;