1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00

Add fullWidth option to AphrontFormView

Summary: This piggybacks onto device-phone's CSS rules to enable a full width form (for smaller spaces).

Test Plan: Convert New Message dialog to fullWidth.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5924
This commit is contained in:
Chad Little 2013-05-14 12:21:00 -07:00
parent 626b6a7f97
commit 614e826e7b
4 changed files with 64 additions and 44 deletions

View file

@ -800,7 +800,7 @@ celerity_register_resource_map(array(
), ),
'aphront-form-view-css' => 'aphront-form-view-css' =>
array( array(
'uri' => '/res/d82ea207/rsrc/css/aphront/form-view.css', 'uri' => '/res/cc40cdff/rsrc/css/aphront/form-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -4025,7 +4025,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'ed515d33' => '58f50abd' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -4067,7 +4067,7 @@ celerity_register_resource_map(array(
34 => 'phabricator-object-item-list-view-css', 34 => 'phabricator-object-item-list-view-css',
35 => 'global-drag-and-drop-css', 35 => 'global-drag-and-drop-css',
), ),
'uri' => '/res/pkg/ed515d33/core.pkg.css', 'uri' => '/res/pkg/58f50abd/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'26980a1c' => '26980a1c' =>
@ -4258,16 +4258,16 @@ celerity_register_resource_map(array(
'reverse' => 'reverse' =>
array( array(
'aphront-attached-file-view-css' => '6b1fccc6', 'aphront-attached-file-view-css' => '6b1fccc6',
'aphront-dialog-view-css' => 'ed515d33', 'aphront-dialog-view-css' => '58f50abd',
'aphront-error-view-css' => 'ed515d33', 'aphront-error-view-css' => '58f50abd',
'aphront-form-view-css' => 'ed515d33', 'aphront-form-view-css' => '58f50abd',
'aphront-list-filter-view-css' => 'ed515d33', 'aphront-list-filter-view-css' => '58f50abd',
'aphront-pager-view-css' => 'ed515d33', 'aphront-pager-view-css' => '58f50abd',
'aphront-panel-view-css' => 'ed515d33', 'aphront-panel-view-css' => '58f50abd',
'aphront-table-view-css' => 'ed515d33', 'aphront-table-view-css' => '58f50abd',
'aphront-tokenizer-control-css' => 'ed515d33', 'aphront-tokenizer-control-css' => '58f50abd',
'aphront-tooltip-css' => 'ed515d33', 'aphront-tooltip-css' => '58f50abd',
'aphront-typeahead-control-css' => 'ed515d33', 'aphront-typeahead-control-css' => '58f50abd',
'differential-changeset-view-css' => 'dd27a69b', 'differential-changeset-view-css' => 'dd27a69b',
'differential-core-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b',
'differential-inline-comment-editor' => '77e07ff4', 'differential-inline-comment-editor' => '77e07ff4',
@ -4281,7 +4281,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => 'dd27a69b', 'differential-table-of-contents-css' => 'dd27a69b',
'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => 'ed515d33', 'global-drag-and-drop-css' => '58f50abd',
'inline-comment-summary-css' => 'dd27a69b', 'inline-comment-summary-css' => 'dd27a69b',
'javelin-aphlict' => '26980a1c', 'javelin-aphlict' => '26980a1c',
'javelin-behavior' => '202a3dd0', 'javelin-behavior' => '202a3dd0',
@ -4353,48 +4353,48 @@ celerity_register_resource_map(array(
'javelin-util' => '202a3dd0', 'javelin-util' => '202a3dd0',
'javelin-vector' => '202a3dd0', 'javelin-vector' => '202a3dd0',
'javelin-workflow' => '202a3dd0', 'javelin-workflow' => '202a3dd0',
'lightbox-attachment-css' => 'ed515d33', 'lightbox-attachment-css' => '58f50abd',
'maniphest-task-summary-css' => '6b1fccc6', 'maniphest-task-summary-css' => '6b1fccc6',
'maniphest-transaction-detail-css' => '6b1fccc6', 'maniphest-transaction-detail-css' => '6b1fccc6',
'phabricator-busy' => '26980a1c', 'phabricator-busy' => '26980a1c',
'phabricator-content-source-view-css' => 'dd27a69b', 'phabricator-content-source-view-css' => 'dd27a69b',
'phabricator-core-buttons-css' => 'ed515d33', 'phabricator-core-buttons-css' => '58f50abd',
'phabricator-core-css' => 'ed515d33', 'phabricator-core-css' => '58f50abd',
'phabricator-crumbs-view-css' => 'ed515d33', 'phabricator-crumbs-view-css' => '58f50abd',
'phabricator-directory-css' => 'ed515d33', 'phabricator-directory-css' => '58f50abd',
'phabricator-drag-and-drop-file-upload' => '77e07ff4', 'phabricator-drag-and-drop-file-upload' => '77e07ff4',
'phabricator-dropdown-menu' => '26980a1c', 'phabricator-dropdown-menu' => '26980a1c',
'phabricator-file-upload' => '26980a1c', 'phabricator-file-upload' => '26980a1c',
'phabricator-filetree-view-css' => 'ed515d33', 'phabricator-filetree-view-css' => '58f50abd',
'phabricator-flag-css' => 'ed515d33', 'phabricator-flag-css' => '58f50abd',
'phabricator-form-view-css' => 'ed515d33', 'phabricator-form-view-css' => '58f50abd',
'phabricator-header-view-css' => 'ed515d33', 'phabricator-header-view-css' => '58f50abd',
'phabricator-jump-nav' => 'ed515d33', 'phabricator-jump-nav' => '58f50abd',
'phabricator-keyboard-shortcut' => '26980a1c', 'phabricator-keyboard-shortcut' => '26980a1c',
'phabricator-keyboard-shortcut-manager' => '26980a1c', 'phabricator-keyboard-shortcut-manager' => '26980a1c',
'phabricator-main-menu-view' => 'ed515d33', 'phabricator-main-menu-view' => '58f50abd',
'phabricator-menu-item' => '26980a1c', 'phabricator-menu-item' => '26980a1c',
'phabricator-nav-view-css' => 'ed515d33', 'phabricator-nav-view-css' => '58f50abd',
'phabricator-notification' => '26980a1c', 'phabricator-notification' => '26980a1c',
'phabricator-notification-css' => 'ed515d33', 'phabricator-notification-css' => '58f50abd',
'phabricator-notification-menu-css' => 'ed515d33', 'phabricator-notification-menu-css' => '58f50abd',
'phabricator-object-item-list-view-css' => 'ed515d33', 'phabricator-object-item-list-view-css' => '58f50abd',
'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-object-selector-css' => 'dd27a69b',
'phabricator-phtize' => '26980a1c', 'phabricator-phtize' => '26980a1c',
'phabricator-prefab' => '26980a1c', 'phabricator-prefab' => '26980a1c',
'phabricator-project-tag-css' => '6b1fccc6', 'phabricator-project-tag-css' => '6b1fccc6',
'phabricator-remarkup-css' => 'ed515d33', 'phabricator-remarkup-css' => '58f50abd',
'phabricator-shaped-request' => '77e07ff4', 'phabricator-shaped-request' => '77e07ff4',
'phabricator-side-menu-view-css' => 'ed515d33', 'phabricator-side-menu-view-css' => '58f50abd',
'phabricator-standard-page-view' => 'ed515d33', 'phabricator-standard-page-view' => '58f50abd',
'phabricator-textareautils' => '26980a1c', 'phabricator-textareautils' => '26980a1c',
'phabricator-tooltip' => '26980a1c', 'phabricator-tooltip' => '26980a1c',
'phabricator-transaction-view-css' => 'ed515d33', 'phabricator-transaction-view-css' => '58f50abd',
'phabricator-zindex-css' => 'ed515d33', 'phabricator-zindex-css' => '58f50abd',
'sprite-apps-large-css' => 'ed515d33', 'sprite-apps-large-css' => '58f50abd',
'sprite-gradient-css' => 'ed515d33', 'sprite-gradient-css' => '58f50abd',
'sprite-icons-css' => 'ed515d33', 'sprite-icons-css' => '58f50abd',
'sprite-menu-css' => 'ed515d33', 'sprite-menu-css' => '58f50abd',
'syntax-highlighting-css' => 'ed515d33', 'syntax-highlighting-css' => '58f50abd',
), ),
)); ));

