@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
Allow AphrontDialogView to use PhabricatorActionHeaderView
Summary: We're baking some useful things into ActionHeader, would like to consolidate it's use around the site for consistency.
Test Plan: Tested log out dialog, attach dependencies, delete document in phriction.
Reviewers: epriestley, btrahan
Reviewed By: epriestley
CC: aran, Korvin, AnhNhan
Differential Revision: https://secure.phabricator.com/D5635
+91
-71
resources/sprite/gradients/dark-grey-header.png
resources/sprite/gradients/dark-grey-header.png
This is a binary file and will not be displayed.
+15
-10
resources/sprite/manifest/gradient.json
+15
-10
resources/sprite/manifest/gradient.json
···
1
1
{
2
2
"version" : 1,
3
3
"sprites" : {
4
-
"gradient-blue-header" : {
4
+
"gradient-blue-header" : {
5
5
"name" : "gradient-blue-header",
6
6
"rule" : ".gradient-blue-header",
7
7
"hash" : "dd82b6d737f9f683c0d6e70eff59e872"
8
8
},
9
-
"gradient-breadcrumbs" : {
9
+
"gradient-breadcrumbs" : {
10
10
"name" : "gradient-breadcrumbs",
11
11
"rule" : ".gradient-breadcrumbs",
12
12
"hash" : "3d0f8634df5bc29eaf2a5a01bae79cf1"
13
13
},
14
-
"gradient-dark-menu-label" : {
14
+
"gradient-dark-grey-header" : {
15
+
"name" : "gradient-dark-grey-header",
16
+
"rule" : ".gradient-dark-grey-header",
17
+
"hash" : "2bdb9bec730405a8fc0a1eca4f3538c2"
18
+
},
19
+
"gradient-dark-menu-label" : {
15
20
"name" : "gradient-dark-menu-label",
16
21
"rule" : ".gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label",
17
22
"hash" : "e0d4a455142f9c4745d36ad8b7dd3f78"
18
23
},
19
-
"gradient-green-header" : {
24
+
"gradient-green-header" : {
20
25
"name" : "gradient-green-header",
21
26
"rule" : ".gradient-green-header",
22
27
"hash" : "d61297d23aa31fa1de51e2b9b5974554"
23
28
},
24
-
"gradient-grey-header" : {
29
+
"gradient-grey-header" : {
25
30
"name" : "gradient-grey-header",
26
31
"rule" : ".gradient-grey-header",
27
32
"hash" : "f1453896068a8dd0d7885457c8e371bc"
28
33
},
29
-
"gradient-menu-hover" : {
34
+
"gradient-menu-hover" : {
30
35
"name" : "gradient-menu-hover",
31
36
"rule" : ".gradient-menu-hover, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover, .phabricator-filetree a.phabricator-filetree-item:hover",
32
37
"hash" : "e6e064156d66952180e99b00996ffc38"
33
38
},
34
-
"gradient-menu-label" : {
39
+
"gradient-menu-label" : {
35
40
"name" : "gradient-menu-label",
36
41
"rule" : ".gradient-menu-label, .phabricator-side-menu .phabricator-menu-item-type-label",
37
42
"hash" : "04b9943f5b06c8cb21fe6b96714e6662"
38
43
},
39
-
"gradient-menu-selected" : {
44
+
"gradient-menu-selected" : {
40
45
"name" : "gradient-menu-selected",
41
46
"rule" : ".gradient-menu-selected, .phabricator-side-menu .phabricator-menu-item-selected, .device-desktop .phabricator-side-menu a.phabricator-menu-item-selected:hover, .phabricator-nav-local a.phabricator-active-nav-focus",
42
47
"hash" : "9b4b039fba177b90bc26f0e6eece339d"
43
48
},
44
-
"gradient-red-header" : {
49
+
"gradient-red-header" : {
45
50
"name" : "gradient-red-header",
46
51
"rule" : ".gradient-red-header",
47
52
"hash" : "27a76645065953a8440d0c3d2b192c82"
48
53
},
49
-
"gradient-yellow-header" : {
54
+
"gradient-yellow-header" : {
50
55
"name" : "gradient-yellow-header",
51
56
"rule" : ".gradient-yellow-header",
52
57
"hash" : "181e68e61f29071c3ec3810694c2ef08"
+43
-43
src/__celerity_resource_map__.php
+43
-43
src/__celerity_resource_map__.php
···
590
590
),
591
591
'/rsrc/image/sprite-gradient.png' =>
592
592
array(
593
-
'hash' => '72614b1679a3c69fcef9766c0f2be53d',
594
-
'uri' => '/res/72614b16/rsrc/image/sprite-gradient.png',
593
+
'hash' => 'e52f57d64edfddfcc2f8bd26a262dda2',
594
+
'uri' => '/res/e52f57d6/rsrc/image/sprite-gradient.png',
595
595
'disk' => '/rsrc/image/sprite-gradient.png',
596
596
'type' => 'png',
597
597
),
···
761
761
),
762
762
'aphront-dialog-view-css' =>
763
763
array(
764
-
'uri' => '/res/215b3ab1/rsrc/css/aphront/dialog-view.css',
764
+
'uri' => '/res/7060a2fe/rsrc/css/aphront/dialog-view.css',
765
765
'type' => 'css',
766
766
'requires' =>
767
767
array(
···
2831
2831
),
2832
2832
'phabricator-action-header-view-css' =>
2833
2833
array(
2834
-
'uri' => '/res/1c0142de/rsrc/css/layout/phabricator-action-header-view.css',
2834
+
'uri' => '/res/948f998b/rsrc/css/layout/phabricator-action-header-view.css',
2835
2835
'type' => 'css',
2836
2836
'requires' =>
2837
2837
array(
···
3821
3821
),
3822
3822
'sprite-gradient-css' =>
3823
3823
array(
3824
-
'uri' => '/res/5bce353e/rsrc/css/sprite-gradient.css',
3824
+
'uri' => '/res/fdc4dd44/rsrc/css/sprite-gradient.css',
3825
3825
'type' => 'css',
3826
3826
'requires' =>
3827
3827
array(
···
3903
3903
), array(
3904
3904
'packages' =>
3905
3905
array(
3906
-
'60914b69' =>
3906
+
'b3deb720' =>
3907
3907
array(
3908
3908
'name' => 'core.pkg.css',
3909
3909
'symbols' =>
···
3945
3945
34 => 'phabricator-object-item-list-view-css',
3946
3946
35 => 'global-drag-and-drop-css',
3947
3947
),
3948
-
'uri' => '/res/pkg/60914b69/core.pkg.css',
3948
+
'uri' => '/res/pkg/b3deb720/core.pkg.css',
3949
3949
'type' => 'css',
3950
3950
),
3951
3951
'bf16b308' =>
···
4135
4135
'reverse' =>
4136
4136
array(
4137
4137
'aphront-attached-file-view-css' => '6b1fccc6',
4138
-
'aphront-dialog-view-css' => '60914b69',
4139
-
'aphront-error-view-css' => '60914b69',
4140
-
'aphront-form-view-css' => '60914b69',
4141
-
'aphront-list-filter-view-css' => '60914b69',
4142
-
'aphront-pager-view-css' => '60914b69',
4143
-
'aphront-panel-view-css' => '60914b69',
4144
-
'aphront-table-view-css' => '60914b69',
4145
-
'aphront-tokenizer-control-css' => '60914b69',
4146
-
'aphront-tooltip-css' => '60914b69',
4147
-
'aphront-typeahead-control-css' => '60914b69',
4138
+
'aphront-dialog-view-css' => 'b3deb720',
4139
+
'aphront-error-view-css' => 'b3deb720',
4140
+
'aphront-form-view-css' => 'b3deb720',
4141
+
'aphront-list-filter-view-css' => 'b3deb720',
4142
+
'aphront-pager-view-css' => 'b3deb720',
4143
+
'aphront-panel-view-css' => 'b3deb720',
4144
+
'aphront-table-view-css' => 'b3deb720',
4145
+
'aphront-tokenizer-control-css' => 'b3deb720',
4146
+
'aphront-tooltip-css' => 'b3deb720',
4147
+
'aphront-typeahead-control-css' => 'b3deb720',
4148
4148
'differential-changeset-view-css' => '8aaacd1b',
4149
4149
'differential-core-view-css' => '8aaacd1b',
4150
4150
'differential-inline-comment-editor' => 'e96b08f8',
···
4158
4158
'differential-table-of-contents-css' => '8aaacd1b',
4159
4159
'diffusion-commit-view-css' => 'c8ce2d88',
4160
4160
'diffusion-icons-css' => 'c8ce2d88',
4161
-
'global-drag-and-drop-css' => '60914b69',
4161
+
'global-drag-and-drop-css' => 'b3deb720',
4162
4162
'inline-comment-summary-css' => '8aaacd1b',
4163
4163
'javelin-aphlict' => 'bf16b308',
4164
4164
'javelin-behavior' => 'a2f94024',
···
4230
4230
'javelin-util' => 'a2f94024',
4231
4231
'javelin-vector' => 'a2f94024',
4232
4232
'javelin-workflow' => 'a2f94024',
4233
-
'lightbox-attachment-css' => '60914b69',
4233
+
'lightbox-attachment-css' => 'b3deb720',
4234
4234
'maniphest-task-summary-css' => '6b1fccc6',
4235
4235
'maniphest-transaction-detail-css' => '6b1fccc6',
4236
4236
'phabricator-busy' => 'bf16b308',
4237
4237
'phabricator-content-source-view-css' => '8aaacd1b',
4238
-
'phabricator-core-buttons-css' => '60914b69',
4239
-
'phabricator-core-css' => '60914b69',
4240
-
'phabricator-crumbs-view-css' => '60914b69',
4241
-
'phabricator-directory-css' => '60914b69',
4238
+
'phabricator-core-buttons-css' => 'b3deb720',
4239
+
'phabricator-core-css' => 'b3deb720',
4240
+
'phabricator-crumbs-view-css' => 'b3deb720',
4241
+
'phabricator-directory-css' => 'b3deb720',
4242
4242
'phabricator-drag-and-drop-file-upload' => 'e96b08f8',
4243
4243
'phabricator-dropdown-menu' => 'bf16b308',
4244
4244
'phabricator-file-upload' => 'bf16b308',
4245
-
'phabricator-filetree-view-css' => '60914b69',
4246
-
'phabricator-flag-css' => '60914b69',
4247
-
'phabricator-form-view-css' => '60914b69',
4248
-
'phabricator-header-view-css' => '60914b69',
4249
-
'phabricator-jump-nav' => '60914b69',
4245
+
'phabricator-filetree-view-css' => 'b3deb720',
4246
+
'phabricator-flag-css' => 'b3deb720',
4247
+
'phabricator-form-view-css' => 'b3deb720',
4248
+
'phabricator-header-view-css' => 'b3deb720',
4249
+
'phabricator-jump-nav' => 'b3deb720',
4250
4250
'phabricator-keyboard-shortcut' => 'bf16b308',
4251
4251
'phabricator-keyboard-shortcut-manager' => 'bf16b308',
4252
-
'phabricator-main-menu-view' => '60914b69',
4252
+
'phabricator-main-menu-view' => 'b3deb720',
4253
4253
'phabricator-menu-item' => 'bf16b308',
4254
-
'phabricator-nav-view-css' => '60914b69',
4254
+
'phabricator-nav-view-css' => 'b3deb720',
4255
4255
'phabricator-notification' => 'bf16b308',
4256
-
'phabricator-notification-css' => '60914b69',
4257
-
'phabricator-notification-menu-css' => '60914b69',
4258
-
'phabricator-object-item-list-view-css' => '60914b69',
4256
+
'phabricator-notification-css' => 'b3deb720',
4257
+
'phabricator-notification-menu-css' => 'b3deb720',
4258
+
'phabricator-object-item-list-view-css' => 'b3deb720',
4259
4259
'phabricator-object-selector-css' => '8aaacd1b',
4260
4260
'phabricator-prefab' => 'bf16b308',
4261
4261
'phabricator-project-tag-css' => '6b1fccc6',
4262
-
'phabricator-remarkup-css' => '60914b69',
4262
+
'phabricator-remarkup-css' => 'b3deb720',
4263
4263
'phabricator-shaped-request' => 'e96b08f8',
4264
-
'phabricator-side-menu-view-css' => '60914b69',
4265
-
'phabricator-standard-page-view' => '60914b69',
4264
+
'phabricator-side-menu-view-css' => 'b3deb720',
4265
+
'phabricator-standard-page-view' => 'b3deb720',
4266
4266
'phabricator-textareautils' => 'bf16b308',
4267
4267
'phabricator-tooltip' => 'bf16b308',
4268
-
'phabricator-transaction-view-css' => '60914b69',
4269
-
'phabricator-zindex-css' => '60914b69',
4270
-
'sprite-apps-large-css' => '60914b69',
4271
-
'sprite-gradient-css' => '60914b69',
4272
-
'sprite-icon-css' => '60914b69',
4273
-
'sprite-menu-css' => '60914b69',
4274
-
'syntax-highlighting-css' => '60914b69',
4268
+
'phabricator-transaction-view-css' => 'b3deb720',
4269
+
'phabricator-zindex-css' => 'b3deb720',
4270
+
'sprite-apps-large-css' => 'b3deb720',
4271
+
'sprite-gradient-css' => 'b3deb720',
4272
+
'sprite-icon-css' => 'b3deb720',
4273
+
'sprite-menu-css' => 'b3deb720',
4274
+
'syntax-highlighting-css' => 'b3deb720',
4275
4275
),
4276
4276
));
+2
-1
src/applications/phriction/controller/PhrictionDeleteController.php
+2
-1
src/applications/phriction/controller/PhrictionDeleteController.php
···
49
49
} else {
50
50
$dialog = id(new AphrontDialogView())
51
51
->setUser($user)
52
-
->setTitle(pht('Delete document?'))
52
+
->setTitle(pht('Delete Document?'))
53
+
->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED)
53
54
->appendChild(
54
55
pht('Really delete this document? You can recover it later by '.
55
56
'reverting to a previous version.'))
+2
-1
src/infrastructure/celerity/CeleritySpriteGenerator.php
+2
-1
src/infrastructure/celerity/CeleritySpriteGenerator.php
+11
-1
src/view/AphrontDialogView.php
+11
-1
src/view/AphrontDialogView.php
···
11
11
private $class;
12
12
private $renderAsForm = true;
13
13
private $formID;
14
+
private $headerColor = PhabricatorActionHeaderView::HEADER_DARK_GREY;
14
15
15
16
private $width = 'default';
16
17
const WIDTH_DEFAULT = 'default';
···
79
80
80
81
public function setWidth($width) {
81
82
$this->width = $width;
83
+
return $this;
84
+
}
85
+
86
+
public function setHeaderColor($color) {
87
+
$this->headerColor = $color;
82
88
return $this;
83
89
}
84
90
···
168
174
$buttons[] = phutil_tag('div', array('style' => 'clear: both;'), '');
169
175
$children = $this->renderChildren();
170
176
177
+
$header = new PhabricatorActionHeaderView();
178
+
$header->setHeaderTitle($this->title);
179
+
$header->setHeaderColor($this->headerColor);
180
+
171
181
$content = hsprintf(
172
182
'%s%s%s',
173
-
phutil_tag('div', array('class' => 'aphront-dialog-head'), $this->title),
183
+
phutil_tag('div', array('class' => 'aphront-dialog-head'), $header),
174
184
phutil_tag('div', array('class' => 'aphront-dialog-body'), $children),
175
185
phutil_tag('div', array('class' => 'aphront-dialog-tail'), $buttons));
176
186
+1
src/view/layout/PhabricatorActionHeaderView.php
+1
src/view/layout/PhabricatorActionHeaderView.php
+8
-10
webroot/rsrc/css/aphront/dialog-view.css
+8
-10
webroot/rsrc/css/aphront/dialog-view.css
···
13
13
width: 300px;
14
14
}
15
15
16
-
.aphront-dialog-head {
17
-
border: 1px solid #d4dadf;
18
-
font-size: 15px;
19
-
padding: 10px 15px;
20
-
font-weight: bold;
16
+
.aphront-dialog-head .phabricator-action-header {
17
+
border-bottom: 1px solid #d4dadf;
18
+
padding: 5px 15px;
21
19
white-space: nowrap;
22
-
color: #525252;
23
-
text-shadow: 0 1px 0 white;
24
-
font-weight: bold;
25
-
background-image: url(/rsrc/image/texture/table_header_tall.png);
26
-
background-repeat: repeat-x;
27
20
border-top-left-radius: 6px;
28
21
border-top-right-radius: 6px;
22
+
}
23
+
24
+
.aphront-dialog-head .phabricator-action-header
25
+
.phabricator-action-header-title {
26
+
font-size: 15px;
29
27
}
30
28
31
29
.aphront-dialog-view-width-form {
+1
-1
webroot/rsrc/css/layout/phabricator-action-header-view.css
+1
-1
webroot/rsrc/css/layout/phabricator-action-header-view.css
+8
-4
webroot/rsrc/css/sprite-gradient.css
+8
-4
webroot/rsrc/css/sprite-gradient.css
···
19
19
background-position: 0px -109px;
20
20
}
21
21
22
+
.gradient-dark-grey-header {
23
+
background-position: 0px -212px;
24
+
}
25
+
22
26
.gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label {
23
27
background-position: 0px -25px;
24
28
}
25
29
26
30
.gradient-green-header {
27
-
background-position: 0px -212px;
31
+
background-position: 0px -283px;
28
32
}
29
33
30
34
.gradient-grey-header {
31
-
background-position: 0px -283px;
35
+
background-position: 0px -354px;
32
36
}
33
37
34
38
.gradient-menu-hover, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover, .phabricator-filetree a.phabricator-filetree-item:hover {
···
44
48
}
45
49
46
50
.gradient-red-header {
47
-
background-position: 0px -354px;
51
+
background-position: 0px -425px;
48
52
}
49
53
50
54
.gradient-yellow-header {
51
-
background-position: 0px -425px;
55
+
background-position: 0px -496px;
52
56
}
webroot/rsrc/image/sprite-gradient.png
webroot/rsrc/image/sprite-gradient.png
This is a binary file and will not be displayed.