@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 Config Application UI
Summary: Switches over to new property UI boxes, splits core and apps into separate pages. Move Versions into "All Settings". I think there is some docs I likely need to update here as well.
Test Plan: Click on each item in the sidebar, see new headers.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D16429
+146
-32
+4
-2
src/__phutil_library_map__.php
+4
-2
src/__phutil_library_map__.php
···
2140
2140
'PhabricatorConduitTokensSettingsPanel' => 'applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php',
2141
2141
'PhabricatorConfigAllController' => 'applications/config/controller/PhabricatorConfigAllController.php',
2142
2142
'PhabricatorConfigApplication' => 'applications/config/application/PhabricatorConfigApplication.php',
2143
+
'PhabricatorConfigApplicationController' => 'applications/config/controller/PhabricatorConfigApplicationController.php',
2143
2144
'PhabricatorConfigCacheController' => 'applications/config/controller/PhabricatorConfigCacheController.php',
2144
2145
'PhabricatorConfigClusterDatabasesController' => 'applications/config/controller/PhabricatorConfigClusterDatabasesController.php',
2145
2146
'PhabricatorConfigClusterNotificationsController' => 'applications/config/controller/PhabricatorConfigClusterNotificationsController.php',
···
2201
2202
'PhabricatorConfigTransaction' => 'applications/config/storage/PhabricatorConfigTransaction.php',
2202
2203
'PhabricatorConfigTransactionQuery' => 'applications/config/query/PhabricatorConfigTransactionQuery.php',
2203
2204
'PhabricatorConfigValidationException' => 'applications/config/exception/PhabricatorConfigValidationException.php',
2204
-
'PhabricatorConfigVersionsModule' => 'applications/config/module/PhabricatorConfigVersionsModule.php',
2205
+
'PhabricatorConfigVersionController' => 'applications/config/controller/PhabricatorConfigVersionController.php',
2205
2206
'PhabricatorConfigWelcomeController' => 'applications/config/controller/PhabricatorConfigWelcomeController.php',
2206
2207
'PhabricatorConpherenceApplication' => 'applications/conpherence/application/PhabricatorConpherenceApplication.php',
2207
2208
'PhabricatorConpherenceColumnVisibleSetting' => 'applications/settings/setting/PhabricatorConpherenceColumnVisibleSetting.php',
···
6877
6878
'PhabricatorConduitTokensSettingsPanel' => 'PhabricatorSettingsPanel',
6878
6879
'PhabricatorConfigAllController' => 'PhabricatorConfigController',
6879
6880
'PhabricatorConfigApplication' => 'PhabricatorApplication',
6881
+
'PhabricatorConfigApplicationController' => 'PhabricatorConfigController',
6880
6882
'PhabricatorConfigCacheController' => 'PhabricatorConfigController',
6881
6883
'PhabricatorConfigClusterDatabasesController' => 'PhabricatorConfigController',
6882
6884
'PhabricatorConfigClusterNotificationsController' => 'PhabricatorConfigController',
···
6945
6947
'PhabricatorConfigTransaction' => 'PhabricatorApplicationTransaction',
6946
6948
'PhabricatorConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
6947
6949
'PhabricatorConfigValidationException' => 'Exception',
6948
-
'PhabricatorConfigVersionsModule' => 'PhabricatorConfigModule',
6950
+
'PhabricatorConfigVersionController' => 'PhabricatorConfigController',
6949
6951
'PhabricatorConfigWelcomeController' => 'PhabricatorConfigController',
6950
6952
'PhabricatorConpherenceApplication' => 'PhabricatorApplication',
6951
6953
'PhabricatorConpherenceColumnVisibleSetting' => 'PhabricatorInternalSetting',
+1
src/applications/auth/engine/PhabricatorAuthSessionEngineExtensionModule.php
+1
src/applications/auth/engine/PhabricatorAuthSessionEngineExtensionModule.php
+1
src/applications/auth/tokentype/PhabricatorAuthTemporaryTokenTypeModule.php
+1
src/applications/auth/tokentype/PhabricatorAuthTemporaryTokenTypeModule.php
+2
src/applications/config/application/PhabricatorConfigApplication.php
+2
src/applications/config/application/PhabricatorConfigApplication.php
···
38
38
return array(
39
39
'/config/' => array(
40
40
'' => 'PhabricatorConfigListController',
41
+
'application/' => 'PhabricatorConfigApplicationController',
41
42
'all/' => 'PhabricatorConfigAllController',
42
43
'history/' => 'PhabricatorConfigHistoryController',
43
44
'edit/(?P<key>[\w\.\-]+)/' => 'PhabricatorConfigEditController',
44
45
'group/(?P<key>[^/]+)/' => 'PhabricatorConfigGroupController',
46
+
'version/' => 'PhabricatorConfigVersionController',
45
47
'welcome/' => 'PhabricatorConfigWelcomeController',
46
48
'database/'.
47
49
'(?:(?P<database>[^/]+)/'.
+5
-3
src/applications/config/controller/PhabricatorConfigAllController.php
+5
-3
src/applications/config/controller/PhabricatorConfigAllController.php
···
52
52
53
53
$crumbs = $this
54
54
->buildApplicationCrumbs()
55
+
->addTextCrumb(pht('Configuration'), $this->getApplicationURI())
55
56
->addTextCrumb($title);
56
57
57
-
$panel = new PHUIObjectBoxView();
58
-
$panel->setHeaderText(pht('Current Settings'));
59
-
$panel->setTable($table);
58
+
$panel = id(new PHUIObjectBoxView())
59
+
->setHeaderText(pht('Current Settings'))
60
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
61
+
->setTable($table);
60
62
61
63
$nav = $this->buildSideNavView();
62
64
$nav->selectFilter('all/');
+58
src/applications/config/controller/PhabricatorConfigApplicationController.php
+58
src/applications/config/controller/PhabricatorConfigApplicationController.php
···
1
+
<?php
2
+
3
+
final class PhabricatorConfigApplicationController
4
+
extends PhabricatorConfigController {
5
+
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $request->getViewer();
8
+
9
+
$nav = $this->buildSideNavView();
10
+
$nav->selectFilter('application/');
11
+
12
+
$groups = PhabricatorApplicationConfigOptions::loadAll();
13
+
$apps_list = $this->buildConfigOptionsList($groups, 'apps');
14
+
15
+
$title = pht('Application Configuration');
16
+
17
+
$apps = id(new PHUIObjectBoxView())
18
+
->setHeaderText($title)
19
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
20
+
->setObjectList($apps_list);
21
+
22
+
$crumbs = $this
23
+
->buildApplicationCrumbs()
24
+
->addTextCrumb(pht('Configuration'), $this->getApplicationURI())
25
+
->addTextCrumb(pht('Applications'));
26
+
27
+
$view = id(new PHUITwoColumnView())
28
+
->setNavigation($nav)
29
+
->setMainColumn(array(
30
+
$apps,
31
+
));
32
+
33
+
return $this->newPage()
34
+
->setTitle($title)
35
+
->setCrumbs($crumbs)
36
+
->appendChild($view);
37
+
}
38
+
39
+
private function buildConfigOptionsList(array $groups, $type) {
40
+
assert_instances_of($groups, 'PhabricatorApplicationConfigOptions');
41
+
42
+
$list = new PHUIObjectItemListView();
43
+
$groups = msort($groups, 'getName');
44
+
foreach ($groups as $group) {
45
+
if ($group->getGroup() == $type) {
46
+
$item = id(new PHUIObjectItemView())
47
+
->setHeader($group->getName())
48
+
->setHref('/config/group/'.$group->getKey().'/')
49
+
->addAttribute($group->getDescription())
50
+
->setImageIcon($group->getIcon());
51
+
$list->addItem($item);
52
+
}
53
+
}
54
+
55
+
return $list;
56
+
}
57
+
58
+
}
+2
src/applications/config/controller/PhabricatorConfigCacheController.php
+2
src/applications/config/controller/PhabricatorConfigCacheController.php
···
51
51
52
52
return id(new PHUIObjectBoxView())
53
53
->setHeader($header)
54
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
54
55
->addPropertyList($properties);
55
56
}
56
57
···
102
103
return id(new PHUIObjectBoxView())
103
104
->setHeaderText(pht('Data Cache'))
104
105
->addPropertyList($properties)
106
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
105
107
->setTable($table);
106
108
}
107
109
+1
src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
+1
src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
+1
src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
+1
src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
+1
src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
+1
src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
+5
-4
src/applications/config/controller/PhabricatorConfigController.php
+5
-4
src/applications/config/controller/PhabricatorConfigController.php
···
12
12
$nav = new AphrontSideNavFilterView();
13
13
$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
14
14
$nav->addLabel(pht('Configuration'));
15
-
$nav->addFilter('/', pht('Browse Settings'));
15
+
$nav->addFilter('/', pht('Core Settings'));
16
+
$nav->addFilter('application/', pht('Application Settings'));
17
+
$nav->addFilter('history/', pht('Settings History'));
18
+
$nav->addFilter('version/', pht('Version Information'));
16
19
$nav->addFilter('all/', pht('All Settings'));
17
-
$nav->addFilter('history/', pht('Settings History'));
18
20
$nav->addLabel(pht('Setup'));
19
21
$nav->addFilter('issue/', pht('Setup Issues'));
22
+
$nav->addFilter('welcome/', pht('Installation Guide'));
20
23
$nav->addLabel(pht('Database'));
21
24
$nav->addFilter('database/', pht('Database Status'));
22
25
$nav->addFilter('dbissue/', pht('Database Issues'));
···
26
29
$nav->addFilter('cluster/databases/', pht('Database Servers'));
27
30
$nav->addFilter('cluster/notifications/', pht('Notification Servers'));
28
31
$nav->addFilter('cluster/repositories/', pht('Repository Servers'));
29
-
$nav->addLabel(pht('Welcome'));
30
-
$nav->addFilter('welcome/', pht('Welcome Screen'));
31
32
$nav->addLabel(pht('Modules'));
32
33
33
34
$modules = PhabricatorConfigModule::getAllModules();
+1
src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
+1
src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
+9
src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
+9
src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
···
165
165
166
166
$prop_box = id(new PHUIObjectBoxView())
167
167
->setHeader($this->buildHeaderWithDocumentationLink($title))
168
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
168
169
->addPropertyList($properties);
169
170
170
171
$table_box = id(new PHUIObjectBoxView())
171
172
->setHeaderText(pht('Databases'))
173
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
172
174
->setTable($table);
173
175
174
176
return $this->buildResponse($title, array($prop_box, $table_box));
···
263
265
264
266
$prop_box = id(new PHUIObjectBoxView())
265
267
->setHeader($this->buildHeaderWithDocumentationLink($title))
268
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
266
269
->addPropertyList($properties);
267
270
268
271
$table_box = id(new PHUIObjectBoxView())
269
272
->setHeaderText(pht('Database Status'))
273
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
270
274
->setTable($table);
271
275
272
276
return $this->buildResponse($title, array($prop_box, $table_box));
···
476
480
477
481
$prop_box = id(new PHUIObjectBoxView())
478
482
->setHeader($this->buildHeaderWithDocumentationLink($title))
483
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
479
484
->addPropertyList($properties);
480
485
481
486
$table_box = id(new PHUIObjectBoxView())
482
487
->setHeaderText(pht('Database'))
488
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
483
489
->setTable($table_view);
484
490
485
491
$key_box = id(new PHUIObjectBoxView())
486
492
->setHeaderText(pht('Keys'))
493
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
487
494
->setTable($keys_view);
488
495
489
496
return $this->buildResponse($title, array($prop_box, $table_box, $key_box));
···
620
627
621
628
$box = id(new PHUIObjectBoxView())
622
629
->setHeader($this->buildHeaderWithDocumentationLink($title))
630
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
623
631
->addPropertyList($properties);
624
632
625
633
return $this->buildResponse($title, $box);
···
713
721
714
722
$box = id(new PHUIObjectBoxView())
715
723
->setHeader($this->buildHeaderWithDocumentationLink($title))
724
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
716
725
->addPropertyList($properties);
717
726
718
727
return $this->buildResponse($title, $box);
+1
src/applications/config/controller/PhabricatorConfigGroupController.php
+1
src/applications/config/controller/PhabricatorConfigGroupController.php
+1
-1
src/applications/config/controller/PhabricatorConfigHistoryController.php
+1
-1
src/applications/config/controller/PhabricatorConfigHistoryController.php
···
31
31
$title = pht('Settings History');
32
32
33
33
$crumbs = $this->buildApplicationCrumbs();
34
-
$crumbs->addTextCrumb('Config', $this->getApplicationURI());
34
+
$crumbs->addTextCrumb('Configuration', $this->getApplicationURI());
35
35
$crumbs->addTextCrumb($title, '/config/history/');
36
36
37
37
$nav = $this->buildSideNavView();
+4
-1
src/applications/config/controller/PhabricatorConfigIssueListController.php
+4
-1
src/applications/config/controller/PhabricatorConfigIssueListController.php
···
27
27
if ($important) {
28
28
$setup_issues[] = id(new PHUIObjectBoxView())
29
29
->setHeaderText(pht('Important Setup Issues'))
30
-
->setColor(PHUIObjectBoxView::COLOR_RED)
30
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
31
31
->setObjectList($important);
32
32
}
33
33
34
34
if ($php) {
35
35
$setup_issues[] = id(new PHUIObjectBoxView())
36
36
->setHeaderText(pht('PHP Setup Issues'))
37
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
37
38
->setObjectList($php);
38
39
}
39
40
40
41
if ($mysql) {
41
42
$setup_issues[] = id(new PHUIObjectBoxView())
42
43
->setHeaderText(pht('MySQL Setup Issues'))
44
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
43
45
->setObjectList($mysql);
44
46
}
45
47
46
48
if ($other) {
47
49
$setup_issues[] = id(new PHUIObjectBoxView())
48
50
->setHeaderText(pht('Other Setup Issues'))
51
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
49
52
->setObjectList($other);
50
53
}
51
54
+4
-8
src/applications/config/controller/PhabricatorConfigListController.php
+4
-8
src/applications/config/controller/PhabricatorConfigListController.php
···
11
11
12
12
$groups = PhabricatorApplicationConfigOptions::loadAll();
13
13
$core_list = $this->buildConfigOptionsList($groups, 'core');
14
-
$apps_list = $this->buildConfigOptionsList($groups, 'apps');
15
14
16
-
$title = pht('Phabricator Configuration');
15
+
$title = pht('Core Configuration');
17
16
18
17
$core = id(new PHUIObjectBoxView())
19
18
->setHeaderText($title)
19
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
20
20
->setObjectList($core_list);
21
21
22
-
$apps = id(new PHUIObjectBoxView())
23
-
->setHeaderText(pht('Applications Configuration'))
24
-
->setObjectList($apps_list);
25
-
26
22
$crumbs = $this
27
23
->buildApplicationCrumbs()
28
-
->addTextCrumb(pht('Config'), $this->getApplicationURI());
24
+
->addTextCrumb(pht('Configuration'), $this->getApplicationURI())
25
+
->addTextCrumb($title);
29
26
30
27
$view = id(new PHUITwoColumnView())
31
28
->setNavigation($nav)
32
29
->setMainColumn(array(
33
30
$core,
34
-
$apps,
35
31
));
36
32
37
33
return $this->newPage()
+2
-2
src/applications/config/controller/PhabricatorConfigWelcomeController.php
+2
-2
src/applications/config/controller/PhabricatorConfigWelcomeController.php
···
9
9
$nav = $this->buildSideNavView();
10
10
$nav->selectFilter('welcome/');
11
11
12
-
$title = pht('Welcome');
12
+
$title = pht('Installation Guide');
13
13
14
14
$crumbs = $this
15
15
->buildApplicationCrumbs()
16
-
->addTextCrumb(pht('Welcome'));
16
+
->addTextCrumb($title);
17
17
18
18
$view = id(new PHUITwoColumnView())
19
19
->setNavigation($nav)
+1
src/applications/config/module/PhabricatorConfigCollectorsModule.php
+1
src/applications/config/module/PhabricatorConfigCollectorsModule.php
+1
src/applications/config/module/PhabricatorConfigEdgeModule.php
+1
src/applications/config/module/PhabricatorConfigEdgeModule.php
+1
src/applications/config/module/PhabricatorConfigHTTPParameterTypesModule.php
+1
src/applications/config/module/PhabricatorConfigHTTPParameterTypesModule.php
+1
src/applications/config/module/PhabricatorConfigPHIDModule.php
+1
src/applications/config/module/PhabricatorConfigPHIDModule.php
+1
src/applications/config/module/PhabricatorConfigRequestExceptionHandlerModule.php
+1
src/applications/config/module/PhabricatorConfigRequestExceptionHandlerModule.php
+1
src/applications/config/module/PhabricatorConfigSiteModule.php
+1
src/applications/config/module/PhabricatorConfigSiteModule.php
+30
-11
src/applications/config/module/PhabricatorConfigVersionsModule.php
src/applications/config/controller/PhabricatorConfigVersionController.php
+30
-11
src/applications/config/module/PhabricatorConfigVersionsModule.php
src/applications/config/controller/PhabricatorConfigVersionController.php
···
1
1
<?php
2
2
3
-
final class PhabricatorConfigVersionsModule
4
-
extends PhabricatorConfigModule {
3
+
final class PhabricatorConfigVersionController
4
+
extends PhabricatorConfigController {
5
+
6
+
public function handleRequest(AphrontRequest $request) {
7
+
$viewer = $request->getViewer();
8
+
9
+
$title = pht('Version Information');
10
+
11
+
$crumbs = $this
12
+
->buildApplicationCrumbs()
13
+
->addTextCrumb(pht('Configuration'), $this->getApplicationURI())
14
+
->addTextCrumb($title);
15
+
16
+
$versions = $this->renderModuleStatus($viewer);
17
+
18
+
$nav = $this->buildSideNavView();
19
+
$nav->selectFilter('version/');
20
+
21
+
$view = id(new PHUITwoColumnView())
22
+
->setNavigation($nav)
23
+
->setMainColumn(array(
24
+
$versions,
25
+
));
5
26
6
-
public function getModuleKey() {
7
-
return 'versions';
8
-
}
27
+
return $this->newPage()
28
+
->setTitle($title)
29
+
->setCrumbs($crumbs)
30
+
->appendChild($view);
9
31
10
-
public function getModuleName() {
11
-
return pht('Versions');
12
32
}
13
33
14
-
public function renderModuleStatus(AphrontRequest $request) {
15
-
$viewer = $request->getViewer();
16
-
34
+
public function renderModuleStatus($viewer) {
17
35
$versions = $this->loadVersions($viewer);
18
36
19
37
$version_property_list = id(new PHUIPropertyListView());
···
22
40
}
23
41
24
42
$object_box = id(new PHUIObjectBoxView())
25
-
->setHeaderText(pht('Current Versions'))
43
+
->setHeaderText(pht('Version Information'))
44
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
26
45
->addPropertyList($version_property_list);
27
46
28
47
$phabricator_root = dirname(phutil_get_library_root('phabricator'));
+1
src/applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php
+1
src/applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php
+1
src/applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php
+1
src/applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php
+1
src/applications/search/index/PhabricatorFulltextEngineExtensionModule.php
+1
src/applications/search/index/PhabricatorFulltextEngineExtensionModule.php
+1
src/applications/search/index/PhabricatorIndexEngineExtensionModule.php
+1
src/applications/search/index/PhabricatorIndexEngineExtensionModule.php
+1
src/applications/system/engine/PhabricatorDestructionEngineExtensionModule.php
+1
src/applications/system/engine/PhabricatorDestructionEngineExtensionModule.php
+1
src/applications/transactions/engineextension/PhabricatorEditEngineExtensionModule.php
+1
src/applications/transactions/engineextension/PhabricatorEditEngineExtensionModule.php