View file

@ -126,6 +126,7 @@ final class ConpherenceNewController extends ConpherenceController {
$form = id(new AphrontFormLayoutView()) $form = id(new AphrontFormLayoutView())
->setUser($user) ->setUser($user)
->setFullWidth(true)
->appendChild( ->appendChild(
id(new AphrontFormTokenizerControl()) id(new AphrontFormTokenizerControl())
->setName('participants') ->setName('participants')

View file

@ -9,6 +9,7 @@ final class AphrontFormLayoutView extends AphrontView {
private $backgroundShading; private $backgroundShading;
private $padded; private $padded;
private $fullWidth;
public function setBackgroundShading($shading) { public function setBackgroundShading($shading) {
$this->backgroundShading = $shading; $this->backgroundShading = $shading;
@ -20,6 +21,11 @@ final class AphrontFormLayoutView extends AphrontView {
return $this; return $this;
} }
public function setFullWidth($width) {
$this->fullWidth = $width;
return $this;
}
public function render() { public function render() {
$classes = array('aphront-form-view'); $classes = array('aphront-form-view');
@ -31,6 +37,10 @@ final class AphrontFormLayoutView extends AphrontView {
$classes[] = 'aphront-form-view-padded'; $classes[] = 'aphront-form-view-padded';
} }
if ($this->fullWidth) {
$classes[] = 'aphront-form-full-width';
}
$classes = implode(' ', $classes); $classes = implode(' ', $classes);
return phutil_tag( return phutil_tag(

View file

@ -25,7 +25,8 @@
text-shadow: 0 1px rgba(255,255,255,1); text-shadow: 0 1px rgba(255,255,255,1);
} }
.device-phone .aphront-form-view label.aphront-form-label { .device-phone .aphront-form-view label.aphront-form-label,
.aphront-form-full-width.aphront-form-view label.aphront-form-label {
display: block; display: block;
float: none; float: none;
text-align: left; text-align: left;
@ -39,7 +40,8 @@
width: 60%; width: 60%;
} }
.device-phone .aphront-form-input { .device-phone .aphront-form-input,
.aphront-form-full-width .aphront-form-input {
margin-left: 0%; margin-left: 0%;
margin-right: 0%; margin-right: 0%;
width: 100%; width: 100%;
@ -53,7 +55,12 @@
padding-top: 4px; padding-top: 4px;
} }
.device-phone .aphront-form-error { .aphront-dialog-body .aphront-form-full-width {
margin-top: -10px;
}
.device-phone .aphront-form-error,
.aphront-form-full-width .aphront-form-error {
float: none; float: none;
width: 100%; width: 100%;
} }
@ -110,7 +117,8 @@
margin-left: 20%; margin-left: 20%;
} }
.device-phone .aphront-form-view .aphront-form-caption { .device-phone .aphront-form-view .aphront-form-caption,
.aphront-form-full-width .aphront-form-view .aphront-form-caption {
margin-right: 0%; margin-right: 0%;
} }
@ -125,7 +133,8 @@
padding: 10px 4px; padding: 10px 4px;
} }
.device .aphront-form-instructions { .device .aphront-form-instructions,
.aphront-form-full-width .aphront-form-instructions {
width: 100%; width: 100%;
margin: 0; margin: 0;
} }