@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 EditEngine pages to take a page header separate
Summary: This simplifies EditEngine pages in general by removing the dual header, and extending to allow setting of a custom PHUIHeaderView if needed (like settings).
Test Plan:
Review all settings pages, review task, project pages. This should all be fine, but is a big change maybe some layouts I'm not considering. Tested these all mobile, destkop as well.
{F5166181}
Reviewers: epriestley
Reviewed By: epriestley
Spies: Korvin
Differential Revision: https://secure.phabricator.com/D18527
+50
-18
+3
-3
resources/celerity/map.php
+3
-3
resources/celerity/map.php
···
9
9
'names' => array(
10
10
'conpherence.pkg.css' => 'e68cf1fa',
11
11
'conpherence.pkg.js' => 'b5b51108',
12
-
'core.pkg.css' => '03264689',
12
+
'core.pkg.css' => 'b2235af0',
13
13
'core.pkg.js' => '6c085267',
14
14
'darkconsole.pkg.js' => '1f9a31bc',
15
15
'differential.pkg.css' => '45951e9e',
···
177
177
'rsrc/css/phui/phui-status.css' => 'd5263e49',
178
178
'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
179
179
'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
180
-
'rsrc/css/phui/phui-two-column-view.css' => 'bf86c483',
180
+
'rsrc/css/phui/phui-two-column-view.css' => '1ade9c5f',
181
181
'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
182
182
'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
183
183
'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
···
872
872
'phui-tag-view-css' => 'b4719c50',
873
873
'phui-theme-css' => '9f261c6b',
874
874
'phui-timeline-view-css' => 'f21db7ca',
875
-
'phui-two-column-view-css' => 'bf86c483',
875
+
'phui-two-column-view-css' => '1ade9c5f',
876
876
'phui-workboard-color-css' => '783cdff5',
877
877
'phui-workboard-view-css' => '3bc85455',
878
878
'phui-workcard-view-css' => 'cca5fa92',
+20
-5
src/applications/settings/editor/PhabricatorSettingsEditEngine.php
+20
-5
src/applications/settings/editor/PhabricatorSettingsEditEngine.php
···
63
63
}
64
64
65
65
protected function getObjectEditTitleText($object) {
66
-
$user = $object->getUser();
67
-
if ($user) {
68
-
return pht('Edit Settings (%s)', $user->getUserName());
69
-
} else {
70
-
return pht('Edit Global Settings');
66
+
$page = $this->getSelectedPage();
67
+
68
+
if ($page) {
69
+
return $page->getLabel();
71
70
}
71
+
72
+
return pht('Settings');
72
73
}
73
74
74
75
protected function getObjectEditShortText($object) {
···
95
96
}
96
97
97
98
return pht('Settings');
99
+
}
100
+
101
+
protected function getPageHeader($object) {
102
+
$user = $object->getUser();
103
+
if ($user) {
104
+
$text = pht('Edit Settings (%s)', $user->getUserName());
105
+
} else {
106
+
$text = pht('Edit Global Settings');
107
+
}
108
+
109
+
$header = id(new PHUIHeaderView())
110
+
->setHeader($text);
111
+
112
+
return $header;
98
113
}
99
114
100
115
protected function getEditorURI() {
+19
-9
src/applications/transactions/editengine/PhabricatorEditEngine.php
+19
-9
src/applications/transactions/editengine/PhabricatorEditEngine.php
···
313
313
314
314
315
315
/**
316
+
* @task text
317
+
*/
318
+
protected function getPageHeader($object) {
319
+
return null;
320
+
}
321
+
322
+
323
+
324
+
/**
316
325
* Return a human-readable header describing what this engine is used to do,
317
326
* like "Configure Maniphest Task Forms".
318
327
*
···
1169
1178
1170
1179
$form = $this->buildEditForm($object, $fields);
1171
1180
1181
+
$crumbs = $this->buildCrumbs($object, $final = true);
1182
+
$crumbs->setBorder(true);
1183
+
1172
1184
if ($request->isAjax()) {
1173
1185
return $this->getController()
1174
1186
->newDialog()
···
1180
1192
->addSubmitButton($submit_button);
1181
1193
}
1182
1194
1183
-
$crumbs = $this->buildCrumbs($object, $final = true);
1184
-
1185
-
$header = id(new PHUIHeaderView())
1195
+
$box_header = id(new PHUIHeaderView())
1186
1196
->setHeader($header_text);
1187
-
$crumbs->setBorder(true);
1188
1197
1189
1198
if ($action_button) {
1190
-
$header->addActionLink($action_button);
1199
+
$box_header->addActionLink($action_button);
1191
1200
}
1192
1201
1193
1202
$box = id(new PHUIObjectBoxView())
1194
1203
->setUser($viewer)
1195
-
->setHeaderText($this->getObjectName())
1204
+
->setHeader($box_header)
1196
1205
->setValidationException($validation_exception)
1197
-
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
1206
+
->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
1198
1207
->appendChild($form);
1199
1208
1200
1209
// This is fairly questionable, but in use by Settings.
···
1209
1218
1210
1219
$view = new PHUITwoColumnView();
1211
1220
1212
-
if ($header) {
1213
-
$view->setHeader($header);
1221
+
$page_header = $this->getPageHeader($object);
1222
+
if ($page_header) {
1223
+
$view->setHeader($page_header);
1214
1224
}
1215
1225
1216
1226
$page = $controller->newPage()
-1
src/view/phui/PHUIInfoView.php
-1
src/view/phui/PHUIInfoView.php
+4
src/view/phui/PHUITwoColumnView.php
+4
src/view/phui/PHUITwoColumnView.php