revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 08:42:41 +01:00
Code Issues Releases Wiki Activity

Update styles on Login Reset

Browse source 
Summary: Changes it to a dialog view, tweaks some layout bugs on full width forms.

Test Plan: Tested loging in and resetting my password. Chrome + Mobile

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin, nrp

Differential Revision: https://secure.phabricator.com/D6257
This commit is contained in:
Chad Little 2013-06-20 17:11:57 -07:00
parent 0d6e4e2799
commit e275f94fd8
4 changed files with 79 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/__celerity_resource_map__.php
View file

@ -805,7 +805,7 @@ celerity_register_resource_map(array(
), ),
'aphront-error-view-css' => 'aphront-error-view-css' =>
array( array(
'uri' => '/res/9684f1e9/rsrc/css/aphront/error-view.css', 'uri' => '/res/a574aa01/rsrc/css/aphront/error-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -814,7 +814,7 @@ celerity_register_resource_map(array(
), ),
'aphront-form-view-css' => 'aphront-form-view-css' =>
array( array(
'uri' => '/res/068dd7ed/rsrc/css/aphront/form-view.css', 'uri' => '/res/ee9c241b/rsrc/css/aphront/form-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -4057,7 +4057,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'f0f013fd' => '90efd2f0' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -4105,7 +4105,7 @@ celerity_register_resource_map(array(
40 => 'phabricator-property-list-view-css', 40 => 'phabricator-property-list-view-css',
41 => 'phabricator-tag-view-css', 41 => 'phabricator-tag-view-css',
), ),
'uri' => '/res/pkg/f0f013fd/core.pkg.css', 'uri' => '/res/pkg/90efd2f0/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'f2ad0683' => 'f2ad0683' =>
@ -4299,16 +4299,16 @@ celerity_register_resource_map(array(
'reverse' => 'reverse' =>
array( array(
'aphront-attached-file-view-css' => 'adc3c36d', 'aphront-attached-file-view-css' => 'adc3c36d',
'aphront-dialog-view-css' => 'f0f013fd', 'aphront-dialog-view-css' => '90efd2f0',
'aphront-error-view-css' => 'f0f013fd', 'aphront-error-view-css' => '90efd2f0',
'aphront-form-view-css' => 'f0f013fd', 'aphront-form-view-css' => '90efd2f0',
'aphront-list-filter-view-css' => 'f0f013fd', 'aphront-list-filter-view-css' => '90efd2f0',
'aphront-pager-view-css' => 'f0f013fd', 'aphront-pager-view-css' => '90efd2f0',
'aphront-panel-view-css' => 'f0f013fd', 'aphront-panel-view-css' => '90efd2f0',
'aphront-table-view-css' => 'f0f013fd', 'aphront-table-view-css' => '90efd2f0',
'aphront-tokenizer-control-css' => 'f0f013fd', 'aphront-tokenizer-control-css' => '90efd2f0',
'aphront-tooltip-css' => 'f0f013fd', 'aphront-tooltip-css' => '90efd2f0',
'aphront-typeahead-control-css' => 'f0f013fd', 'aphront-typeahead-control-css' => '90efd2f0',
'differential-changeset-view-css' => 'dd27a69b', 'differential-changeset-view-css' => 'dd27a69b',
'differential-core-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b',
'differential-inline-comment-editor' => '9488bb69', 'differential-inline-comment-editor' => '9488bb69',
@ -4322,7 +4322,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' => 'f0f013fd', 'global-drag-and-drop-css' => '90efd2f0',
'inline-comment-summary-css' => 'dd27a69b', 'inline-comment-summary-css' => 'dd27a69b',
'javelin-aphlict' => 'f2ad0683', 'javelin-aphlict' => 'f2ad0683',
'javelin-behavior' => 'a9f14d76', 'javelin-behavior' => 'a9f14d76',
@ -4396,55 +4396,55 @@ celerity_register_resource_map(array(
'javelin-util' => 'a9f14d76', 'javelin-util' => 'a9f14d76',
'javelin-vector' => 'a9f14d76', 'javelin-vector' => 'a9f14d76',
'javelin-workflow' => 'a9f14d76', 'javelin-workflow' => 'a9f14d76',
'lightbox-attachment-css' => 'f0f013fd', 'lightbox-attachment-css' => '90efd2f0',
'maniphest-task-summary-css' => 'adc3c36d', 'maniphest-task-summary-css' => 'adc3c36d',
'maniphest-transaction-detail-css' => 'adc3c36d', 'maniphest-transaction-detail-css' => 'adc3c36d',
'phabricator-action-list-view-css' => 'f0f013fd', 'phabricator-action-list-view-css' => '90efd2f0',
'phabricator-application-launch-view-css' => 'f0f013fd', 'phabricator-application-launch-view-css' => '90efd2f0',
'phabricator-busy' => 'f2ad0683', 'phabricator-busy' => 'f2ad0683',
'phabricator-content-source-view-css' => 'dd27a69b', 'phabricator-content-source-view-css' => 'dd27a69b',
'phabricator-core-css' => 'f0f013fd', 'phabricator-core-css' => '90efd2f0',
'phabricator-crumbs-view-css' => 'f0f013fd', 'phabricator-crumbs-view-css' => '90efd2f0',
'phabricator-drag-and-drop-file-upload' => '9488bb69', 'phabricator-drag-and-drop-file-upload' => '9488bb69',
'phabricator-dropdown-menu' => 'f2ad0683', 'phabricator-dropdown-menu' => 'f2ad0683',
'phabricator-file-upload' => 'f2ad0683', 'phabricator-file-upload' => 'f2ad0683',
'phabricator-filetree-view-css' => 'f0f013fd', 'phabricator-filetree-view-css' => '90efd2f0',
'phabricator-flag-css' => 'f0f013fd', 'phabricator-flag-css' => '90efd2f0',
'phabricator-form-view-css' => 'f0f013fd', 'phabricator-form-view-css' => '90efd2f0',
'phabricator-header-view-css' => 'f0f013fd', 'phabricator-header-view-css' => '90efd2f0',
'phabricator-hovercard' => 'f2ad0683', 'phabricator-hovercard' => 'f2ad0683',
'phabricator-jump-nav' => 'f0f013fd', 'phabricator-jump-nav' => '90efd2f0',
'phabricator-keyboard-shortcut' => 'f2ad0683', 'phabricator-keyboard-shortcut' => 'f2ad0683',
'phabricator-keyboard-shortcut-manager' => 'f2ad0683', 'phabricator-keyboard-shortcut-manager' => 'f2ad0683',
'phabricator-main-menu-view' => 'f0f013fd', 'phabricator-main-menu-view' => '90efd2f0',
'phabricator-menu-item' => 'f2ad0683', 'phabricator-menu-item' => 'f2ad0683',
'phabricator-nav-view-css' => 'f0f013fd', 'phabricator-nav-view-css' => '90efd2f0',
'phabricator-notification' => 'f2ad0683', 'phabricator-notification' => 'f2ad0683',
'phabricator-notification-css' => 'f0f013fd', 'phabricator-notification-css' => '90efd2f0',
'phabricator-notification-menu-css' => 'f0f013fd', 'phabricator-notification-menu-css' => '90efd2f0',
'phabricator-object-item-list-view-css' => 'f0f013fd', 'phabricator-object-item-list-view-css' => '90efd2f0',
'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-object-selector-css' => 'dd27a69b',
'phabricator-phtize' => 'f2ad0683', 'phabricator-phtize' => 'f2ad0683',
'phabricator-prefab' => 'f2ad0683', 'phabricator-prefab' => 'f2ad0683',
'phabricator-project-tag-css' => 'adc3c36d', 'phabricator-project-tag-css' => 'adc3c36d',
'phabricator-property-list-view-css' => 'f0f013fd', 'phabricator-property-list-view-css' => '90efd2f0',
'phabricator-remarkup-css' => 'f0f013fd', 'phabricator-remarkup-css' => '90efd2f0',
'phabricator-shaped-request' => '9488bb69', 'phabricator-shaped-request' => '9488bb69',
'phabricator-side-menu-view-css' => 'f0f013fd', 'phabricator-side-menu-view-css' => '90efd2f0',
'phabricator-standard-page-view' => 'f0f013fd', 'phabricator-standard-page-view' => '90efd2f0',
'phabricator-tag-view-css' => 'f0f013fd', 'phabricator-tag-view-css' => '90efd2f0',
'phabricator-textareautils' => 'f2ad0683', 'phabricator-textareautils' => 'f2ad0683',
'phabricator-tooltip' => 'f2ad0683', 'phabricator-tooltip' => 'f2ad0683',
'phabricator-transaction-view-css' => 'f0f013fd', 'phabricator-transaction-view-css' => '90efd2f0',
'phabricator-zindex-css' => 'f0f013fd', 'phabricator-zindex-css' => '90efd2f0',
'phui-button-css' => 'f0f013fd', 'phui-button-css' => '90efd2f0',
'phui-form-css' => 'f0f013fd', 'phui-form-css' => '90efd2f0',
'phui-icon-view-css' => 'f0f013fd', 'phui-icon-view-css' => '90efd2f0',
'phui-spacing-css' => 'f0f013fd', 'phui-spacing-css' => '90efd2f0',
'sprite-apps-large-css' => 'f0f013fd', 'sprite-apps-large-css' => '90efd2f0',
'sprite-gradient-css' => 'f0f013fd', 'sprite-gradient-css' => '90efd2f0',
'sprite-icons-css' => 'f0f013fd', 'sprite-icons-css' => '90efd2f0',
'sprite-menu-css' => 'f0f013fd', 'sprite-menu-css' => '90efd2f0',
'syntax-highlighting-css' => 'f0f013fd', 'syntax-highlighting-css' => '90efd2f0',
), ),
)); ));

