@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update styles on Login Reset
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
+79
-73
+46
-46
src/__celerity_resource_map__.php
+46
-46
src/__celerity_resource_map__.php
···
805
805
),
806
806
'aphront-error-view-css' =>
807
807
array(
808
-
'uri' => '/res/9684f1e9/rsrc/css/aphront/error-view.css',
808
+
'uri' => '/res/a574aa01/rsrc/css/aphront/error-view.css',
809
809
'type' => 'css',
810
810
'requires' =>
811
811
array(
···
814
814
),
815
815
'aphront-form-view-css' =>
816
816
array(
817
-
'uri' => '/res/068dd7ed/rsrc/css/aphront/form-view.css',
817
+
'uri' => '/res/ee9c241b/rsrc/css/aphront/form-view.css',
818
818
'type' => 'css',
819
819
'requires' =>
820
820
array(
···
4057
4057
), array(
4058
4058
'packages' =>
4059
4059
array(
4060
-
'f0f013fd' =>
4060
+
'90efd2f0' =>
4061
4061
array(
4062
4062
'name' => 'core.pkg.css',
4063
4063
'symbols' =>
···
4105
4105
40 => 'phabricator-property-list-view-css',
4106
4106
41 => 'phabricator-tag-view-css',
4107
4107
),
4108
-
'uri' => '/res/pkg/f0f013fd/core.pkg.css',
4108
+
'uri' => '/res/pkg/90efd2f0/core.pkg.css',
4109
4109
'type' => 'css',
4110
4110
),
4111
4111
'f2ad0683' =>
···
4299
4299
'reverse' =>
4300
4300
array(
4301
4301
'aphront-attached-file-view-css' => 'adc3c36d',
4302
-
'aphront-dialog-view-css' => 'f0f013fd',
4303
-
'aphront-error-view-css' => 'f0f013fd',
4304
-
'aphront-form-view-css' => 'f0f013fd',
4305
-
'aphront-list-filter-view-css' => 'f0f013fd',
4306
-
'aphront-pager-view-css' => 'f0f013fd',
4307
-
'aphront-panel-view-css' => 'f0f013fd',
4308
-
'aphront-table-view-css' => 'f0f013fd',
4309
-
'aphront-tokenizer-control-css' => 'f0f013fd',
4310
-
'aphront-tooltip-css' => 'f0f013fd',
4311
-
'aphront-typeahead-control-css' => 'f0f013fd',
4302
+
'aphront-dialog-view-css' => '90efd2f0',
4303
+
'aphront-error-view-css' => '90efd2f0',
4304
+
'aphront-form-view-css' => '90efd2f0',
4305
+
'aphront-list-filter-view-css' => '90efd2f0',
4306
+
'aphront-pager-view-css' => '90efd2f0',
4307
+
'aphront-panel-view-css' => '90efd2f0',
4308
+
'aphront-table-view-css' => '90efd2f0',
4309
+
'aphront-tokenizer-control-css' => '90efd2f0',
4310
+
'aphront-tooltip-css' => '90efd2f0',
4311
+
'aphront-typeahead-control-css' => '90efd2f0',
4312
4312
'differential-changeset-view-css' => 'dd27a69b',
4313
4313
'differential-core-view-css' => 'dd27a69b',
4314
4314
'differential-inline-comment-editor' => '9488bb69',
···
4322
4322
'differential-table-of-contents-css' => 'dd27a69b',
4323
4323
'diffusion-commit-view-css' => 'c8ce2d88',
4324
4324
'diffusion-icons-css' => 'c8ce2d88',
4325
-
'global-drag-and-drop-css' => 'f0f013fd',
4325
+
'global-drag-and-drop-css' => '90efd2f0',
4326
4326
'inline-comment-summary-css' => 'dd27a69b',
4327
4327
'javelin-aphlict' => 'f2ad0683',
4328
4328
'javelin-behavior' => 'a9f14d76',
···
4396
4396
'javelin-util' => 'a9f14d76',
4397
4397
'javelin-vector' => 'a9f14d76',
4398
4398
'javelin-workflow' => 'a9f14d76',
4399
-
'lightbox-attachment-css' => 'f0f013fd',
4399
+
'lightbox-attachment-css' => '90efd2f0',
4400
4400
'maniphest-task-summary-css' => 'adc3c36d',
4401
4401
'maniphest-transaction-detail-css' => 'adc3c36d',
4402
-
'phabricator-action-list-view-css' => 'f0f013fd',
4403
-
'phabricator-application-launch-view-css' => 'f0f013fd',
4402
+
'phabricator-action-list-view-css' => '90efd2f0',
4403
+
'phabricator-application-launch-view-css' => '90efd2f0',
4404
4404
'phabricator-busy' => 'f2ad0683',
4405
4405
'phabricator-content-source-view-css' => 'dd27a69b',
4406
-
'phabricator-core-css' => 'f0f013fd',
4407
-
'phabricator-crumbs-view-css' => 'f0f013fd',
4406
+
'phabricator-core-css' => '90efd2f0',
4407
+
'phabricator-crumbs-view-css' => '90efd2f0',
4408
4408
'phabricator-drag-and-drop-file-upload' => '9488bb69',
4409
4409
'phabricator-dropdown-menu' => 'f2ad0683',
4410
4410
'phabricator-file-upload' => 'f2ad0683',
4411
-
'phabricator-filetree-view-css' => 'f0f013fd',
4412
-
'phabricator-flag-css' => 'f0f013fd',
4413
-
'phabricator-form-view-css' => 'f0f013fd',
4414
-
'phabricator-header-view-css' => 'f0f013fd',
4411
+
'phabricator-filetree-view-css' => '90efd2f0',
4412
+
'phabricator-flag-css' => '90efd2f0',
4413
+
'phabricator-form-view-css' => '90efd2f0',
4414
+
'phabricator-header-view-css' => '90efd2f0',
4415
4415
'phabricator-hovercard' => 'f2ad0683',
4416
-
'phabricator-jump-nav' => 'f0f013fd',
4416
+
'phabricator-jump-nav' => '90efd2f0',
4417
4417
'phabricator-keyboard-shortcut' => 'f2ad0683',
4418
4418
'phabricator-keyboard-shortcut-manager' => 'f2ad0683',
4419
-
'phabricator-main-menu-view' => 'f0f013fd',
4419
+
'phabricator-main-menu-view' => '90efd2f0',
4420
4420
'phabricator-menu-item' => 'f2ad0683',
4421
-
'phabricator-nav-view-css' => 'f0f013fd',
4421
+
'phabricator-nav-view-css' => '90efd2f0',
4422
4422
'phabricator-notification' => 'f2ad0683',
4423
-
'phabricator-notification-css' => 'f0f013fd',
4424
-
'phabricator-notification-menu-css' => 'f0f013fd',
4425
-
'phabricator-object-item-list-view-css' => 'f0f013fd',
4423
+
'phabricator-notification-css' => '90efd2f0',
4424
+
'phabricator-notification-menu-css' => '90efd2f0',
4425
+
'phabricator-object-item-list-view-css' => '90efd2f0',
4426
4426
'phabricator-object-selector-css' => 'dd27a69b',
4427
4427
'phabricator-phtize' => 'f2ad0683',
4428
4428
'phabricator-prefab' => 'f2ad0683',
4429
4429
'phabricator-project-tag-css' => 'adc3c36d',
4430
-
'phabricator-property-list-view-css' => 'f0f013fd',
4431
-
'phabricator-remarkup-css' => 'f0f013fd',
4430
+
'phabricator-property-list-view-css' => '90efd2f0',
4431
+
'phabricator-remarkup-css' => '90efd2f0',
4432
4432
'phabricator-shaped-request' => '9488bb69',
4433
-
'phabricator-side-menu-view-css' => 'f0f013fd',
4434
-
'phabricator-standard-page-view' => 'f0f013fd',
4435
-
'phabricator-tag-view-css' => 'f0f013fd',
4433
+
'phabricator-side-menu-view-css' => '90efd2f0',
4434
+
'phabricator-standard-page-view' => '90efd2f0',
4435
+
'phabricator-tag-view-css' => '90efd2f0',
4436
4436
'phabricator-textareautils' => 'f2ad0683',
4437
4437
'phabricator-tooltip' => 'f2ad0683',
4438
-
'phabricator-transaction-view-css' => 'f0f013fd',
4439
-
'phabricator-zindex-css' => 'f0f013fd',
4440
-
'phui-button-css' => 'f0f013fd',
4441
-
'phui-form-css' => 'f0f013fd',
4442
-
'phui-icon-view-css' => 'f0f013fd',
4443
-
'phui-spacing-css' => 'f0f013fd',
4444
-
'sprite-apps-large-css' => 'f0f013fd',
4445
-
'sprite-gradient-css' => 'f0f013fd',
4446
-
'sprite-icons-css' => 'f0f013fd',
4447
-
'sprite-menu-css' => 'f0f013fd',
4448
-
'syntax-highlighting-css' => 'f0f013fd',
4438
+
'phabricator-transaction-view-css' => '90efd2f0',
4439
+
'phabricator-zindex-css' => '90efd2f0',
4440
+
'phui-button-css' => '90efd2f0',
4441
+
'phui-form-css' => '90efd2f0',
4442
+
'phui-icon-view-css' => '90efd2f0',
4443
+
'phui-spacing-css' => '90efd2f0',
4444
+
'sprite-apps-large-css' => '90efd2f0',
4445
+
'sprite-gradient-css' => '90efd2f0',
4446
+
'sprite-icons-css' => '90efd2f0',
4447
+
'sprite-menu-css' => '90efd2f0',
4448
+
'syntax-highlighting-css' => '90efd2f0',
4449
4449
),
4450
4450
));
+23
-21
src/applications/auth/controller/PhabricatorEmailLoginController.php
+23
-21
src/applications/auth/controller/PhabricatorEmailLoginController.php
···
110
110
111
111
}
112
112
113
-
$email_auth = new AphrontFormView();
113
+
$error_view = null;
114
+
if ($errors) {
115
+
$error_view = new AphrontErrorView();
116
+
$error_view->setErrors($errors);
117
+
}
118
+
119
+
$email_auth = new AphrontFormLayoutView();
120
+
$email_auth->appendChild($error_view);
114
121
$email_auth
115
-
->setAction('/login/email/')
116
122
->setUser($request->getUser())
123
+
->setFullWidth(true)
117
124
->appendChild(
118
125
id(new AphrontFormTextControl())
119
126
->setLabel(pht('Email'))
···
123
130
->appendChild(
124
131
id(new AphrontFormRecaptchaControl())
125
132
->setLabel(pht('Captcha'))
126
-
->setError($e_captcha))
127
-
->appendChild(
128
-
id(new AphrontFormSubmitControl())
129
-
->setValue(pht('Send Email')));
130
-
131
-
$error_view = null;
132
-
if ($errors) {
133
-
$error_view = new AphrontErrorView();
134
-
$error_view->setTitle(pht('Login Error'));
135
-
$error_view->setErrors($errors);
136
-
}
133
+
->setError($e_captcha));
137
134
135
+
$crumbs = $this->buildApplicationCrumbs();
136
+
$crumbs->addCrumb(
137
+
id(new PhabricatorCrumbView())
138
+
->setName(pht('Reset Password')));
138
139
139
-
$panel = new AphrontPanelView();
140
-
$panel->setWidth(AphrontPanelView::WIDTH_FORM);
141
-
$panel->appendChild(phutil_tag('h1', array(), pht(
142
-
'Forgot Password / Email Login')));
143
-
$panel->appendChild($email_auth);
144
-
$panel->setNoBackground();
140
+
$dialog = new AphrontDialogView();
141
+
$dialog->setUser($request->getUser());
142
+
$dialog->setTitle(pht(
143
+
'Forgot Password / Email Login'));
144
+
$dialog->appendChild($email_auth);
145
+
$dialog->addSubmitButton(pht('Send Email'));
146
+
$dialog->setSubmitURI('/login/email/');
145
147
146
148
return $this->buildApplicationPage(
147
149
array(
148
-
$error_view,
149
-
$panel,
150
+
$crumbs,
151
+
$dialog,
150
152
),
151
153
array(
152
154
'title' => pht('Forgot Password'),
+4
webroot/rsrc/css/aphront/error-view.css
+4
webroot/rsrc/css/aphront/error-view.css
+6
-6
webroot/rsrc/css/aphront/form-view.css
+6
-6
webroot/rsrc/css/aphront/form-view.css
···
32
32
33
33
.device-phone .aphront-form-view label.aphront-form-label,
34
34
.aphront-form-full-width.aphront-form-view label.aphront-form-label {
35
-
display: block;
35
+
float: left;
36
36
text-align: left;
37
-
width: 100%;
37
+
width: auto;
38
38
margin-bottom: 3px;
39
39
}
40
40
···
54
54
.aphront-form-error {
55
55
width: 18%;
56
56
float: right;
57
-
color: #c13728;
57
+
color: {$red};
58
58
font-weight: bold;
59
-
padding-top: 4px;
59
+
padding-top: 5px;
60
60
}
61
61
62
62
.aphront-dialog-body .aphront-form-full-width {
···
65
65
66
66
.device-phone .aphront-form-error,
67
67
.aphront-form-full-width .aphront-form-error {
68
-
float: none;
69
-
width: 100%;
68
+
float: right;
69
+
width: auto;
70
70
}
71
71
72
72
.device-phone .aphront-form-drag-and-drop-upload {