@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
Make default and hidden columns in Workboards more clear
Summary: Fixes T6469. Changes the default icon into text instead. Added the text to hidden boards and now display when reordering as well.
Test Plan:
Moved a bunch of columns, tested reordering. Seems more clear.
{F229626}
{F229627}
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T6469
Differential Revision: https://secure.phabricator.com/D10784
+54
-12
+5
-5
resources/celerity/map.php
+5
-5
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => '74d50c3d',
10
+
'core.pkg.css' => '810e8b13',
11
11
'core.pkg.js' => 'cbdbd552',
12
12
'darkconsole.pkg.js' => 'df001cab',
13
13
'differential.pkg.css' => '8af45893',
···
110
110
'rsrc/css/font/font-awesome.css' => '327559dd',
111
111
'rsrc/css/font/font-source-sans-pro.css' => '91d53463',
112
112
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
113
-
'rsrc/css/layout/phabricator-action-header-view.css' => '83e2cc86',
114
113
'rsrc/css/layout/phabricator-crumbs-view.css' => 'a49339de',
115
114
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
116
115
'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783',
···
120
119
'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
121
120
'rsrc/css/phui/calendar/phui-calendar-month.css' => 'a92e47d2',
122
121
'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e',
122
+
'rsrc/css/phui/phui-action-header-view.css' => '89c497e7',
123
123
'rsrc/css/phui/phui-action-list.css' => '9ee9910a',
124
124
'rsrc/css/phui/phui-box.css' => '7b3a2eed',
125
125
'rsrc/css/phui/phui-button.css' => 'c7412aa1',
···
134
134
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
135
135
'rsrc/css/phui/phui-list.css' => '43ed2d93',
136
136
'rsrc/css/phui/phui-object-box.css' => 'e9f7e938',
137
-
'rsrc/css/phui/phui-object-item-list-view.css' => '5053dee8',
137
+
'rsrc/css/phui/phui-object-item-list-view.css' => '1f710f4e',
138
138
'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269',
139
139
'rsrc/css/phui/phui-property-list-view.css' => '86f9df88',
140
140
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
···
758
758
'phortune-css' => '9149f103',
759
759
'phrequent-css' => 'ffc185ad',
760
760
'phriction-document-css' => '7d7f0071',
761
-
'phui-action-header-view-css' => '83e2cc86',
761
+
'phui-action-header-view-css' => '89c497e7',
762
762
'phui-box-css' => '7b3a2eed',
763
763
'phui-button-css' => 'c7412aa1',
764
764
'phui-calendar-css' => '8675968e',
···
777
777
'phui-info-panel-css' => '27ea50a1',
778
778
'phui-list-view-css' => '43ed2d93',
779
779
'phui-object-box-css' => 'e9f7e938',
780
-
'phui-object-item-list-view-css' => '5053dee8',
780
+
'phui-object-item-list-view-css' => '1f710f4e',
781
781
'phui-pinboard-view-css' => '3dd4a269',
782
782
'phui-property-list-view-css' => '86f9df88',
783
783
'phui-remarkup-preview-css' => '19ad512b',
+2
-1
src/applications/project/controller/PhabricatorProjectBoardReorderController.php
+2
-1
src/applications/project/controller/PhabricatorProjectBoardReorderController.php
···
107
107
108
108
foreach ($columns as $column) {
109
109
$item = id(new PHUIObjectItemView())
110
-
->setHeader($column->getDisplayName());
110
+
->setHeader($column->getDisplayName())
111
+
->addIcon('none', $column->getDisplayType());
111
112
112
113
if ($column->isHidden()) {
113
114
$item->setDisabled(true);
+1
src/applications/project/controller/PhabricatorProjectBoardViewController.php
+1
src/applications/project/controller/PhabricatorProjectBoardViewController.php
+11
-5
src/applications/project/storage/PhabricatorProjectColumn.php
+11
-5
src/applications/project/storage/PhabricatorProjectColumn.php
···
84
84
return pht('Unnamed Column');
85
85
}
86
86
87
+
public function getDisplayType() {
88
+
if ($this->isDefaultColumn()) {
89
+
return pht('(Default)');
90
+
}
91
+
if ($this->isHidden()) {
92
+
return pht('(Hidden)');
93
+
}
94
+
95
+
return null;
96
+
}
97
+
87
98
public function getHeaderIcon() {
88
99
$icon = null;
89
100
90
101
if ($this->isHidden()) {
91
102
$icon = 'fa-eye-slash';
92
103
$text = pht('Hidden');
93
-
}
94
-
95
-
if ($this->isDefaultColumn()) {
96
-
$icon = 'fa-archive';
97
-
$text = pht('Default');
98
104
}
99
105
100
106
if ($icon) {
+17
src/view/phui/PHUIActionHeaderView.php
+17
src/view/phui/PHUIActionHeaderView.php
···
11
11
const HEADER_WHITE = 'white';
12
12
13
13
private $headerTitle;
14
+
private $headerSubtitle;
14
15
private $headerHref;
15
16
private $headerIcon;
16
17
private $headerSigils = array();
···
36
37
37
38
public function setHeaderTitle($header) {
38
39
$this->headerTitle = $header;
40
+
return $this;
41
+
}
42
+
43
+
public function setHeaderSubtitle($subtitle) {
44
+
$this->headerSubtitle = $subtitle;
39
45
return $this;
40
46
}
41
47
···
131
137
$this->headerTitle);
132
138
}
133
139
140
+
$header_subtitle = null;
141
+
if ($this->headerSubtitle) {
142
+
$header_subtitle = phutil_tag(
143
+
'span',
144
+
array(
145
+
'class' => 'phui-action-header-subtitle',
146
+
),
147
+
$this->headerSubtitle);
148
+
}
149
+
134
150
$header = phutil_tag(
135
151
'h3',
136
152
array(
···
139
155
array(
140
156
$header_icon,
141
157
$header_title,
158
+
$header_subtitle,
142
159
));
143
160
144
161
$icons = '';
+7
src/view/phui/PHUIWorkpanelView.php
+7
src/view/phui/PHUIWorkpanelView.php
···
4
4
5
5
private $cards = array();
6
6
private $header;
7
+
private $subheader = null;
7
8
private $footerAction;
8
9
private $headerColor = PHUIActionHeaderView::HEADER_GREY;
9
10
private $headerActions = array();
···
26
27
27
28
public function setHeader($header) {
28
29
$this->header = $header;
30
+
return $this;
31
+
}
32
+
33
+
public function setSubheader($subheader) {
34
+
$this->subheader = $subheader;
29
35
return $this;
30
36
}
31
37
···
73
79
74
80
$header = id(new PHUIActionHeaderView())
75
81
->setHeaderTitle($this->header)
82
+
->setHeaderSubtitle($this->subheader)
76
83
->setHeaderColor($this->headerColor);
77
84
78
85
if ($this->headerIcon) {
+7
-1
webroot/rsrc/css/layout/phabricator-action-header-view.css
webroot/rsrc/css/phui/phui-action-header-view.css
+7
-1
webroot/rsrc/css/layout/phabricator-action-header-view.css
webroot/rsrc/css/phui/phui-action-header-view.css
···
72
72
font-weight: normal;
73
73
}
74
74
75
-
.phui-action-header-title span {
75
+
.phui-action-header-title .phui-icon-view {
76
76
float: left;
77
77
height: 16px;
78
78
width: 16px;
79
79
margin-right: 4px;
80
+
}
81
+
82
+
.phui-action-header-title .phui-action-header-subtitle {
83
+
margin-left: 4px;
84
+
font-weight: normal;
85
+
color: {$lightgreytext};
80
86
}
81
87
82
88
/* - Dashboards ------------------------------------------------------------ */
+4
webroot/rsrc/css/phui/phui-object-item-list-view.css
+4
webroot/rsrc/css/phui/phui-object-item-list-view.css
···
271
271
padding: 0 10px;
272
272
}
273
273
274
+
ul.phui-object-item-icons {
275
+
margin: 0;
276
+
}
277
+
274
278
/* NOTE: The main content is an "overflow: hidden" div which we give a right
275
279
margin so it doesn't overlap the icons. The margin is slightly larger than
276
280
the width + padding of the icon div, so the icons have some space even if