44
src/applications/auth/controller/PhabricatorEmailLoginController.php
View file

@ -110,10 +110,17 @@ EOBODY;
} }
$email_auth = new AphrontFormView(); $error_view = null;
if ($errors) {
$error_view = new AphrontErrorView();
$error_view->setErrors($errors);
}
$email_auth = new AphrontFormLayoutView();
$email_auth->appendChild($error_view);
$email_auth $email_auth
->setAction('/login/email/')
->setUser($request->getUser()) ->setUser($request->getUser())
->setFullWidth(true)
->appendChild( ->appendChild(
id(new AphrontFormTextControl()) id(new AphrontFormTextControl())
->setLabel(pht('Email')) ->setLabel(pht('Email'))
@ -123,30 +130,25 @@ EOBODY;
->appendChild( ->appendChild(
id(new AphrontFormRecaptchaControl()) id(new AphrontFormRecaptchaControl())
->setLabel(pht('Captcha')) ->setLabel(pht('Captcha'))
->setError($e_captcha)) ->setError($e_captcha));
->appendChild(
id(new AphrontFormSubmitControl())
->setValue(pht('Send Email')));
$error_view = null; $crumbs = $this->buildApplicationCrumbs();
if ($errors) { $crumbs->addCrumb(
$error_view = new AphrontErrorView(); id(new PhabricatorCrumbView())
$error_view->setTitle(pht('Login Error')); ->setName(pht('Reset Password')));
$error_view->setErrors($errors);
}
$dialog = new AphrontDialogView();
$panel = new AphrontPanelView(); $dialog->setUser($request->getUser());
$panel->setWidth(AphrontPanelView::WIDTH_FORM); $dialog->setTitle(pht(
$panel->appendChild(phutil_tag('h1', array(), pht( 'Forgot Password / Email Login'));
'Forgot Password / Email Login'))); $dialog->appendChild($email_auth);
$panel->appendChild($email_auth); $dialog->addSubmitButton(pht('Send Email'));
$panel->setNoBackground(); $dialog->setSubmitURI('/login/email/');
return $this->buildApplicationPage( return $this->buildApplicationPage(
array( array(
$error_view, $crumbs,
$panel, $dialog,
), ),
array( array(
'title' => pht('Forgot Password'), 'title' => pht('Forgot Password'),

4
webroot/rsrc/css/aphront/error-view.css
View file

@ -8,6 +8,10 @@
border-width: 1px; border-width: 1px;
} }
form.aphront-dialog-view .aphront-error-view {
margin: 8px 0;
}
.aphront-error-view { .aphront-error-view {
margin: 20px; margin: 20px;
} }

12
webroot/rsrc/css/aphront/form-view.css
View file

@ -32,9 +32,9 @@
.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 { .aphront-form-full-width.aphront-form-view label.aphront-form-label {
display: block; float: left;
text-align: left; text-align: left;
width: 100%; width: auto;
margin-bottom: 3px; margin-bottom: 3px;
} }
@ -54,9 +54,9 @@
.aphront-form-error { .aphront-form-error {
width: 18%; width: 18%;
float: right; float: right;
color: #c13728; color: {$red};
font-weight: bold; font-weight: bold;
padding-top: 4px; padding-top: 5px;
} }
.aphront-dialog-body .aphront-form-full-width { .aphront-dialog-body .aphront-form-full-width {
@ -65,8 +65,8 @@
.device-phone .aphront-form-error, .device-phone .aphront-form-error,
.aphront-form-full-width .aphront-form-error { .aphront-form-full-width .aphront-form-error {
float: none; float: right;
width: 100%; width: auto;
} }
.device-phone .aphront-form-drag-and-drop-upload { .device-phone .aphront-form-drag-and-drop-upload {