Skip to content

Commit b8ea6c4

Browse files
chadlittlechadlittle
committed
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
1 parent e187312 commit b8ea6c4

File tree

11 files changed

+91
-71
lines changed

11 files changed

+91
-71
lines changed

‎resources/sprite/gradients/dark-grey-header.png

966 Bytes
Loading

‎resources/sprite/manifest/gradient.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,57 @@
11
{
22
"version" : 1,
33
"sprites" : {
4-
"gradient-blue-header" : {
4+
"gradient-blue-header" : {
55
"name" : "gradient-blue-header",
66
"rule" : ".gradient-blue-header",
77
"hash" : "dd82b6d737f9f683c0d6e70eff59e872"
88
},
9-
"gradient-breadcrumbs" : {
9+
"gradient-breadcrumbs" : {
1010
"name" : "gradient-breadcrumbs",
1111
"rule" : ".gradient-breadcrumbs",
1212
"hash" : "3d0f8634df5bc29eaf2a5a01bae79cf1"
1313
},
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" : {
1520
"name" : "gradient-dark-menu-label",
1621
"rule" : ".gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label",
1722
"hash" : "e0d4a455142f9c4745d36ad8b7dd3f78"
1823
},
19-
"gradient-green-header" : {
24+
"gradient-green-header" : {
2025
"name" : "gradient-green-header",
2126
"rule" : ".gradient-green-header",
2227
"hash" : "d61297d23aa31fa1de51e2b9b5974554"
2328
},
24-
"gradient-grey-header" : {
29+
"gradient-grey-header" : {
2530
"name" : "gradient-grey-header",
2631
"rule" : ".gradient-grey-header",
2732
"hash" : "f1453896068a8dd0d7885457c8e371bc"
2833
},
29-
"gradient-menu-hover" : {
34+
"gradient-menu-hover" : {
3035
"name" : "gradient-menu-hover",
3136
"rule" : ".gradient-menu-hover, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover, .phabricator-filetree a.phabricator-filetree-item:hover",
3237
"hash" : "e6e064156d66952180e99b00996ffc38"
3338
},
34-
"gradient-menu-label" : {
39+
"gradient-menu-label" : {
3540
"name" : "gradient-menu-label",
3641
"rule" : ".gradient-menu-label, .phabricator-side-menu .phabricator-menu-item-type-label",
3742
"hash" : "04b9943f5b06c8cb21fe6b96714e6662"
3843
},
39-
"gradient-menu-selected" : {
44+
"gradient-menu-selected" : {
4045
"name" : "gradient-menu-selected",
4146
"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",
4247
"hash" : "9b4b039fba177b90bc26f0e6eece339d"
4348
},
44-
"gradient-red-header" : {
49+
"gradient-red-header" : {
4550
"name" : "gradient-red-header",
4651
"rule" : ".gradient-red-header",
4752
"hash" : "27a76645065953a8440d0c3d2b192c82"
4853
},
49-
"gradient-yellow-header" : {
54+
"gradient-yellow-header" : {
5055
"name" : "gradient-yellow-header",
5156
"rule" : ".gradient-yellow-header",
5257
"hash" : "181e68e61f29071c3ec3810694c2ef08"

‎src/__celerity_resource_map__.php

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,8 @@
590590
),
591591
'/rsrc/image/sprite-gradient.png' =>
592592
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',
595595
'disk' => '/rsrc/image/sprite-gradient.png',
596596
'type' => 'png',
597597
),
@@ -761,7 +761,7 @@
761761
),
762762
'aphront-dialog-view-css' =>
763763
array(
764-
'uri' => '/res/215b3ab1/rsrc/css/aphront/dialog-view.css',
764+
'uri' => '/res/7060a2fe/rsrc/css/aphront/dialog-view.css',
765765
'type' => 'css',
766766
'requires' =>
767767
array(
@@ -2831,7 +2831,7 @@
28312831
),
28322832
'phabricator-action-header-view-css' =>
28332833
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',
28352835
'type' => 'css',
28362836
'requires' =>
28372837
array(
@@ -3821,7 +3821,7 @@
38213821
),
38223822
'sprite-gradient-css' =>
38233823
array(
3824-
'uri' => '/res/5bce353e/rsrc/css/sprite-gradient.css',
3824+
'uri' => '/res/fdc4dd44/rsrc/css/sprite-gradient.css',
38253825
'type' => 'css',
38263826
'requires' =>
38273827
array(
@@ -3903,7 +3903,7 @@
39033903
), array(
39043904
'packages' =>
39053905
array(
3906-
'60914b69' =>
3906+
'b3deb720' =>
39073907
array(
39083908
'name' => 'core.pkg.css',
39093909
'symbols' =>
@@ -3945,7 +3945,7 @@
39453945
34 => 'phabricator-object-item-list-view-css',
39463946
35 => 'global-drag-and-drop-css',
39473947
),
3948-
'uri' => '/res/pkg/60914b69/core.pkg.css',
3948+
'uri' => '/res/pkg/b3deb720/core.pkg.css',
39493949
'type' => 'css',
39503950
),
39513951
'bf16b308' =>
@@ -4135,16 +4135,16 @@
41354135
'reverse' =>
41364136
array(
41374137
'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',
41484148
'differential-changeset-view-css' => '8aaacd1b',
41494149
'differential-core-view-css' => '8aaacd1b',
41504150
'differential-inline-comment-editor' => 'e96b08f8',
@@ -4158,7 +4158,7 @@
41584158
'differential-table-of-contents-css' => '8aaacd1b',
41594159
'diffusion-commit-view-css' => 'c8ce2d88',
41604160
'diffusion-icons-css' => 'c8ce2d88',
4161-
'global-drag-and-drop-css' => '60914b69',
4161+
'global-drag-and-drop-css' => 'b3deb720',
41624162
'inline-comment-summary-css' => '8aaacd1b',
41634163
'javelin-aphlict' => 'bf16b308',
41644164
'javelin-behavior' => 'a2f94024',
@@ -4230,47 +4230,47 @@
42304230
'javelin-util' => 'a2f94024',
42314231
'javelin-vector' => 'a2f94024',
42324232
'javelin-workflow' => 'a2f94024',
4233-
'lightbox-attachment-css' => '60914b69',
4233+
'lightbox-attachment-css' => 'b3deb720',
42344234
'maniphest-task-summary-css' => '6b1fccc6',
42354235
'maniphest-transaction-detail-css' => '6b1fccc6',
42364236
'phabricator-busy' => 'bf16b308',
42374237
'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',
42424242
'phabricator-drag-and-drop-file-upload' => 'e96b08f8',
42434243
'phabricator-dropdown-menu' => 'bf16b308',
42444244
'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',
42504250
'phabricator-keyboard-shortcut' => 'bf16b308',
42514251
'phabricator-keyboard-shortcut-manager' => 'bf16b308',
4252-
'phabricator-main-menu-view' => '60914b69',
4252+
'phabricator-main-menu-view' => 'b3deb720',
42534253
'phabricator-menu-item' => 'bf16b308',
4254-
'phabricator-nav-view-css' => '60914b69',
4254+
'phabricator-nav-view-css' => 'b3deb720',
42554255
'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',
42594259
'phabricator-object-selector-css' => '8aaacd1b',
42604260
'phabricator-prefab' => 'bf16b308',
42614261
'phabricator-project-tag-css' => '6b1fccc6',
4262-
'phabricator-remarkup-css' => '60914b69',
4262+
'phabricator-remarkup-css' => 'b3deb720',
42634263
'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',
42664266
'phabricator-textareautils' => 'bf16b308',
42674267
'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',
42754275
),
42764276
));

‎src/applications/phriction/controller/PhrictionDeleteController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public function processRequest() {
4949
} else {
5050
$dialog = id(new AphrontDialogView())
5151
->setUser($user)
52-
->setTitle(pht('Delete document?'))
52+
->setTitle(pht('Delete Document?'))
53+
->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED)
5354
->appendChild(
5455
pht('Really delete this document? You can recover it later by '.
5556
'reverting to a previous version.'))

‎src/infrastructure/celerity/CeleritySpriteGenerator.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,8 @@ public function buildGradientSheet() {
415415
'blue-header' => 70,
416416
'green-header' => 70,
417417
'yellow-header' => 70,
418-
'grey-header' => 70
418+
'grey-header' => 70,
419+
'dark-grey-header' => 70,
419420
);
420421

421422
$extra_css = array(

‎src/view/AphrontDialogView.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ final class AphrontDialogView extends AphrontView {
1111
private $class;
1212
private $renderAsForm = true;
1313
private $formID;
14+
private $headerColor = PhabricatorActionHeaderView::HEADER_DARK_GREY;
1415

1516
private $width = 'default';
1617
const WIDTH_DEFAULT = 'default';
@@ -82,6 +83,11 @@ public function setWidth($width) {
8283
return $this;
8384
}
8485

86+
public function setHeaderColor($color) {
87+
$this->headerColor = $color;
88+
return $this;
89+
}
90+
8591
final public function render() {
8692
require_celerity_resource('aphront-dialog-view-css');
8793

@@ -168,9 +174,13 @@ final public function render() {
168174
$buttons[] = phutil_tag('div', array('style' => 'clear: both;'), '');
169175
$children = $this->renderChildren();
170176

177+
$header = new PhabricatorActionHeaderView();
178+
$header->setHeaderTitle($this->title);
179+
$header->setHeaderColor($this->headerColor);
180+
171181
$content = hsprintf(
172182
'%s%s%s',
173-
phutil_tag('div', array('class' => 'aphront-dialog-head'), $this->title),
183+
phutil_tag('div', array('class' => 'aphront-dialog-head'), $header),
174184
phutil_tag('div', array('class' => 'aphront-dialog-body'), $children),
175185
phutil_tag('div', array('class' => 'aphront-dialog-tail'), $buttons));
176186

‎src/view/layout/PhabricatorActionHeaderView.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ final class PhabricatorActionHeaderView extends AphrontView {
66
const ICON_WHITE = 'white';
77

88
const HEADER_GREY = 'grey';
9+
const HEADER_DARK_GREY = 'dark-grey';
910
const HEADER_BLUE = 'blue';
1011
const HEADER_GREEN = 'green';
1112
const HEADER_RED = 'red';

‎webroot/rsrc/css/aphront/dialog-view.css

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@
1313
width: 300px;
1414
}
1515

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;
2119
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;
2720
border-top-left-radius: 6px;
2821
border-top-right-radius: 6px;
2922
}
3023

24+
.aphront-dialog-head .phabricator-action-header
25+
.phabricator-action-header-title {
26+
font-size: 15px;
27+
}
28+
3129
.aphront-dialog-view-width-form {
3230
width: 600px;
3331
}

‎webroot/rsrc/css/layout/phabricator-action-header-view.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
.gradient-blue-header .phabricator-action-header-link,
4646
.gradient-yellow-header .phabricator-action-header-link {
4747
color: #fff;
48-
text-shadow: 0 -1px 1px rgba(0,0,0,.5);
48+
text-shadow: 0 -1px 1px rgba(0,0,0,.7);
4949
}
5050

5151
.phabricator-action-header-title span {

‎webroot/rsrc/css/sprite-gradient.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,20 @@
1919
background-position: 0px -109px;
2020
}
2121

22+
.gradient-dark-grey-header {
23+
background-position: 0px -212px;
24+
}
25+
2226
.gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label {
2327
background-position: 0px -25px;
2428
}
2529

2630
.gradient-green-header {
27-
background-position: 0px -212px;
31+
background-position: 0px -283px;
2832
}
2933

3034
.gradient-grey-header {
31-
background-position: 0px -283px;
35+
background-position: 0px -354px;
3236
}
3337

3438
.gradient-menu-hover, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover, .phabricator-filetree a.phabricator-filetree-item:hover {
@@ -44,9 +48,9 @@
4448
}
4549

4650
.gradient-red-header {
47-
background-position: 0px -354px;
51+
background-position: 0px -425px;
4852
}
4953

5054
.gradient-yellow-header {
51-
background-position: 0px -425px;
55+
background-position: 0px -496px;
5256
}

‎webroot/rsrc/image/sprite-gradient.png

41 Bytes
Loading

0 commit comments

Comments
 (0)