@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
Remove spacer from sidebars.
Summary: This removes all calls to addSpacer and the method. We were applying it inconsistently and it was causing spacing issues with redesigning the sidenav. My feeling is we can recreate the space in CSS if the design dictates, which would apply it consistently.
Test Plan: Go to Applications, click on every application.
Reviewers: epriestley, btrahan
Reviewed By: epriestley
CC: aran, Korvin
Differential Revision: https://secure.phabricator.com/D4420
+5
-56
-3
src/applications/calendar/controller/PhabricatorCalendarController.php
-3
src/applications/calendar/controller/PhabricatorCalendarController.php
···
9
9
10
10
$nav->addFilter('', pht('Calendar'), $this->getApplicationURI());
11
11
12
-
$nav->addSpacer();
13
-
14
12
$nav->addLabel(pht('Create Events'));
15
13
$nav->addFilter('status/create/', pht('New Status'));
16
14
17
-
$nav->addSpacer();
18
15
$nav->addLabel(pht('Your Events'));
19
16
if ($status && $status->getID()) {
20
17
$nav->addFilter('status/edit/'.$status->getID().'/', pht('Edit Status'));
-1
src/applications/conduit/controller/PhabricatorConduitController.php
-1
src/applications/conduit/controller/PhabricatorConduitController.php
-1
src/applications/daemon/controller/PhabricatorDaemonController.php
-1
src/applications/daemon/controller/PhabricatorDaemonController.php
-1
src/applications/directory/controller/PhabricatorDirectoryController.php
-1
src/applications/directory/controller/PhabricatorDirectoryController.php
-1
src/applications/drydock/controller/DrydockController.php
-1
src/applications/drydock/controller/DrydockController.php
+2
-7
src/applications/herald/controller/HeraldController.php
+2
-7
src/applications/herald/controller/HeraldController.php
···
27
27
$nav->addFilter("view/{$key}/personal", $value);
28
28
}
29
29
30
-
$nav
31
-
->addSpacer()
32
-
->addLabel('Global Rules');
30
+
$nav->addLabel('Global Rules');
33
31
34
32
foreach ($rules_map as $key => $value) {
35
33
$nav->addFilter("view/{$key}/global", $value);
36
34
}
37
35
38
36
$nav
39
-
->addSpacer()
40
37
->addLabel('Utilities')
41
38
->addFilter('test', 'Test Console')
42
39
->addFilter('transcript', 'Transcripts')
43
40
->addFilter('history', 'Edit Log');
44
41
45
42
if ($this->getRequest()->getUser()->getIsAdmin()) {
46
-
$nav
47
-
->addSpacer()
48
-
->addLabel('Admin');
43
+
$nav->addLabel('Admin');
49
44
foreach ($rules_map as $key => $value) {
50
45
$nav->addFilter("view/{$key}/all", $value);
51
46
}
-5
src/applications/maniphest/controller/ManiphestController.php
-5
src/applications/maniphest/controller/ManiphestController.php
···
51
51
'/maniphest/view/custom/?key='.$query->getQueryKey());
52
52
}
53
53
$nav->addFilter('saved', 'Edit...', '/maniphest/custom/');
54
-
$nav->addSpacer();
55
54
}
56
55
57
56
$nav->addLabel('User Tasks');
···
59
58
$nav->addFilter('created', 'Created');
60
59
$nav->addFilter('subscribed', 'Subscribed');
61
60
$nav->addFilter('triage', 'Need Triage');
62
-
$nav->addSpacer();
63
61
$nav->addLabel('User Projects');
64
62
$nav->addFilter('projecttriage','Need Triage');
65
63
$nav->addFilter('projectall', 'All Tasks');
66
-
$nav->addSpacer();
67
64
$nav->addLabel('All Tasks');
68
65
$nav->addFilter('alltriage', 'Need Triage');
69
66
$nav->addFilter('all', 'All Tasks');
70
-
$nav->addSpacer();
71
67
$nav->addLabel('Custom');
72
68
$nav->addFilter('custom', 'Custom Query');
73
-
$nav->addSpacer();
74
69
$nav->addLabel('Reports');
75
70
$nav->addFilter('report', 'Reports', '/maniphest/report/');
76
71
-1
src/applications/maniphest/controller/ManiphestReportController.php
-1
src/applications/maniphest/controller/ManiphestReportController.php
-2
src/applications/metamta/controller/PhabricatorMetaMTAController.php
-2
src/applications/metamta/controller/PhabricatorMetaMTAController.php
···
14
14
$nav->addFilter('sent', 'Sent Mail', $this->getApplicationURI());
15
15
$nav->addFilter('received', 'Received Mail');
16
16
17
-
$nav->addSpacer();
18
-
19
17
if ($this->getRequest()->getUser()->getIsAdmin()) {
20
18
$nav->addLabel('Diagnostics');
21
19
$nav->addFilter('send', 'Send Test');
-1
src/applications/oauthserver/controller/PhabricatorOAuthServerController.php
-1
src/applications/oauthserver/controller/PhabricatorOAuthServerController.php
-2
src/applications/people/controller/PhabricatorPeopleController.php
-2
src/applications/people/controller/PhabricatorPeopleController.php
···
14
14
if (PhabricatorEnv::getEnvConfig('ldap.auth-enabled') === true) {
15
15
$nav->addFilter('ldap', 'Import from LDAP');
16
16
}
17
-
$nav->addSpacer();
18
17
}
19
18
20
19
$nav->addLabel('Directory');
21
20
$nav->addFilter('people', 'User Directory', $this->getApplicationURI());
22
21
23
22
if ($is_admin) {
24
-
$nav->addSpacer();
25
23
$nav->addLabel('Logs');
26
24
$nav->addFilter('logs', 'Activity Logs');
27
25
}
-1
src/applications/people/controller/PhabricatorPeopleEditController.php
-1
src/applications/people/controller/PhabricatorPeopleEditController.php
···
38
38
$nav->addFilter('role', 'Edit Roles');
39
39
$nav->addFilter('cert', 'Conduit Certificate');
40
40
$nav->addFilter('profile', 'View Profile', '/p/'.$user->getUsername().'/');
41
-
$nav->addSpacer();
42
41
$nav->addLabel('Special');
43
42
$nav->addFilter('rename', 'Change Username');
44
43
$nav->addFilter('delete', 'Delete User');
+3
-8
src/applications/people/controller/PhabricatorPeopleProfileController.php
+3
-8
src/applications/people/controller/PhabricatorPeopleProfileController.php
···
43
43
$nav->setBaseURI(new PhutilURI('/p/'.$username.'/'));
44
44
$nav->addFilter('feed', 'Feed');
45
45
$nav->addFilter('about', 'About');
46
-
47
-
$nav->addSpacer();
48
46
$nav->addLabel('Activity');
49
47
50
48
$external_arrow = "\xE2\x86\x97";
···
74
72
$oauths = mpull($oauths, null, 'getOAuthProvider');
75
73
76
74
$providers = PhabricatorOAuthProvider::getAllProviders();
77
-
$added_spacer = false;
75
+
$added_label = false;
78
76
foreach ($providers as $provider) {
79
77
if (!$provider->isProviderEnabled()) {
80
78
continue;
···
90
88
$href = $oauths[$provider_key]->getAccountURI();
91
89
92
90
if ($href) {
93
-
if (!$added_spacer) {
94
-
$nav->addSpacer();
91
+
if (!$added_label) {
95
92
$nav->addLabel('Linked Accounts');
96
-
$added_spacer = true;
93
+
$added_label = true;
97
94
}
98
95
$nav->addFilter(null, $name.' '.$external_arrow, $href);
99
96
}
···
136
133
$header->appendChild($content);
137
134
138
135
if ($user->getPHID() == $viewer->getPHID()) {
139
-
$nav->addSpacer();
140
136
$nav->addFilter(null, 'Edit Profile...', '/settings/panel/profile/');
141
137
}
142
138
143
139
if ($viewer->getIsAdmin()) {
144
-
$nav->addSpacer();
145
140
$nav->addFilter(
146
141
null,
147
142
'Administrate User...',
-4
src/applications/phame/controller/PhameController.php
-4
src/applications/phame/controller/PhameController.php
···
16
16
$nav->addFilter('post/new', 'New Post');
17
17
$nav->addFilter('blog/new', 'New Blog');
18
18
19
-
$nav->addSpacer();
20
-
21
19
$nav->addLabel('Posts');
22
20
$nav->addFilter('post/draft', 'My Drafts');
23
21
$nav->addFilter('post', 'My Posts');
24
22
$nav->addFilter('post/all', 'All Posts');
25
-
26
-
$nav->addSpacer();
27
23
28
24
$nav->addLabel('Blogs');
29
25
$nav->addFilter('blog/user', 'Joinable Blogs');
-5
src/applications/ponder/controller/PonderController.php
-5
src/applications/ponder/controller/PonderController.php
···
25
25
null,
26
26
'Q'.$question->getID(),
27
27
'Q'.$question->getID());
28
-
$side_nav->addSpacer();
29
28
}
30
29
31
30
$side_nav->addLabel('Create');
32
31
$side_nav->addFilter('question/ask', 'Ask a Question');
33
-
34
-
$side_nav->addSpacer();
35
32
36
33
$side_nav->addLabel('Questions');
37
34
$side_nav->addFilter('feed', 'All Questions');
38
-
39
-
$side_nav->addSpacer();
40
35
41
36
$side_nav->addLabel('User');
42
37
$side_nav->addFilter('questions', 'Your Questions');
-2
src/applications/project/controller/PhabricatorProjectController.php
-2
src/applications/project/controller/PhabricatorProjectController.php
···
31
31
$members_uri = '/project/members/'.$id.'/';
32
32
33
33
$nav_view->addFilter('dashboard', 'Dashboard');
34
-
$nav_view->addSpacer();
35
34
$nav_view->addFilter('feed', 'Feed');
36
35
$nav_view->addFilter(null, 'Tasks '.$external_arrow, $tasks_uri);
37
36
$nav_view->addFilter(null, 'Wiki '.$external_arrow, $phriction_uri);
···
41
40
$user = $this->getRequest()->getUser();
42
41
$can_edit = PhabricatorPolicyCapability::CAN_EDIT;
43
42
44
-
$nav_view->addSpacer();
45
43
if (PhabricatorPolicyFilter::hasCapability($user, $project, $can_edit)) {
46
44
$nav_view->addFilter('edit', "Edit Project\xE2\x80\xA6", $edit_uri);
47
45
$nav_view->addFilter('members', "Edit Members\xE2\x80\xA6", $members_uri);
-1
src/applications/project/controller/PhabricatorProjectListController.php
-1
src/applications/project/controller/PhabricatorProjectListController.php
-3
src/applications/settings/controller/PhabricatorSettingsMainController.php
-3
src/applications/settings/controller/PhabricatorSettingsMainController.php