@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
Moderize forms on Settings.
Summary: Adds mobile support, new forms.
Test Plan: Clicked on each page after converting. Tested mobile menu
Reviewers: epriestley, btrahan
Reviewed By: epriestley
CC: aran, Korvin
Differential Revision: https://secure.phabricator.com/D5863
+71
-69
+1
-1
src/__celerity_resource_map__.php
+1
-1
src/__celerity_resource_map__.php
+7
src/applications/settings/controller/PhabricatorSettingsMainController.php
+7
src/applications/settings/controller/PhabricatorSettingsMainController.php
···
30
30
$nav,
31
31
array(
32
32
'title' => $panel->getPanelName(),
33
+
'device' => true,
34
+
'dust' => true,
33
35
));
34
36
}
35
37
···
83
85
}
84
86
85
87
return $nav;
88
+
}
89
+
90
+
public function buildApplicationMenu() {
91
+
$panels = $this->buildPanels();
92
+
return $this->renderSideNav($panels)->getMenu();
86
93
}
87
94
88
95
}
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
···
89
89
id(new AphrontFormSubmitControl())
90
90
->setValue(pht('Save')));
91
91
92
-
$panel = new AphrontPanelView();
93
-
$panel->setHeader(pht('Account Settings'));
94
-
$panel->appendChild($form);
95
-
$panel->setNoBackground();
92
+
$header = new PhabricatorHeaderView();
93
+
$header->setHeader(pht('Account Settings'));
96
94
97
95
return array(
98
96
$notice,
99
-
$panel,
97
+
$header,
98
+
$form,
100
99
);
101
100
}
102
101
}
+8
-10
src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
+8
-10
src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
···
78
78
->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT)
79
79
->setValue($user->getConduitCertificate()));
80
80
81
-
$cert = new AphrontPanelView();
82
-
$cert->setHeader(pht('Arcanist Certificate'));
83
-
$cert->appendChild($cert_form);
84
-
$cert->setNoBackground();
81
+
$header1 = new PhabricatorHeaderView();
82
+
$header1->setHeader(pht('Arcanist Certificate'));
85
83
86
84
$regen_instruction = pht('You can regenerate this certificate, which '.
87
85
'will invalidate the old certificate and create a new one.');
···
97
95
id(new AphrontFormSubmitControl())
98
96
->setValue(pht('Regenerate Certificate')));
99
97
100
-
$regen = new AphrontPanelView();
101
-
$regen->setHeader(pht('Regenerate Certificate'));
102
-
$regen->appendChild($regen_form);
103
-
$regen->setNoBackground();
98
+
$header = new PhabricatorHeaderView();
99
+
$header->setHeader(pht('Regenerate Certificate'));
104
100
105
101
return array(
106
102
$notice,
107
-
$cert,
108
-
$regen,
103
+
$header1,
104
+
$cert_form,
105
+
$header,
106
+
$regen_form,
109
107
);
110
108
}
111
109
}
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
···
56
56
id(new AphrontFormSubmitControl())
57
57
->setValue(pht('Save Preferences')));
58
58
59
-
$panel = new AphrontPanelView();
60
-
$panel->setHeader(pht('Conpherence Preferences'));
61
-
$panel->appendChild($form);
62
-
$panel->setNoBackground();
59
+
$header = new PhabricatorHeaderView();
60
+
$header->setHeader(pht('Conpherence Preferences'));
63
61
64
62
$error_view = null;
65
63
if ($request->getBool('saved')) {
···
71
69
72
70
return array(
73
71
$error_view,
74
-
$panel,
72
+
$header,
73
+
$form,
75
74
);
76
75
}
77
76
}
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
···
58
58
id(new AphrontFormSubmitControl())
59
59
->setValue(pht('Save Preferences')));
60
60
61
-
$panel = new AphrontPanelView();
62
-
$panel->setHeader(pht('Diff Preferences'));
63
-
$panel->appendChild($form);
64
-
$panel->setNoBackground();
61
+
$header = new PhabricatorHeaderView();
62
+
$header->setHeader(pht('Diff Preferences'));
65
63
66
64
$error_view = null;
67
65
if ($request->getBool('saved')) {
···
73
71
74
72
return array(
75
73
$error_view,
76
-
$panel,
74
+
$header,
75
+
$form,
77
76
);
78
77
}
79
78
}
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
···
157
157
id(new AphrontFormSubmitControl())
158
158
->setValue(pht('Save Preferences')));
159
159
160
-
$panel = new AphrontPanelView();
161
-
$panel->setHeader(pht('Display Preferences'));
162
-
$panel->appendChild($form);
163
-
$panel->setNoBackground();
160
+
$header = new PhabricatorHeaderView();
161
+
$header->setHeader(pht('Display Preferences'));
164
162
165
163
$error_view = null;
166
164
if ($request->getStr('saved') === 'true') {
···
172
170
173
171
return array(
174
172
$error_view,
175
-
$panel,
173
+
$header,
174
+
$form,
176
175
);
177
176
}
178
177
}
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
···
203
203
id(new AphrontFormSubmitControl())
204
204
->setValue(pht('Save Preferences')));
205
205
206
-
$panel = new AphrontPanelView();
207
-
$panel->setHeader(pht('Email Preferences'));
208
-
$panel->appendChild($form);
209
-
$panel->setNoBackground();
206
+
$header = new PhabricatorHeaderView();
207
+
$header->setHeader(pht('Email Preferences'));
210
208
211
209
return id(new AphrontNullView())
212
210
->appendChild(
213
211
array(
214
212
$notice,
215
-
$panel,
213
+
$header,
214
+
$form,
216
215
));
217
216
}
218
217
+9
-6
src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
+9
-6
src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
···
69
69
$forms['Unlink Account'] = $unlink_form;
70
70
}
71
71
72
-
$panel = new AphrontPanelView();
73
-
$panel->setHeader(pht('LDAP Account Settings'));
74
-
$panel->setNoBackground();
72
+
$header = new PhabricatorHeaderView();
73
+
$header->setHeader(pht('LDAP Account Settings'));
75
74
75
+
$formbox = new PHUIBoxView();
76
76
foreach ($forms as $name => $form) {
77
77
if ($name) {
78
-
$panel->appendChild(hsprintf('<br /><h1>%s</h1><br />', $name));
78
+
$head = new PhabricatorHeaderView();
79
+
$head->setHeader($name);
80
+
$formbox->appendChild($head);
79
81
}
80
-
$panel->appendChild($form);
82
+
$formbox->appendChild($form);
81
83
}
82
84
83
85
return array(
84
-
$panel,
86
+
$header,
87
+
$formbox,
85
88
);
86
89
}
87
90
}
+10
-7
src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
+10
-7
src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
···
128
128
}
129
129
130
130
if (!$provider->isProviderLinkPermanent()) {
131
-
$unlink = pht('Unlink %s Account');
131
+
$unlink = pht('Unlink %s Account', $provider_name);
132
132
$unlink_form = new AphrontFormView();
133
133
$unlink_form
134
134
->setUser($user)
···
208
208
$forms['Account Token Information'] = $token_form;
209
209
}
210
210
211
-
$panel = new AphrontPanelView();
212
-
$panel->setHeader(pht('%s Account Settings', $provider_name));
213
-
$panel->setNoBackground();
211
+
$header = new PhabricatorHeaderView();
212
+
$header->setHeader(pht('%s Account Settings', $provider_name));
214
213
214
+
$formbox = new PHUIBoxView();
215
215
foreach ($forms as $name => $form) {
216
216
if ($name) {
217
-
$panel->appendChild(hsprintf('<br /><h1>%s</h1><br />', $name));
217
+
$head = new PhabricatorHeaderView();
218
+
$head->setHeader($name);
219
+
$formbox->appendChild($head);
218
220
}
219
-
$panel->appendChild($form);
221
+
$formbox->appendChild($form);
220
222
}
221
223
222
224
return id(new AphrontNullView())
223
225
->appendChild(
224
226
array(
225
227
$notice,
226
-
$panel,
228
+
$header,
229
+
$formbox,
227
230
));
228
231
}
229
232
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
···
159
159
id(new AphrontFormSubmitControl())
160
160
->setValue(pht('Save')));
161
161
162
-
$panel = new AphrontPanelView();
163
-
$panel->setHeader(pht('Change Password'));
164
-
$panel->appendChild($form);
165
-
$panel->setNoBackground();
162
+
$header = new PhabricatorHeaderView();
163
+
$header->setHeader(pht('Change Password'));
166
164
167
165
return array(
168
166
$notice,
169
-
$panel,
167
+
$header,
168
+
$form,
170
169
);
171
170
}
172
171
}
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
···
217
217
->setValue(pht('Save'))
218
218
->addCancelButton('/p/'.$user->getUsername().'/'));
219
219
220
-
$panel = new AphrontPanelView();
221
-
$panel->setHeader(pht('Edit Profile Details'));
222
-
$panel->appendChild($form);
223
-
$panel->setNoBackground();
220
+
$header = new PhabricatorHeaderView();
221
+
$header->setHeader(pht('Edit Profile Details'));
224
222
225
223
return array(
226
224
$error_view,
227
-
$panel,
225
+
$header,
226
+
$form,
228
227
);
229
228
}
230
229
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
···
152
152
->addCancelButton($this->getPanelURI())
153
153
->setValue($save));
154
154
155
-
$panel = new AphrontPanelView();
156
-
$panel->setHeader($header);
157
-
$panel->appendChild($form);
158
-
$panel->setNoBackground();
155
+
$header_title = new PhabricatorHeaderView();
156
+
$header_title->setHeader($header);
159
157
160
158
return id(new AphrontNullView())
161
159
->appendChild(
162
160
array(
163
161
$error_view,
164
-
$panel,
162
+
$header_title,
163
+
$form,
165
164
));
166
165
}
167
166
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
+4
-5
src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
···
50
50
id(new AphrontFormSubmitControl())
51
51
->setValue(pht('Save')));
52
52
53
-
$panel = new AphrontPanelView();
54
-
$panel->setHeader(pht('Search Preferences'));
55
-
$panel->appendChild($form);
56
-
$panel->setNoBackground();
53
+
$header = new PhabricatorHeaderView();
54
+
$header->setHeader(pht('Search Preferences'));
57
55
58
56
$error_view = null;
59
57
if ($request->getStr('saved') === 'true') {
···
65
63
66
64
return array(
67
65
$error_view,
68
-
$panel,
66
+
$header,
67
+
$form,
69
68
);
70
69
}
71
70
}