diff --git a/resources/sprite/manifest/status.json b/resources/sprite/manifest/status.json
index 43ca0f30ec..3079aa182e 100644
--- a/resources/sprite/manifest/status.json
+++ b/resources/sprite/manifest/status.json
@@ -151,6 +151,16 @@
"rule" : ".status-minus-white",
"hash" : "c5a3771452dda603fbaee87371044f5a"
},
+ "status-oh-closed" : {
+ "name" : "status-oh-closed",
+ "rule" : ".status-oh-closed",
+ "hash" : "cbc6a0959ebad3e88cc3ac67743a7f3a"
+ },
+ "status-oh-open" : {
+ "name" : "status-oh-open",
+ "rule" : ".status-oh-open",
+ "hash" : "e86f83bc40e77664c91c834b27816576"
+ },
"status-open-blue" : {
"name" : "status-open-blue",
"rule" : ".status-open-blue",
@@ -176,6 +186,41 @@
"rule" : ".status-open-white",
"hash" : "169dc0e8f36444ea30163181f9c88dc2"
},
+ "status-policy-admin" : {
+ "name" : "status-policy-admin",
+ "rule" : ".status-policy-admin",
+ "hash" : "1df35b15bd20880a5d20c0a2da446472"
+ },
+ "status-policy-all" : {
+ "name" : "status-policy-all",
+ "rule" : ".status-policy-all",
+ "hash" : "ef0c0594968b04ed90ca8dc629a39e54"
+ },
+ "status-policy-custom" : {
+ "name" : "status-policy-custom",
+ "rule" : ".status-policy-custom",
+ "hash" : "a432adf61806705c54ad7e110e063829"
+ },
+ "status-policy-noone" : {
+ "name" : "status-policy-noone",
+ "rule" : ".status-policy-noone",
+ "hash" : "23b4a85b15930c46fa409e95d26be2c4"
+ },
+ "status-policy-project" : {
+ "name" : "status-policy-project",
+ "rule" : ".status-policy-project",
+ "hash" : "bbc9e90f3353a357c5a39e703825504e"
+ },
+ "status-policy-public" : {
+ "name" : "status-policy-public",
+ "rule" : ".status-policy-public",
+ "hash" : "4e6e9763dbb87dca73847e64ef0b87e6"
+ },
+ "status-policy-unknown" : {
+ "name" : "status-policy-unknown",
+ "rule" : ".status-policy-unknown",
+ "hash" : "f32c8a68221f735e443cb8b18b41ee0e"
+ },
"status-question-blue" : {
"name" : "status-question-blue",
"rule" : ".status-question-blue",
diff --git a/resources/sprite/status_1x/oh-closed.png b/resources/sprite/status_1x/oh-closed.png
new file mode 100644
index 0000000000..184aad95ea
Binary files /dev/null and b/resources/sprite/status_1x/oh-closed.png differ
diff --git a/resources/sprite/status_1x/oh-open.png b/resources/sprite/status_1x/oh-open.png
new file mode 100644
index 0000000000..9f1fc4b07b
Binary files /dev/null and b/resources/sprite/status_1x/oh-open.png differ
diff --git a/resources/sprite/status_1x/policy-admin.png b/resources/sprite/status_1x/policy-admin.png
new file mode 100644
index 0000000000..888947e99b
Binary files /dev/null and b/resources/sprite/status_1x/policy-admin.png differ
diff --git a/resources/sprite/status_1x/policy-all.png b/resources/sprite/status_1x/policy-all.png
new file mode 100644
index 0000000000..abbee8a84a
Binary files /dev/null and b/resources/sprite/status_1x/policy-all.png differ
diff --git a/resources/sprite/status_1x/policy-custom.png b/resources/sprite/status_1x/policy-custom.png
new file mode 100644
index 0000000000..8831b81bb6
Binary files /dev/null and b/resources/sprite/status_1x/policy-custom.png differ
diff --git a/resources/sprite/status_1x/policy-noone.png b/resources/sprite/status_1x/policy-noone.png
new file mode 100644
index 0000000000..bdfeb18685
Binary files /dev/null and b/resources/sprite/status_1x/policy-noone.png differ
diff --git a/resources/sprite/status_1x/policy-project.png b/resources/sprite/status_1x/policy-project.png
new file mode 100644
index 0000000000..c8bd8a26b9
Binary files /dev/null and b/resources/sprite/status_1x/policy-project.png differ
diff --git a/resources/sprite/status_1x/policy-public.png b/resources/sprite/status_1x/policy-public.png
new file mode 100644
index 0000000000..0abd52cef8
Binary files /dev/null and b/resources/sprite/status_1x/policy-public.png differ
diff --git a/resources/sprite/status_1x/policy-unknown.png b/resources/sprite/status_1x/policy-unknown.png
new file mode 100644
index 0000000000..91c035c46d
Binary files /dev/null and b/resources/sprite/status_1x/policy-unknown.png differ
diff --git a/resources/sprite/status_2x/oh-closed.png b/resources/sprite/status_2x/oh-closed.png
new file mode 100644
index 0000000000..e4489b2ebf
Binary files /dev/null and b/resources/sprite/status_2x/oh-closed.png differ
diff --git a/resources/sprite/status_2x/oh-open.png b/resources/sprite/status_2x/oh-open.png
new file mode 100644
index 0000000000..5a90b94ca3
Binary files /dev/null and b/resources/sprite/status_2x/oh-open.png differ
diff --git a/resources/sprite/status_2x/policy-admin.png b/resources/sprite/status_2x/policy-admin.png
new file mode 100644
index 0000000000..3e877ed56c
Binary files /dev/null and b/resources/sprite/status_2x/policy-admin.png differ
diff --git a/resources/sprite/status_2x/policy-all.png b/resources/sprite/status_2x/policy-all.png
new file mode 100644
index 0000000000..6fb4a12178
Binary files /dev/null and b/resources/sprite/status_2x/policy-all.png differ
diff --git a/resources/sprite/status_2x/policy-custom.png b/resources/sprite/status_2x/policy-custom.png
new file mode 100644
index 0000000000..8379d7f708
Binary files /dev/null and b/resources/sprite/status_2x/policy-custom.png differ
diff --git a/resources/sprite/status_2x/policy-noone.png b/resources/sprite/status_2x/policy-noone.png
new file mode 100644
index 0000000000..4b11d3f01f
Binary files /dev/null and b/resources/sprite/status_2x/policy-noone.png differ
diff --git a/resources/sprite/status_2x/policy-project.png b/resources/sprite/status_2x/policy-project.png
new file mode 100644
index 0000000000..4d777ca0b0
Binary files /dev/null and b/resources/sprite/status_2x/policy-project.png differ
diff --git a/resources/sprite/status_2x/policy-public.png b/resources/sprite/status_2x/policy-public.png
new file mode 100644
index 0000000000..339c8dbc2a
Binary files /dev/null and b/resources/sprite/status_2x/policy-public.png differ
diff --git a/resources/sprite/status_2x/policy-unknown.png b/resources/sprite/status_2x/policy-unknown.png
new file mode 100644
index 0000000000..349d5a5f5b
Binary files /dev/null and b/resources/sprite/status_2x/policy-unknown.png differ
diff --git a/scripts/celerity_mapper.php b/scripts/celerity_mapper.php
index e087b7e59f..e7d27c92fb 100755
--- a/scripts/celerity_mapper.php
+++ b/scripts/celerity_mapper.php
@@ -96,7 +96,7 @@ $package_spec = array(
'phabricator-notification-css',
'phabricator-notification-menu-css',
'lightbox-attachment-css',
- 'phabricator-header-view-css',
+ 'phui-header-view-css',
'phabricator-filetree-view-css',
'phabricator-nav-view-css',
'phabricator-side-menu-view-css',
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 1d9730bec8..a65cc29b7a 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -702,15 +702,15 @@ celerity_register_resource_map(array(
),
'/rsrc/image/sprite-status-X2.png' =>
array(
- 'hash' => '3c57299b04fc21bee8a20d2d019bf6b6',
- 'uri' => '/res/3c57299b/rsrc/image/sprite-status-X2.png',
+ 'hash' => 'b26f204c1b5ff01e3facbf78ccdc358b',
+ 'uri' => '/res/b26f204c/rsrc/image/sprite-status-X2.png',
'disk' => '/rsrc/image/sprite-status-X2.png',
'type' => 'png',
),
'/rsrc/image/sprite-status.png' =>
array(
- 'hash' => 'b76029c6bac69fd5bd9ab82d254f2ef1',
- 'uri' => '/res/b76029c6/rsrc/image/sprite-status.png',
+ 'hash' => 'c1f9c28f3ab24a0f2d758331bb0f8a09',
+ 'uri' => '/res/c1f9c28f/rsrc/image/sprite-status.png',
'disk' => '/rsrc/image/sprite-status.png',
'type' => 'png',
),
@@ -1149,7 +1149,7 @@ celerity_register_resource_map(array(
),
'diviner-shared-css' =>
array(
- 'uri' => '/res/ef49b30b/rsrc/css/diviner/diviner-shared.css',
+ 'uri' => '/res/cba9c99e/rsrc/css/diviner/diviner-shared.css',
'type' => 'css',
'requires' =>
array(
@@ -3014,7 +3014,7 @@ celerity_register_resource_map(array(
),
'phabricator-action-list-view-css' =>
array(
- 'uri' => '/res/5478ce6c/rsrc/css/layout/phabricator-action-list-view.css',
+ 'uri' => '/res/c6219563/rsrc/css/layout/phabricator-action-list-view.css',
'type' => 'css',
'requires' =>
array(
@@ -3080,7 +3080,7 @@ celerity_register_resource_map(array(
),
'phabricator-crumbs-view-css' =>
array(
- 'uri' => '/res/ff818db7/rsrc/css/layout/phabricator-crumbs-view.css',
+ 'uri' => '/res/4d722e16/rsrc/css/layout/phabricator-crumbs-view.css',
'type' => 'css',
'requires' =>
array(
@@ -3180,15 +3180,6 @@ celerity_register_resource_map(array(
),
'disk' => '/rsrc/css/application/flag/flag.css',
),
- 'phabricator-header-view-css' =>
- array(
- 'uri' => '/res/8b2bcc29/rsrc/css/layout/phabricator-header-view.css',
- 'type' => 'css',
- 'requires' =>
- array(
- ),
- 'disk' => '/rsrc/css/layout/phabricator-header-view.css',
- ),
'phabricator-hovercard' =>
array(
'uri' => '/res/7fb94260/rsrc/js/core/Hovercard.js',
@@ -3376,7 +3367,7 @@ celerity_register_resource_map(array(
),
'phabricator-property-list-view-css' =>
array(
- 'uri' => '/res/fdcbf4ab/rsrc/css/layout/phabricator-property-list-view.css',
+ 'uri' => '/res/3a0ffc53/rsrc/css/layout/phabricator-property-list-view.css',
'type' => 'css',
'requires' =>
array(
@@ -3747,7 +3738,7 @@ celerity_register_resource_map(array(
),
'phui-document-view-css' =>
array(
- 'uri' => '/res/c95d4bdf/rsrc/css/phui/phui-document.css',
+ 'uri' => '/res/7928af2d/rsrc/css/phui/phui-document.css',
'type' => 'css',
'requires' =>
array(
@@ -3781,9 +3772,18 @@ celerity_register_resource_map(array(
),
'disk' => '/rsrc/css/phui/phui-form-view.css',
),
+ 'phui-header-view-css' =>
+ array(
+ 'uri' => '/res/7ce53631/rsrc/css/phui/phui-header-view.css',
+ 'type' => 'css',
+ 'requires' =>
+ array(
+ ),
+ 'disk' => '/rsrc/css/phui/phui-header-view.css',
+ ),
'phui-icon-view-css' =>
array(
- 'uri' => '/res/f78f4c64/rsrc/css/phui/phui-icon.css',
+ 'uri' => '/res/28fb5ae5/rsrc/css/phui/phui-icon.css',
'type' => 'css',
'requires' =>
array(
@@ -4134,7 +4134,7 @@ celerity_register_resource_map(array(
),
'sprite-status-css' =>
array(
- 'uri' => '/res/72b39c66/rsrc/css/sprite-status.css',
+ 'uri' => '/res/d61bb845/rsrc/css/sprite-status.css',
'type' => 'css',
'requires' =>
array(
@@ -4171,7 +4171,7 @@ celerity_register_resource_map(array(
), array(
'packages' =>
array(
- '606d1ed1' =>
+ '2c60f04c' =>
array(
'name' => 'core.pkg.css',
'symbols' =>
@@ -4203,7 +4203,7 @@ celerity_register_resource_map(array(
24 => 'phabricator-notification-css',
25 => 'phabricator-notification-menu-css',
26 => 'lightbox-attachment-css',
- 27 => 'phabricator-header-view-css',
+ 27 => 'phui-header-view-css',
28 => 'phabricator-filetree-view-css',
29 => 'phabricator-nav-view-css',
30 => 'phabricator-side-menu-view-css',
@@ -4218,7 +4218,7 @@ celerity_register_resource_map(array(
39 => 'phabricator-property-list-view-css',
40 => 'phabricator-tag-view-css',
),
- 'uri' => '/res/pkg/606d1ed1/core.pkg.css',
+ 'uri' => '/res/pkg/2c60f04c/core.pkg.css',
'type' => 'css',
),
'8977e356' =>
@@ -4409,15 +4409,15 @@ celerity_register_resource_map(array(
),
'reverse' =>
array(
- 'aphront-dialog-view-css' => '606d1ed1',
- 'aphront-error-view-css' => '606d1ed1',
- 'aphront-list-filter-view-css' => '606d1ed1',
- 'aphront-pager-view-css' => '606d1ed1',
- 'aphront-panel-view-css' => '606d1ed1',
- 'aphront-table-view-css' => '606d1ed1',
- 'aphront-tokenizer-control-css' => '606d1ed1',
- 'aphront-tooltip-css' => '606d1ed1',
- 'aphront-typeahead-control-css' => '606d1ed1',
+ 'aphront-dialog-view-css' => '2c60f04c',
+ 'aphront-error-view-css' => '2c60f04c',
+ 'aphront-list-filter-view-css' => '2c60f04c',
+ 'aphront-pager-view-css' => '2c60f04c',
+ 'aphront-panel-view-css' => '2c60f04c',
+ 'aphront-table-view-css' => '2c60f04c',
+ 'aphront-tokenizer-control-css' => '2c60f04c',
+ 'aphront-tooltip-css' => '2c60f04c',
+ 'aphront-typeahead-control-css' => '2c60f04c',
'differential-changeset-view-css' => '44bfe40c',
'differential-core-view-css' => '44bfe40c',
'differential-inline-comment-editor' => '5e9e5c4e',
@@ -4431,7 +4431,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => '44bfe40c',
'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88',
- 'global-drag-and-drop-css' => '606d1ed1',
+ 'global-drag-and-drop-css' => '2c60f04c',
'inline-comment-summary-css' => '44bfe40c',
'javelin-aphlict' => '8977e356',
'javelin-behavior' => 'f32597c9',
@@ -4504,55 +4504,55 @@ celerity_register_resource_map(array(
'javelin-util' => 'f32597c9',
'javelin-vector' => 'f32597c9',
'javelin-workflow' => 'f32597c9',
- 'lightbox-attachment-css' => '606d1ed1',
+ 'lightbox-attachment-css' => '2c60f04c',
'maniphest-task-summary-css' => '36d5d071',
'maniphest-transaction-detail-css' => '36d5d071',
- 'phabricator-action-list-view-css' => '606d1ed1',
- 'phabricator-application-launch-view-css' => '606d1ed1',
+ 'phabricator-action-list-view-css' => '2c60f04c',
+ 'phabricator-application-launch-view-css' => '2c60f04c',
'phabricator-busy' => '8977e356',
'phabricator-content-source-view-css' => '44bfe40c',
- 'phabricator-core-css' => '606d1ed1',
- 'phabricator-crumbs-view-css' => '606d1ed1',
+ 'phabricator-core-css' => '2c60f04c',
+ 'phabricator-crumbs-view-css' => '2c60f04c',
'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
'phabricator-dropdown-menu' => '8977e356',
'phabricator-file-upload' => '8977e356',
- 'phabricator-filetree-view-css' => '606d1ed1',
- 'phabricator-flag-css' => '606d1ed1',
- 'phabricator-header-view-css' => '606d1ed1',
+ 'phabricator-filetree-view-css' => '2c60f04c',
+ 'phabricator-flag-css' => '2c60f04c',
'phabricator-hovercard' => '8977e356',
- 'phabricator-jump-nav' => '606d1ed1',
+ 'phabricator-jump-nav' => '2c60f04c',
'phabricator-keyboard-shortcut' => '8977e356',
'phabricator-keyboard-shortcut-manager' => '8977e356',
- 'phabricator-main-menu-view' => '606d1ed1',
+ 'phabricator-main-menu-view' => '2c60f04c',
'phabricator-menu-item' => '8977e356',
- 'phabricator-nav-view-css' => '606d1ed1',
+ 'phabricator-nav-view-css' => '2c60f04c',
'phabricator-notification' => '8977e356',
- 'phabricator-notification-css' => '606d1ed1',
- 'phabricator-notification-menu-css' => '606d1ed1',
+ 'phabricator-notification-css' => '2c60f04c',
+ 'phabricator-notification-menu-css' => '2c60f04c',
'phabricator-object-selector-css' => '44bfe40c',
'phabricator-phtize' => '8977e356',
'phabricator-prefab' => '8977e356',
'phabricator-project-tag-css' => '36d5d071',
- 'phabricator-property-list-view-css' => '606d1ed1',
- 'phabricator-remarkup-css' => '606d1ed1',
+ 'phabricator-property-list-view-css' => '2c60f04c',
+ 'phabricator-remarkup-css' => '2c60f04c',
'phabricator-shaped-request' => '5e9e5c4e',
- 'phabricator-side-menu-view-css' => '606d1ed1',
- 'phabricator-standard-page-view' => '606d1ed1',
- 'phabricator-tag-view-css' => '606d1ed1',
+ 'phabricator-side-menu-view-css' => '2c60f04c',
+ 'phabricator-standard-page-view' => '2c60f04c',
+ 'phabricator-tag-view-css' => '2c60f04c',
'phabricator-textareautils' => '8977e356',
'phabricator-tooltip' => '8977e356',
- 'phabricator-transaction-view-css' => '606d1ed1',
- 'phabricator-zindex-css' => '606d1ed1',
- 'phui-button-css' => '606d1ed1',
- 'phui-form-css' => '606d1ed1',
- 'phui-form-view-css' => '606d1ed1',
- 'phui-icon-view-css' => '606d1ed1',
- 'phui-object-item-list-view-css' => '606d1ed1',
- 'phui-spacing-css' => '606d1ed1',
- 'sprite-apps-large-css' => '606d1ed1',
- 'sprite-gradient-css' => '606d1ed1',
- 'sprite-icons-css' => '606d1ed1',
- 'sprite-menu-css' => '606d1ed1',
- 'syntax-highlighting-css' => '606d1ed1',
+ 'phabricator-transaction-view-css' => '2c60f04c',
+ 'phabricator-zindex-css' => '2c60f04c',
+ 'phui-button-css' => '2c60f04c',
+ 'phui-form-css' => '2c60f04c',
+ 'phui-form-view-css' => '2c60f04c',
+ 'phui-header-view-css' => '2c60f04c',
+ 'phui-icon-view-css' => '2c60f04c',
+ 'phui-object-item-list-view-css' => '2c60f04c',
+ 'phui-spacing-css' => '2c60f04c',
+ 'sprite-apps-large-css' => '2c60f04c',
+ 'sprite-gradient-css' => '2c60f04c',
+ 'sprite-icons-css' => '2c60f04c',
+ 'sprite-menu-css' => '2c60f04c',
+ 'syntax-highlighting-css' => '2c60f04c',
),
));
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index fb3cc622e4..2e8ba176e5 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -754,6 +754,7 @@ phutil_register_library_map(array(
'PHUIFormLayoutView' => 'view/form/PHUIFormLayoutView.php',
'PHUIFormMultiSubmitControl' => 'view/form/control/PHUIFormMultiSubmitControl.php',
'PHUIFormPageView' => 'view/form/PHUIFormPageView.php',
+ 'PHUIHeaderView' => 'view/phui/PHUIHeaderView.php',
'PHUIIconExample' => 'applications/uiexample/examples/PHUIIconExample.php',
'PHUIIconView' => 'view/phui/PHUIIconView.php',
'PHUIListExample' => 'applications/uiexample/examples/PHUIListExample.php',
@@ -1229,7 +1230,6 @@ phutil_register_library_map(array(
'PhabricatorHandleQuery' => 'applications/phid/query/PhabricatorHandleQuery.php',
'PhabricatorHash' => 'infrastructure/util/PhabricatorHash.php',
'PhabricatorHashTestCase' => 'infrastructure/util/__tests__/PhabricatorHashTestCase.php',
- 'PhabricatorHeaderView' => 'view/layout/PhabricatorHeaderView.php',
'PhabricatorHelpController' => 'applications/help/controller/PhabricatorHelpController.php',
'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
'PhabricatorHovercardExample' => 'applications/uiexample/examples/PhabricatorHovercardExample.php',
@@ -2839,6 +2839,7 @@ phutil_register_library_map(array(
'PHUIFormLayoutView' => 'AphrontView',
'PHUIFormMultiSubmitControl' => 'AphrontFormControl',
'PHUIFormPageView' => 'AphrontView',
+ 'PHUIHeaderView' => 'AphrontView',
'PHUIIconExample' => 'PhabricatorUIExample',
'PHUIIconView' => 'AphrontTagView',
'PHUIListExample' => 'PhabricatorUIExample',
@@ -3363,7 +3364,6 @@ phutil_register_library_map(array(
'PhabricatorGlobalUploadTargetView' => 'AphrontView',
'PhabricatorHandleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'PhabricatorHashTestCase' => 'PhabricatorTestCase',
- 'PhabricatorHeaderView' => 'AphrontView',
'PhabricatorHelpController' => 'PhabricatorController',
'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
'PhabricatorHovercardExample' => 'PhabricatorUIExample',
diff --git a/src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php b/src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
index 68ff80a538..b8f1a8ccd5 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
@@ -30,7 +30,7 @@ final class PhabricatorCalendarViewStatusController
$nav->appendChild(
array(
- id(new PhabricatorHeaderView())->setHeader($page_title),
+ id(new PHUIHeaderView())->setHeader($page_title),
$status_list,
));
diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
index 3a25e954b0..837674996e 100644
--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
@@ -385,10 +385,10 @@ final class PhabricatorConduitAPIController
$result_panel->setHeader('Method Result');
$result_panel->appendChild($result_table);
- $param_head = id(new PhabricatorHeaderView())
+ $param_head = id(new PHUIHeaderView())
->setHeader(pht('Method Parameters'));
- $result_head = id(new PhabricatorHeaderView())
+ $result_head = id(new PHUIHeaderView())
->setHeader(pht('Method Result'));
$method_uri = $this->getApplicationURI('method/'.$method.'/');
diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php
index 45cde11b08..bdd4c73cd9 100644
--- a/src/applications/config/controller/PhabricatorConfigGroupController.php
+++ b/src/applications/config/controller/PhabricatorConfigGroupController.php
@@ -21,7 +21,7 @@ final class PhabricatorConfigGroupController
$title = pht('%s Configuration', $options->getName());
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$list = $this->buildOptionList($options->getOptions());
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
index 9b9b60299b..f9b1333ca3 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -17,7 +17,7 @@ final class PhabricatorConfigIssueListController
$list = $this->buildIssueList($issues);
$list->setNoDataString(pht("There are no open setup issues."));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Open Phabricator Setup Issues'));
$nav->appendChild(
diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php
index addf01a073..a583fbb491 100644
--- a/src/applications/config/controller/PhabricatorConfigListController.php
+++ b/src/applications/config/controller/PhabricatorConfigListController.php
@@ -15,7 +15,7 @@ final class PhabricatorConfigListController
$title = pht('Phabricator Configuration');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$nav->appendChild(
diff --git a/src/applications/countdown/controller/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php
index e65ca17f62..8efa57a979 100644
--- a/src/applications/countdown/controller/PhabricatorCountdownViewController.php
+++ b/src/applications/countdown/controller/PhabricatorCountdownViewController.php
@@ -41,7 +41,7 @@ final class PhabricatorCountdownViewController
id(new PhabricatorCrumbView())
->setName("C{$id}"));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$actions = $this->buildActionListView($countdown);
diff --git a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
index a380c8e93b..ffaaf262f0 100644
--- a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
@@ -64,7 +64,7 @@ final class PhabricatorDaemonConsoleController
'n',
));
- $completed_header = id(new PhabricatorHeaderView())
+ $completed_header = id(new PHUIHeaderView())
->setHeader(pht('Recently Completed Tasks (Last 15m)'));
$completed_panel = new AphrontPanelView();
@@ -76,7 +76,7 @@ final class PhabricatorDaemonConsoleController
->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
->execute();
- $daemon_header = id(new PhabricatorHeaderView())
+ $daemon_header = id(new PHUIHeaderView())
->setHeader(pht('Active Daemons'));
$daemon_table = new PhabricatorDaemonLogListView();
diff --git a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
index 8f3d198c90..69bac11505 100644
--- a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
@@ -30,7 +30,7 @@ final class PhabricatorDaemonLogViewController
id(new PhabricatorCrumbView())
->setName(pht('Daemon %s', $log->getID())));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($log->getDaemon());
$tag = id(new PhabricatorTagView())
diff --git a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
index c8b4e32756..cb035b715f 100644
--- a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
+++ b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
@@ -33,7 +33,7 @@ final class PhabricatorWorkerTaskDetailController
} else {
$title = pht('Task %d', $task->getID());
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Task %d (%s)',
$task->getID(),
$task->getTaskClass()));
@@ -41,7 +41,7 @@ final class PhabricatorWorkerTaskDetailController
$actions = $this->buildActionListView($task);
$properties = $this->buildPropertyListView($task);
- $retry_head = id(new PhabricatorHeaderView())
+ $retry_head = id(new PHUIHeaderView())
->setHeader(pht('Retries'));
$retry_info = $this->buildRetryListView($task);
diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
index cb2fd99e01..8122a0b605 100644
--- a/src/applications/differential/controller/DifferentialDiffViewController.php
+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
@@ -114,7 +114,7 @@ final class DifferentialDiffViewController extends DifferentialController {
}
}
- $property_head = id(new PhabricatorHeaderView())
+ $property_head = id(new PHUIHeaderView())
->setHeader(pht('Properties'));
$property_view = new PhabricatorPropertyListView();
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 8ce7b19029..2610ce97dc 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -846,7 +846,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$view->setHandles($handles);
return array(
- id(new PhabricatorHeaderView())
+ id(new PHUIHeaderView())
->setHeader(pht('Open Revisions Affecting These Files')),
$view,
);
diff --git a/src/applications/differential/view/DifferentialAddCommentView.php b/src/applications/differential/view/DifferentialAddCommentView.php
index b17a0f7ea5..9fd58d5cd7 100644
--- a/src/applications/differential/view/DifferentialAddCommentView.php
+++ b/src/applications/differential/view/DifferentialAddCommentView.php
@@ -173,7 +173,7 @@ final class DifferentialAddCommentView extends AphrontView {
}
}
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($is_serious ? pht('Add Comment') : pht('Leap Into Action'));
return hsprintf(
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index 53ead78627..2398863a5c 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -195,7 +195,7 @@ final class DifferentialChangesetListView extends AphrontView {
}
return array(
- id(new PhabricatorHeaderView())
+ id(new PHUIHeaderView())
->setHeader($this->getTitle())
->render(),
phutil_tag(
diff --git a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
index 5a06782a94..b95096aa14 100644
--- a/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
+++ b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
@@ -232,7 +232,7 @@ final class DifferentialDiffTableOfContentsView extends AphrontView {
->setAnchorName('toc')
->setNavigationMarker(true)
->render(),
- id(new PhabricatorHeaderView())
+ id(new PHUIHeaderView())
->setHeader(pht('Table of Contents'))
->render(),
pht('Coverage (All)'),
diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php
index 9a47fe6f31..f7da850f6e 100644
--- a/src/applications/differential/view/DifferentialLocalCommitsView.php
+++ b/src/applications/differential/view/DifferentialLocalCommitsView.php
@@ -128,7 +128,7 @@ final class DifferentialLocalCommitsView extends AphrontView {
$headers = phutil_tag('tr', array(), $headers);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Local Commits'))
->render();
diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php
index e47e071150..ad1b912458 100644
--- a/src/applications/differential/view/DifferentialRevisionDetailView.php
+++ b/src/applications/differential/view/DifferentialRevisionDetailView.php
@@ -119,7 +119,7 @@ final class DifferentialRevisionDetailView extends AphrontView {
}
private function renderHeader(DifferentialRevision $revision) {
- $view = id(new PhabricatorHeaderView())
+ $view = id(new PHUIHeaderView())
->setHeader($revision->getTitle($revision));
$view->addTag(self::renderTagForRevision($revision));
diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
index 308019c984..05e6d9f24b 100644
--- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
+++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
@@ -215,7 +215,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
''.
''.
'',
- id(new PhabricatorHeaderView())
+ id(new PHUIHeaderView())
->setHeader(pht('Revision Update History'))
->render(),
phutil_implode_html("\n", $rows),
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 822b1c5650..a2a73f3c44 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -95,7 +95,7 @@ final class DiffusionBrowseController extends DiffusionController {
$box->addPadding(PHUI::PADDING_LARGE);
$box->addMargin(PHUI::MARGIN_LARGE);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('README'));
$content[] = array(
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 0f8d5270a7..6e2d5c2d63 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -85,7 +85,7 @@ final class DiffusionCommitController extends DiffusionController {
'diffusion.commitparentsquery',
array('commit' => $drequest->getCommit()));
- $headsup_view = id(new PhabricatorHeaderView())
+ $headsup_view = id(new PHUIHeaderView())
->setHeader(nonempty($commit->getSummary(), pht('Commit Detail')));
$headsup_actions = $this->renderHeadsupActionList($commit, $repository);
@@ -660,7 +660,7 @@ final class DiffusionCommitController extends DiffusionController {
id(new AphrontFormSubmitControl())
->setValue($is_serious ? pht('Submit') : pht('Cook the Books')));
- $header = new PhabricatorHeaderView();
+ $header = new PHUIHeaderView();
$header->setHeader(
$is_serious ? pht('Audit Commit') : pht('Creative Accounting'));
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index 9e55ce176f..f2ad87c859 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -133,7 +133,7 @@ abstract class DiffusionController extends PhabricatorController {
$handles = $this->loadViewerHandles($phids);
$view->setHandles($handles);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Pending Differential Revisions'));
return array(
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 007d6e4bed..4aaff83af8 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -136,7 +136,7 @@ final class DiffusionRepositoryController extends DiffusionController {
private function buildPropertiesTable(PhabricatorRepository $repository) {
$user = $this->getRequest()->getUser();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($repository->getName());
$view = id(new PhabricatorPropertyListView())
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
index 7c2682980e..119cef5347 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
@@ -18,19 +18,19 @@ final class DiffusionRepositoryEditController extends DiffusionController {
$title = pht('Edit %s', $repository->getName());
- $content[] = id(new PhabricatorHeaderView())
+ $content[] = id(new PHUIHeaderView())
->setHeader($title);
$content[] = $this->buildBasicActions($repository);
$content[] = $this->buildBasicProperties($repository);
- $content[] = id(new PhabricatorHeaderView())
+ $content[] = id(new PHUIHeaderView())
->setHeader(pht('Text Encoding'));
$content[] = $this->buildEncodingActions($repository);
$content[] = $this->buildEncodingProperties($repository);
- $content[] = id(new PhabricatorHeaderView())
+ $content[] = id(new PHUIHeaderView())
->setHeader(pht('Edit History'));
$xactions = id(new PhabricatorRepositoryTransactionQuery())
diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
index 68bf067b8a..f51bf993cd 100644
--- a/src/applications/diviner/controller/DivinerAtomController.php
+++ b/src/applications/diviner/controller/DivinerAtomController.php
@@ -72,7 +72,7 @@ final class DivinerAtomController extends DivinerController {
id(new PhabricatorCrumbView())
->setName($atom_short_title));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($this->renderFullSignature($symbol))
->addTag(
id(new PhabricatorTagView())
@@ -153,7 +153,7 @@ final class DivinerAtomController extends DivinerController {
foreach ($tasks as $spec) {
$section->addContent(
- id(new PhabricatorHeaderView())
+ id(new PHUIHeaderView())
->setNoBackground(true)
->setHeader($spec['title']));
@@ -203,7 +203,7 @@ final class DivinerAtomController extends DivinerController {
foreach ($methods as $spec) {
$matom = last($spec['atoms']);
- $method_header = id(new PhabricatorHeaderView())
+ $method_header = id(new PHUIHeaderView())
->setNoBackground(true);
$inherited = $spec['inherited'];
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
index 445be00baf..cb5f03aeed 100644
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -32,7 +32,7 @@ final class DivinerBookController extends DivinerController {
->setName($book->getShortTitle())
->setHref('/book/'.$book->getName().'/'));
- $header = id(new PhabricatorHeaderView())->setHeader($book->getTitle());
+ $header = id(new PHUIHeaderView())->setHeader($book->getTitle());
$document = new PHUIDocumentView();
$document->setHeader($header);
diff --git a/src/applications/diviner/controller/DivinerLegacyController.php b/src/applications/diviner/controller/DivinerLegacyController.php
index e5b7f32185..b38926b631 100644
--- a/src/applications/diviner/controller/DivinerLegacyController.php
+++ b/src/applications/diviner/controller/DivinerLegacyController.php
@@ -47,7 +47,7 @@ final class DivinerLegacyController extends DivinerController {
id(new PhabricatorCrumbView())
->setName(pht('Documentation')));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Documentation'));
$document = new PHUIDocumentView();
diff --git a/src/applications/diviner/view/DivinerSectionView.php b/src/applications/diviner/view/DivinerSectionView.php
index d88457c420..0f48858db6 100644
--- a/src/applications/diviner/view/DivinerSectionView.php
+++ b/src/applications/diviner/view/DivinerSectionView.php
@@ -28,7 +28,7 @@ final class DivinerSectionView extends AphrontTagView {
public function getTagContent() {
require_celerity_resource('diviner-shared-css');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setBleedHeader(true)
->setHeader($this->header);
diff --git a/src/applications/drydock/controller/DrydockLeaseListController.php b/src/applications/drydock/controller/DrydockLeaseListController.php
index 43507b3ea4..8ae5e4add5 100644
--- a/src/applications/drydock/controller/DrydockLeaseListController.php
+++ b/src/applications/drydock/controller/DrydockLeaseListController.php
@@ -18,7 +18,7 @@ final class DrydockLeaseListController extends DrydockController {
$title = pht('Leases');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$lease_list = $this->buildLeaseListView($leases);
diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
index f3c1be76df..36426e34eb 100644
--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -21,7 +21,7 @@ final class DrydockLeaseViewController extends DrydockController {
$title = pht('Lease %d', $lease->getID());
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$actions = $this->buildActionListView($lease);
diff --git a/src/applications/drydock/controller/DrydockLogController.php b/src/applications/drydock/controller/DrydockLogController.php
index f2ed9708cd..1a378df3cc 100644
--- a/src/applications/drydock/controller/DrydockLogController.php
+++ b/src/applications/drydock/controller/DrydockLogController.php
@@ -29,7 +29,7 @@ final class DrydockLogController extends DrydockController {
$title = pht('Logs');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$table = $this->buildLogTableView($logs);
diff --git a/src/applications/drydock/controller/DrydockResourceListController.php b/src/applications/drydock/controller/DrydockResourceListController.php
index 505a6d1560..c94d64c085 100644
--- a/src/applications/drydock/controller/DrydockResourceListController.php
+++ b/src/applications/drydock/controller/DrydockResourceListController.php
@@ -8,7 +8,7 @@ final class DrydockResourceListController extends DrydockController {
$title = pht('Resources');
- $resource_header = id(new PhabricatorHeaderView())
+ $resource_header = id(new PHUIHeaderView())
->setHeader($title);
$pager = new AphrontPagerView();
diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
index 422ee38b5b..30c06317f5 100644
--- a/src/applications/drydock/controller/DrydockResourceViewController.php
+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
@@ -19,7 +19,7 @@ final class DrydockResourceViewController extends DrydockController {
$title = 'Resource '.$resource->getID().' '.$resource->getName();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$actions = $this->buildActionListView($resource);
@@ -33,7 +33,7 @@ final class DrydockResourceViewController extends DrydockController {
->needResources(true)
->execute();
- $lease_header = id(new PhabricatorHeaderView())
+ $lease_header = id(new PHUIHeaderView())
->setHeader(pht('Leases'));
$lease_list = $this->buildLeaseListView($leases);
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index a7c7430982..6a0a7f2834 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -28,7 +28,7 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
->execute();
$this->loadHandles(array($file->getAuthorPHID()));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($file->getName());
$ttl = $file->getTTL();
@@ -88,7 +88,7 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
- $add_comment_header = id(new PhabricatorHeaderView())
+ $add_comment_header = id(new PHUIHeaderView())
->setHeader(
$is_serious
? pht('Add Comment')
diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php
index 2470042e8b..59523b80d6 100644
--- a/src/applications/herald/controller/HeraldRuleViewController.php
+++ b/src/applications/herald/controller/HeraldRuleViewController.php
@@ -21,7 +21,7 @@ final class HeraldRuleViewController extends HeraldController {
return new Aphront404Response();
}
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($rule->getName());
$actions = $this->buildActionView($rule);
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
index 59be4de1d9..fe6c74cfc1 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -119,7 +119,7 @@ final class LegalpadDocumentSignController extends LegalpadController {
$title = $document_body->getTitle();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$content = array(
diff --git a/src/applications/legalpad/controller/LegalpadDocumentViewController.php b/src/applications/legalpad/controller/LegalpadDocumentViewController.php
index 0fa35851d1..4a4a3097b8 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentViewController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentViewController.php
@@ -61,7 +61,7 @@ final class LegalpadDocumentViewController extends LegalpadController {
$title = $document_body->getTitle();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$actions = $this->buildActionView($document);
@@ -200,7 +200,7 @@ final class LegalpadDocumentViewController extends LegalpadController {
? pht('Add Comment')
: pht('Debate Legislation');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$button_name = $is_serious
diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
index 129b7de352..2103541b7e 100644
--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
@@ -59,7 +59,7 @@ final class PhabricatorMacroViewController
->setTransactions($xactions)
->setMarkupEngine($engine);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title_long);
if ($macro->getIsDisabled()) {
@@ -72,7 +72,7 @@ final class PhabricatorMacroViewController
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
- $add_comment_header = id(new PhabricatorHeaderView())
+ $add_comment_header = id(new PHUIHeaderView())
->setHeader(
$is_serious
? pht('Add Comment')
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
index 276b0a16c0..3f8f2ab43b 100644
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -321,7 +321,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
'tokenizers' => $tokenizer_map,
));
- $comment_header = id(new PhabricatorHeaderView())
+ $comment_header = id(new PHUIHeaderView())
->setHeader($is_serious ? pht('Add Comment') : pht('Weigh In'));
$preview_panel = hsprintf(
@@ -372,7 +372,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
}
private function buildHeaderView(ManiphestTask $task) {
- $view = id(new PhabricatorHeaderView())
+ $view = id(new PHUIHeaderView())
->setHeader($task->getTitle());
$view->addTag(ManiphestView::renderTagForTask($task));
diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
index 1ce99f771a..89d7be54d1 100644
--- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
@@ -27,7 +27,7 @@ final class PhabricatorApplicationDetailViewController
->setName(pht('Applications'))
->setHref($this->getApplicationURI()));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$status_tag = id(new PhabricatorTagView())
diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
index cb8d9cfdf8..d6f0782add 100644
--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -104,7 +104,7 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
- $add_comment_header = id(new PhabricatorHeaderView())
+ $add_comment_header = id(new PHUIHeaderView())
->setHeader(
$is_serious
? pht('Add Comment')
@@ -142,8 +142,16 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
}
private function buildHeaderView(PhabricatorPaste $paste) {
- return id(new PhabricatorHeaderView())
- ->setHeader($paste->getTitle());
+ $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
+ $this->getRequest()->getUser(),
+ $paste,
+ $icon = true);
+
+ $header = id(new PHUIHeaderView())
+ ->setHeader($paste->getTitle())
+ ->addProperty(PHUIHeaderView::PROPERTY_POLICY,
+ $descriptions[PhabricatorPolicyCapability::CAN_VIEW]);
+ return $header;
}
private function buildActionView(
@@ -217,10 +225,6 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
$user,
$paste);
- $properties->addProperty(
- pht('Visible To'),
- $descriptions[PhabricatorPolicyCapability::CAN_VIEW]);
-
return $properties;
}
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
index 3a946996cd..074343f582 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -32,7 +32,7 @@ final class PhabricatorPeopleProfileController
$picture = $user->loadProfileImageURI();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($user->getUserName().' ('.$user->getRealName().')')
->setSubheader($profile->getTitle())
->setImage($picture);
diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
index 6b2c4f0360..cde61e72d6 100644
--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -33,7 +33,7 @@ final class PhameBlogViewController extends PhameController {
$nav = $this->renderSideNavFilterView(null);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($blog->getName());
$handle_phids = array_merge(
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
index bf61f75d08..d303905445 100644
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -43,7 +43,7 @@ final class PhamePostViewController extends PhameController {
$nav->appendChild($crumbs);
$nav->appendChild(
- id(new PhabricatorHeaderView())
+ id(new PHUIHeaderView())
->setHeader($post->getTitle()));
if ($post->isDraft()) {
diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php
index 3d130f2b7e..8acc5a2f44 100644
--- a/src/applications/phlux/controller/PhluxViewController.php
+++ b/src/applications/phlux/controller/PhluxViewController.php
@@ -30,7 +30,7 @@ final class PhluxViewController extends PhluxController {
->setName($title)
->setHref($request->getRequestURI()));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$actions = id(new PhabricatorActionListView())
diff --git a/src/applications/pholio/controller/PholioImageHistoryController.php b/src/applications/pholio/controller/PholioImageHistoryController.php
index 7b6d17480f..1581385c6a 100644
--- a/src/applications/pholio/controller/PholioImageHistoryController.php
+++ b/src/applications/pholio/controller/PholioImageHistoryController.php
@@ -52,7 +52,7 @@ final class PholioImageHistoryController extends PholioController {
$latest_image->getName(),
$mock->getName());
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
require_celerity_resource('pholio-css');
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
index 409736854b..298aa84a45 100644
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -67,8 +67,15 @@ final class PholioMockViewController extends PholioController {
$title = $mock->getName();
- $header = id(new PhabricatorHeaderView())
- ->setHeader($title);
+ $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
+ $user,
+ $mock,
+ $icon = true);
+
+ $header = id(new PHUIHeaderView())
+ ->setHeader($title)
+ ->addProperty(PHUIHeaderView::PROPERTY_POLICY,
+ $descriptions[PhabricatorPolicyCapability::CAN_VIEW]);
$actions = $this->buildActionView($mock);
$properties = $this->buildPropertyView($mock, $engine);
@@ -208,14 +215,6 @@ final class PholioMockViewController extends PholioController {
pht('Created'),
phabricator_datetime($mock->getDateCreated(), $user));
- $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
- $user,
- $mock);
-
- $properties->addProperty(
- pht('Visible To'),
- $descriptions[PhabricatorPolicyCapability::CAN_VIEW]);
-
if ($this->getManiphestTaskPHIDs()) {
$properties->addProperty(
pht('Maniphest Tasks'),
@@ -241,7 +240,7 @@ final class PholioMockViewController extends PholioController {
? pht('Add Comment')
: pht('History Beckons');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$button_name = $is_serious
diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
index 93f4c4071e..e010a223d5 100644
--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
@@ -29,7 +29,7 @@ final class PhortuneAccountViewController extends PhortuneController {
->setName(pht('Account'))
->setHref($request->getRequestURI()));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$actions = id(new PhabricatorActionListView())
@@ -80,7 +80,7 @@ final class PhortuneAccountViewController extends PhortuneController {
$request = $this->getRequest();
$user = $request->getUser();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Payment Methods'));
$id = $account->getID();
@@ -141,7 +141,7 @@ final class PhortuneAccountViewController extends PhortuneController {
$request = $this->getRequest();
$user = $request->getUser();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Purchase History'));
return array(
@@ -154,7 +154,7 @@ final class PhortuneAccountViewController extends PhortuneController {
$request = $this->getRequest();
$user = $request->getUser();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Account History'));
$xactions = id(new PhortuneAccountTransactionQuery())
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php
index dc805378d2..28059f72f0 100644
--- a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php
+++ b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php
@@ -155,7 +155,7 @@ final class PhortunePaymentMethodEditController
$request = $this->getRequest();
$title = pht('Add Payment Method');
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$crumbs = $this->buildApplicationCrumbs();
diff --git a/src/applications/phortune/controller/PhortuneProductEditController.php b/src/applications/phortune/controller/PhortuneProductEditController.php
index 1717096d2c..0e93ce29e2 100644
--- a/src/applications/phortune/controller/PhortuneProductEditController.php
+++ b/src/applications/phortune/controller/PhortuneProductEditController.php
@@ -144,7 +144,7 @@ final class PhortuneProductEditController extends PhabricatorController {
->setName($is_create ? pht('Create') : pht('Edit'))
->setHref($request->getRequestURI()));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Edit Product'));
return $this->buildApplicationPage(
diff --git a/src/applications/phortune/controller/PhortuneProductListController.php b/src/applications/phortune/controller/PhortuneProductListController.php
index 31d9de4601..fab506ff34 100644
--- a/src/applications/phortune/controller/PhortuneProductListController.php
+++ b/src/applications/phortune/controller/PhortuneProductListController.php
@@ -27,7 +27,7 @@ final class PhortuneProductListController extends PhabricatorController {
->setHref($this->getApplicationURI('product/edit/'))
->setIcon('create'));
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Product List'));
$product_list = id(new PHUIObjectItemListView())
diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php
index 42d321591d..ec1b8a859e 100644
--- a/src/applications/phortune/controller/PhortuneProductViewController.php
+++ b/src/applications/phortune/controller/PhortuneProductViewController.php
@@ -23,7 +23,7 @@ final class PhortuneProductViewController extends PhortuneController {
$title = pht('Product: %s', $product->getProductName());
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($product->getProductName());
$account = $this->loadActiveAccount($user);
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index 6fed1c0950..e6888bca7e 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -115,7 +115,7 @@ final class PhrictionDiffController
$title = "Version $l vs $r";
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($title);
$crumbs->addCrumb(
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 591b7aa7c7..442b7ad0d7 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -159,7 +159,7 @@ final class PhrictionDocumentController
$crumbs->addCrumb($view);
}
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($page_title);
$page_content = id(new PHUIDocumentView())
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
index 859e73ee93..d260fbfb5d 100644
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -144,7 +144,7 @@ final class PhrictionHistoryController
->setHref(
PhrictionDocument::getSlugURI($document->getSlug(), 'history')));
- $header = new PhabricatorHeaderView();
+ $header = new PHUIHeaderView();
$header->setHeader(pht('Document History for %s',
phutil_tag(
'a',
diff --git a/src/applications/policy/filter/PhabricatorPolicy.php b/src/applications/policy/filter/PhabricatorPolicy.php
index 2c63c7ee5c..f35b3a7e14 100644
--- a/src/applications/policy/filter/PhabricatorPolicy.php
+++ b/src/applications/policy/filter/PhabricatorPolicy.php
@@ -6,6 +6,7 @@ final class PhabricatorPolicy {
private $name;
private $type;
private $href;
+ private $icon;
public static function newFromPolicyAndHandle(
$policy_identifier,
@@ -86,6 +87,29 @@ final class PhabricatorPolicy {
return $this->href;
}
+ public function getIcon() {
+ switch ($this->getType()) {
+ case PhabricatorPolicyType::TYPE_GLOBAL:
+ static $map = array(
+ PhabricatorPolicies::POLICY_PUBLIC => 'policy-public',
+ PhabricatorPolicies::POLICY_USER => 'policy-all',
+ PhabricatorPolicies::POLICY_ADMIN => 'policy-admin',
+ PhabricatorPolicies::POLICY_NOONE => 'policy-noone',
+ );
+ return idx($map, $this->getPHID(), 'policy-unknown');
+ break;
+ case PhabricatorPolicyType::TYPE_PROJECT:
+ return 'policy-project';
+ break;
+ case PhabricatorPolicyType::TYPE_MASKED:
+ return 'policy-custom';
+ break;
+ default:
+ return 'policy-unknown';
+ break;
+ }
+ }
+
public function getSortKey() {
return sprintf(
'%02d%s',
@@ -117,16 +141,27 @@ final class PhabricatorPolicy {
}
}
- public function renderDescription() {
+ public function renderDescription($icon=false) {
+ $img = null;
+ if ($icon) {
+ $img = id(new PHUIIconView())
+ ->setSpriteSheet(PHUIIconView::SPRITE_STATUS)
+ ->setSpriteIcon($this->getIcon());
+ }
+
if ($this->getHref()) {
$desc = phutil_tag(
'a',
array(
'href' => $this->getHref(),
+ 'class' => 'policy-link',
),
- $this->getName());
+ array(
+ $img,
+ $this->getName(),
+ ));
} else {
- $desc = $this->getName();
+ $desc = array($img, $this->getName());
}
switch ($this->getType()) {
@@ -140,6 +175,4 @@ final class PhabricatorPolicy {
return $desc;
}
}
-
-
}
diff --git a/src/applications/policy/query/PhabricatorPolicyQuery.php b/src/applications/policy/query/PhabricatorPolicyQuery.php
index 5143b4621c..93e139fe5b 100644
--- a/src/applications/policy/query/PhabricatorPolicyQuery.php
+++ b/src/applications/policy/query/PhabricatorPolicyQuery.php
@@ -17,7 +17,8 @@ final class PhabricatorPolicyQuery extends PhabricatorQuery {
public static function renderPolicyDescriptions(
PhabricatorUser $viewer,
- PhabricatorPolicyInterface $object) {
+ PhabricatorPolicyInterface $object,
+ $icon=false) {
$results = array();
$policies = null;
@@ -31,7 +32,7 @@ final class PhabricatorPolicyQuery extends PhabricatorQuery {
}
if (isset($global[$policy])) {
- $results[$capability] = $global[$policy]->renderDescription();
+ $results[$capability] = $global[$policy]->renderDescription($icon);
continue;
}
@@ -44,7 +45,7 @@ final class PhabricatorPolicyQuery extends PhabricatorQuery {
->execute();
}
- $results[$capability] = $policies[$policy]->renderDescription();
+ $results[$capability] = $policies[$policy]->renderDescription($icon);
}
return $results;
diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
index b2dfb00493..fb5179695a 100644
--- a/src/applications/ponder/controller/PonderQuestionViewController.php
+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
@@ -44,7 +44,7 @@ final class PonderQuestionViewController extends PonderController {
->setActionURI("/ponder/answer/add/");
}
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($question->getTitle());
$actions = $this->buildActionListView($question);
@@ -251,7 +251,7 @@ final class PonderQuestionViewController extends PonderController {
$out[] = phutil_tag('br');
$out[] = phutil_tag('br');
- $out[] = id(new PhabricatorHeaderView())
+ $out[] = id(new PHUIHeaderView())
->setHeader($this->getHandle($author_phid)->getFullName())
->setImage($this->getHandle($author_phid)->getImageURI());
diff --git a/src/applications/ponder/view/PonderAddAnswerView.php b/src/applications/ponder/view/PonderAddAnswerView.php
index 5980f414b6..454d9ed137 100644
--- a/src/applications/ponder/view/PonderAddAnswerView.php
+++ b/src/applications/ponder/view/PonderAddAnswerView.php
@@ -21,7 +21,7 @@ final class PonderAddAnswerView extends AphrontView {
$question = $this->question;
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader(pht('Add Answer'));
$form = new AphrontFormView();
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 517c51694f..48ae73d481 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -59,7 +59,7 @@ final class PhabricatorProjectProfileController
$tasks,
$content);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($project->getName())
->setSubheader(phutil_utf8_shorten($profile->getBlurb(), 1024))
->setImage($picture);
diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
index 6297138b9e..6315c090c9 100644
--- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php
+++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
@@ -98,7 +98,7 @@ final class ReleephBranchViewController extends ReleephProjectController
$id = $branch->getID();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($branch->getDisplayName());
if (!$branch->getIsActive()) {
diff --git a/src/applications/releeph/controller/project/ReleephProjectViewController.php b/src/applications/releeph/controller/project/ReleephProjectViewController.php
index 5c1e5bf5a9..1e96de29d7 100644
--- a/src/applications/releeph/controller/project/ReleephProjectViewController.php
+++ b/src/applications/releeph/controller/project/ReleephProjectViewController.php
@@ -155,7 +155,7 @@ final class ReleephProjectViewController extends ReleephProjectController
$id = $project->getID();
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($project->getName());
if (!$project->getIsActive()) {
diff --git a/src/applications/releeph/controller/request/ReleephRequestViewController.php b/src/applications/releeph/controller/request/ReleephRequestViewController.php
index e81a021ed4..4f4bccb12b 100644
--- a/src/applications/releeph/controller/request/ReleephRequestViewController.php
+++ b/src/applications/releeph/controller/request/ReleephRequestViewController.php
@@ -54,7 +54,7 @@ final class ReleephRequestViewController extends ReleephProjectController {
->setTransactions($xactions)
->setMarkupEngine($engine);
- $add_comment_header = id(new PhabricatorHeaderView())
+ $add_comment_header = id(new PHUIHeaderView())
->setHeader('Plea or yield');
$draft = PhabricatorDraft::newFromUserAndKey(
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php b/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
index 4f7513c335..3411ef5ec5 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
@@ -30,7 +30,7 @@ final class PhabricatorSettingsPanelExternalAccounts
->needImages(true)
->execute();
- $linked_head = id(new PhabricatorHeaderView())
+ $linked_head = id(new PHUIHeaderView())
->setHeader(pht('Linked Accounts and Authentication'));
$linked = id(new PHUIObjectItemListView())
@@ -92,7 +92,7 @@ final class PhabricatorSettingsPanelExternalAccounts
$linked->addItem($item);
}
- $linkable_head = id(new PhabricatorHeaderView())
+ $linkable_head = id(new PHUIHeaderView())
->setHeader(pht('Add External Account'));
$linkable = id(new PHUIObjectItemListView())
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
index e47a2e2c3d..d9fd4742d0 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
@@ -152,7 +152,7 @@ final class PhabricatorSettingsPanelSSHKeys
->addCancelButton($this->getPanelURI())
->setValue($save));
- $header_title = new PhabricatorHeaderView();
+ $header_title = new PHUIHeaderView();
$header_title->setHeader($header);
return id(new AphrontNullView())
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
index 27817151c7..e037c8fb71 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
@@ -41,10 +41,10 @@ final class PhabricatorSlowvotePollController
));
}
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($poll->getQuestion());
- $xaction_header = id(new PhabricatorHeaderView())
+ $xaction_header = id(new PHUIHeaderView())
->setHeader(pht('Ongoing Deliberations'));
$actions = $this->buildActionView($poll);
@@ -166,7 +166,7 @@ final class PhabricatorSlowvotePollController
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
- $add_comment_header = id(new PhabricatorHeaderView())
+ $add_comment_header = id(new PHUIHeaderView())
->setHeader(
$is_serious
? pht('Add Comment')
diff --git a/src/applications/uiexample/examples/PHUIBoxExample.php b/src/applications/uiexample/examples/PHUIBoxExample.php
index 13783ef957..c972e9e316 100644
--- a/src/applications/uiexample/examples/PHUIBoxExample.php
+++ b/src/applications/uiexample/examples/PHUIBoxExample.php
@@ -58,13 +58,13 @@ final class PHUIBoxExample extends PhabricatorUIExample {
->addPadding(PHUI::PADDING_LARGE)
->addMargin(PHUI::MARGIN_LARGE_BOTTOM));
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Plain Box'));
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('Plain Box with space'));
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader(pht('Shadow Box with space'));
$wrap1 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PHUIButtonExample.php b/src/applications/uiexample/examples/PHUIButtonExample.php
index ff9e7e2266..10872bcb20 100644
--- a/src/applications/uiexample/examples/PHUIButtonExample.php
+++ b/src/applications/uiexample/examples/PHUIButtonExample.php
@@ -151,16 +151,16 @@ final class PHUIButtonExample extends PhabricatorUIExample {
// Set it and forget it
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader('phutil_tag');
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader('PHUIButtonView');
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader('Icon Buttons');
- $head4 = id(new PhabricatorHeaderView())
+ $head4 = id(new PHUIHeaderView())
->setHeader('Big Icon Buttons');
$wrap1 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PHUIColorPalletteExample.php b/src/applications/uiexample/examples/PHUIColorPalletteExample.php
index 5e012354c3..a6ed3ed6c9 100644
--- a/src/applications/uiexample/examples/PHUIColorPalletteExample.php
+++ b/src/applications/uiexample/examples/PHUIColorPalletteExample.php
@@ -110,13 +110,13 @@ final class PHUIColorPalletteExample extends PhabricatorUIExample {
->setShadow(true)
->addPadding(PHUI::PADDING_LARGE);
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Greys'));
- $head1b = id(new PhabricatorHeaderView())
+ $head1b = id(new PHUIHeaderView())
->setHeader(pht('Blues'));
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('Colors'));
$wrap1 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PHUIDocumentExample.php b/src/applications/uiexample/examples/PHUIDocumentExample.php
index f44e5b94b1..70bffc8b58 100644
--- a/src/applications/uiexample/examples/PHUIDocumentExample.php
+++ b/src/applications/uiexample/examples/PHUIDocumentExample.php
@@ -51,7 +51,7 @@ final class PHUIDocumentExample extends PhabricatorUIExample {
$divider = id(new PHUIListItemView)
->setType(PHUIListItemView::TYPE_DIVIDER);
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader('Installation');
$label1 = id(new PHUIListItemView())
diff --git a/src/applications/uiexample/examples/PHUIFeedStoryExample.php b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
index c4f4213a81..2a220c3f24 100644
--- a/src/applications/uiexample/examples/PHUIFeedStoryExample.php
+++ b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
@@ -132,22 +132,22 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
->setUser($user);
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Basic Story'));
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('Title / Text Story'));
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader(pht('Token Story'));
- $head4 = id(new PhabricatorHeaderView())
+ $head4 = id(new PHUIHeaderView())
->setHeader(pht('Action Story'));
- $head5 = id(new PhabricatorHeaderView())
+ $head5 = id(new PHUIHeaderView())
->setHeader(pht('Status Story'));
- $head6 = id(new PhabricatorHeaderView())
+ $head6 = id(new PHUIHeaderView())
->setHeader(pht('One Line Story'));
$wrap1 =
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
index c0160a5594..f0cea628a8 100644
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -162,19 +162,19 @@ final class PHUIIconExample extends PhabricatorUIExample {
->addPadding(PHUI::PADDING_MEDIUM)
->setShadow(true));
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Action Icons!'));
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('People!'));
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader(pht('Tokens'));
- $head4 = id(new PhabricatorHeaderView())
+ $head4 = id(new PHUIHeaderView())
->setHeader(pht('Payments'));
- $head5 = id(new PhabricatorHeaderView())
+ $head5 = id(new PHUIHeaderView())
->setHeader(pht('Authentication'));
$wrap1 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PHUIListExample.php b/src/applications/uiexample/examples/PHUIListExample.php
index 811069af8e..004598a66d 100644
--- a/src/applications/uiexample/examples/PHUIListExample.php
+++ b/src/applications/uiexample/examples/PHUIListExample.php
@@ -187,16 +187,16 @@ final class PHUIListExample extends PhabricatorUIExample {
->addMargin(PHUI::MARGIN_MEDIUM)
->setShadow(true));
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Unstyled'));
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('Side Navigation'));
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader(pht('Top Navigation'));
- $head4 = id(new PhabricatorHeaderView())
+ $head4 = id(new PHUIHeaderView())
->setHeader(pht('Action Menu'));
$wrap1 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PHUIObjectItemListExample.php b/src/applications/uiexample/examples/PHUIObjectItemListExample.php
index 815fddb217..04003b6773 100644
--- a/src/applications/uiexample/examples/PHUIObjectItemListExample.php
+++ b/src/applications/uiexample/examples/PHUIObjectItemListExample.php
@@ -22,7 +22,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out = array();
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Basic List'));
$list = new PHUIObjectItemListView();
@@ -48,7 +48,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Empty List'));
$list = new PHUIObjectItemListView();
@@ -57,7 +57,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Stacked List'));
$list = new PHUIObjectItemListView();
$list->setStackable(true);
@@ -81,7 +81,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Plain List'));
$list = new PHUIObjectItemListView();
$list->setPlain(true);
@@ -110,7 +110,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Card List'));
$list = new PHUIObjectItemListView();
$list->setCards(true);
@@ -157,7 +157,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Grippable List'));
$list = new PHUIObjectItemListView();
$list->setCards(true);
@@ -189,7 +189,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('List With Actions'));
$list = new PHUIObjectItemListView();
@@ -223,7 +223,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Extras'));
$list = new PHUIObjectItemListView();
@@ -268,7 +268,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Effects'));
$list = new PHUIObjectItemListView();
@@ -303,7 +303,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
$out[] = array($head, $list);
- $head = id(new PhabricatorHeaderView())
+ $head = id(new PHUIHeaderView())
->setHeader(pht('Colors'));
$list = new PHUIObjectItemListView();
diff --git a/src/applications/uiexample/examples/PHUITextExample.php b/src/applications/uiexample/examples/PHUITextExample.php
index c6eb880898..47af6a6a47 100644
--- a/src/applications/uiexample/examples/PHUITextExample.php
+++ b/src/applications/uiexample/examples/PHUITextExample.php
@@ -73,7 +73,7 @@ final class PHUITextExample extends PhabricatorUIExample {
->setShadow(true)
->addPadding(PHUI::PADDING_MEDIUM);
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Basic Colors'));
$wrap1 = id(new PHUIBoxView())
@@ -85,7 +85,7 @@ final class PHUITextExample extends PhabricatorUIExample {
->setShadow(true)
->addPadding(PHUI::PADDING_MEDIUM);
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('Basic Transforms'));
$wrap2 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PHUIWorkboardExample.php b/src/applications/uiexample/examples/PHUIWorkboardExample.php
index c412fc67f3..342f51b679 100644
--- a/src/applications/uiexample/examples/PHUIWorkboardExample.php
+++ b/src/applications/uiexample/examples/PHUIWorkboardExample.php
@@ -161,13 +161,13 @@ final class PHUIWorkboardExample extends PhabricatorUIExample {
->addAction($person2)
->addAction($person3);
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('Fixed Panel'));
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('Fluid Panel'));
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader(pht('Action Panel'));
$wrap1 = id(new PHUIBoxView())
diff --git a/src/applications/uiexample/examples/PhabricatorActionHeaderExample.php b/src/applications/uiexample/examples/PhabricatorActionHeaderExample.php
index c6558fe1f8..560cf9d988 100644
--- a/src/applications/uiexample/examples/PhabricatorActionHeaderExample.php
+++ b/src/applications/uiexample/examples/PhabricatorActionHeaderExample.php
@@ -13,7 +13,7 @@ final class PhabricatorActionHeaderExample extends PhabricatorUIExample {
public function renderExample() {
/* Colors */
- $title1 = id(new PhabricatorHeaderView())
+ $title1 = id(new PHUIHeaderView())
->setHeader(pht('Header Plain'));
$header1 = id(new PhabricatorActionHeaderView())
@@ -54,7 +54,7 @@ final class PhabricatorActionHeaderExample extends PhabricatorUIExample {
->addMargin(PHUI::MARGIN_LARGE);
/* Policy Icons */
- $title2 = id(new PhabricatorHeaderView())
+ $title2 = id(new PHUIHeaderView())
->setHeader(pht('With Policy Icons'));
$header1 = id(new PhabricatorActionHeaderView())
@@ -102,7 +102,7 @@ final class PhabricatorActionHeaderExample extends PhabricatorUIExample {
/* Action Icons */
- $title3 = id(new PhabricatorHeaderView())
+ $title3 = id(new PHUIHeaderView())
->setHeader(pht('With Action Icons'));
$action1 = new PHUIIconView();
@@ -186,7 +186,7 @@ final class PhabricatorActionHeaderExample extends PhabricatorUIExample {
->addMargin(PHUI::MARGIN_LARGE);
/* Action Icons */
- $title4 = id(new PhabricatorHeaderView())
+ $title4 = id(new PHUIHeaderView())
->setHeader(pht('With Tags'));
$tag1 = id(new PhabricatorTagView())
diff --git a/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php b/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
index 6b3dc1a54b..bf43872f90 100644
--- a/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
+++ b/src/applications/uiexample/examples/PhabricatorMultiColumnExample.php
@@ -31,14 +31,14 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
),
'Army of Darkness');
- $head1 = id(new PhabricatorHeaderView())
+ $head1 = id(new PHUIHeaderView())
->setHeader(pht('2 Column Fixed'));
$layout1 = id(new AphrontMultiColumnView())
->addColumn($column1)
->addColumn($column2)
->setGutter(AphrontMultiColumnView::GUTTER_MEDIUM);
- $head2 = id(new PhabricatorHeaderView())
+ $head2 = id(new PHUIHeaderView())
->setHeader(pht('2 Column Fluid'));
$layout2 = id(new AphrontMultiColumnView())
->addColumn($column1)
@@ -46,7 +46,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
->setFluidLayout(true)
->setGutter(AphrontMultiColumnView::GUTTER_MEDIUM);
- $head3 = id(new PhabricatorHeaderView())
+ $head3 = id(new PHUIHeaderView())
->setHeader(pht('4 Column Fixed'));
$layout3 = id(new AphrontMultiColumnView())
->addColumn($column1)
@@ -55,7 +55,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
->addColumn($column2)
->setGutter(AphrontMultiColumnView::GUTTER_SMALL);
- $head4 = id(new PhabricatorHeaderView())
+ $head4 = id(new PHUIHeaderView())
->setHeader(pht('4 Column Fluid'));
$layout4 = id(new AphrontMultiColumnView())
->addColumn($column1)
@@ -86,7 +86,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
$saturday = hsprintf('Saturday
StarCraft II'.
'
All
Damn
Day');
- $head5 = id(new PhabricatorHeaderView())
+ $head5 = id(new PHUIHeaderView())
->setHeader(pht('7 Column Fluid'));
$layout5 = id(new AphrontMultiColumnView())
->addColumn($sunday)
@@ -153,7 +153,7 @@ final class PhabricatorMultiColumnExample extends PhabricatorUIExample {
$billing_title = pht('Billing Address');
$cc_title = pht('Payment Information');
- $head6 = id(new PhabricatorHeaderView())
+ $head6 = id(new PHUIHeaderView())
->setHeader(pht('Let\'s Go Shopping'));
$layout6 = id(new AphrontMultiColumnView())
->addColumn(hsprintf('%s
%s', $shipping_title, $shipping))
diff --git a/src/applications/uiexample/examples/PhabricatorPropertyListExample.php b/src/applications/uiexample/examples/PhabricatorPropertyListExample.php
index 58b751830d..6d1efc717c 100644
--- a/src/applications/uiexample/examples/PhabricatorPropertyListExample.php
+++ b/src/applications/uiexample/examples/PhabricatorPropertyListExample.php
@@ -54,7 +54,7 @@ final class PhabricatorPropertyListExample extends PhabricatorUIExample {
'haiku. it is very bad.
'.
'what did you expect?'));
- $edge_cases_header = id(new PhabricatorHeaderView())
+ $edge_cases_header = id(new PHUIHeaderView())
->setHeader(pht('Edge Cases'));
$edge_cases_view = new PhabricatorPropertyListView();
diff --git a/src/applications/uiexample/examples/PhabricatorTagExample.php b/src/applications/uiexample/examples/PhabricatorTagExample.php
index 07a305db65..a63762a7e6 100644
--- a/src/applications/uiexample/examples/PhabricatorTagExample.php
+++ b/src/applications/uiexample/examples/PhabricatorTagExample.php
@@ -84,7 +84,7 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
->addPadding(PHUI::PADDING_LARGE)
->addMargin(PHUI::MARGIN_LARGE);
- $header1 = id(new PhabricatorHeaderView())
+ $header1 = id(new PHUIHeaderView())
->setHeader('Colors');
$colors = PhabricatorTagView::getColors();
@@ -103,7 +103,7 @@ final class PhabricatorTagExample extends PhabricatorUIExample {
->addPadding(PHUI::PADDING_LARGE)
->addMargin(PHUI::MARGIN_LARGE);
- $header2 = id(new PhabricatorHeaderView())
+ $header2 = id(new PHUIHeaderView())
->setHeader('Holidays?');
diff --git a/src/applications/uiexample/examples/PhabricatorUIStatusExample.php b/src/applications/uiexample/examples/PhabricatorUIStatusExample.php
index f98bb7ec34..ac18adad84 100644
--- a/src/applications/uiexample/examples/PhabricatorUIStatusExample.php
+++ b/src/applications/uiexample/examples/PhabricatorUIStatusExample.php
@@ -42,7 +42,7 @@ final class PhabricatorUIStatusExample extends PhabricatorUIExample {
->setTarget(pht('Zucchini'))
->setNote(pht('Slimy and gross. Yuck!')));
- $out[] = id(new PhabricatorHeaderView())
+ $out[] = id(new PHUIHeaderView())
->setHeader(pht('Fruit and Vegetable Status'));
$out[] = id(new PHUIBoxView())
@@ -65,7 +65,7 @@ final class PhabricatorUIStatusExample extends PhabricatorUIExample {
->setTarget($name));
}
- $out[] = id(new PhabricatorHeaderView())
+ $out[] = id(new PHUIHeaderView())
->setHeader(pht('All Icons'));
$out[] = id(new PHUIBoxView())
diff --git a/src/view/form/PHUIPagedFormView.php b/src/view/form/PHUIPagedFormView.php
index f204041ee1..53d8c0308f 100644
--- a/src/view/form/PHUIPagedFormView.php
+++ b/src/view/form/PHUIPagedFormView.php
@@ -257,7 +257,7 @@ final class PHUIPagedFormView extends AphrontTagView {
$header = null;
if ($selected_page->getPageName()) {
- $header = id(new PhabricatorHeaderView())
+ $header = id(new PHUIHeaderView())
->setHeader($selected_page->getPageName());
}
diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
index ead1fb0d7e..8056951682 100644
--- a/src/view/phui/PHUIDocumentView.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -20,7 +20,7 @@ final class PHUIDocumentView extends AphrontTagView {
return $this;
}
- public function setHeader(PhabricatorHeaderView $header) {
+ public function setHeader(PHUIHeaderView $header) {
$header->setGradient(PhabricatorActionHeaderView::HEADER_LIGHTBLUE);
$this->header = $header;
return $this;
diff --git a/src/view/layout/PhabricatorHeaderView.php b/src/view/phui/PHUIHeaderView.php
similarity index 63%
rename from src/view/layout/PhabricatorHeaderView.php
rename to src/view/phui/PHUIHeaderView.php
index 2f12cd6941..7cd9da5712 100644
--- a/src/view/layout/PhabricatorHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -1,6 +1,9 @@
header = $header;
@@ -51,14 +55,19 @@ final class PhabricatorHeaderView extends AphrontView {
return $this;
}
+ public function addProperty($property, $value) {
+ $this->properties[$property] = $value;
+ return $this;
+ }
+
public function render() {
- require_celerity_resource('phabricator-header-view-css');
+ require_celerity_resource('phui-header-view-css');
$classes = array();
- $classes[] = 'phabricator-header-shell';
+ $classes[] = 'phui-header-shell';
if ($this->noBackground) {
- $classes[] = 'phabricator-header-no-backgound';
+ $classes[] = 'phui-header-no-backgound';
}
if ($this->bleedHeader) {
@@ -70,16 +79,20 @@ final class PhabricatorHeaderView extends AphrontView {
$classes[] = 'gradient-'.$this->gradient.'-header';
}
+ if ($this->properties || $this->subheader) {
+ $classes[] = 'phui-header-tall';
+ }
+
$image = null;
if ($this->image) {
$image = phutil_tag(
'span',
array(
- 'class' => 'phabricator-header-image',
+ 'class' => 'phui-header-image',
'style' => 'background-image: url('.$this->image.')',
),
'');
- $classes[] = 'phabricator-header-has-image';
+ $classes[] = 'phui-header-has-image';
}
$header = array();
@@ -102,7 +115,7 @@ final class PhabricatorHeaderView extends AphrontView {
$header[] = phutil_tag(
'span',
array(
- 'class' => 'phabricator-header-tags',
+ 'class' => 'phui-header-tags',
),
array_interleave(' ', $this->tags));
}
@@ -111,11 +124,35 @@ final class PhabricatorHeaderView extends AphrontView {
$header[] = phutil_tag(
'div',
array(
- 'class' => 'phabricator-header-subheader',
+ 'class' => 'phui-header-subheader',
),
$this->subheader);
}
+ if ($this->properties) {
+ $property_list = array();
+ foreach ($this->properties as $type => $property) {
+ switch ($type) {
+ case self::PROPERTY_STATE:
+ $property_list[] = $property;
+ break;
+ case self::PROPERTY_POLICY:
+ $property_list[] = $property;
+ break;
+ default:
+ throw new Exception('Incorrect Property Passed');
+ break;
+ }
+ }
+
+ $header[] = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-header-subheader',
+ ),
+ $property_list);
+ }
+
return phutil_tag(
'div',
array(
@@ -126,7 +163,7 @@ final class PhabricatorHeaderView extends AphrontView {
phutil_tag(
'h1',
array(
- 'class' => 'phabricator-header-view',
+ 'class' => 'phui-header-view',
),
$header),
));
diff --git a/webroot/rsrc/css/diviner/diviner-shared.css b/webroot/rsrc/css/diviner/diviner-shared.css
index b4d00f3dc6..a0708b33b3 100644
--- a/webroot/rsrc/css/diviner/diviner-shared.css
+++ b/webroot/rsrc/css/diviner/diviner-shared.css
@@ -69,10 +69,14 @@ a.diviner-atom-signature-name {
padding: 0 8px 16px 0;
}
-body .diviner-document-section .phabricator-header-view {
+body .diviner-document-section .phui-header-view {
width: 100%;
}
+.phabricator-property-list-view + .diviner-document-section {
+ margin-top: -1px;
+}
+
.diviner-message-not-documented {
color: {$lightgreytext};
font-style: italic;
@@ -112,7 +116,7 @@ body .diviner-document-section .phabricator-header-view {
* Fix excessive padding between method headers and method documentation for
* methods with no inherited context.
*/
-.diviner-document-section .phabricator-header-shell + .phabricator-remarkup {
+.diviner-document-section .phui-header-shell + .phabricator-remarkup {
padding-top: 0;
}
diff --git a/webroot/rsrc/css/layout/phabricator-action-list-view.css b/webroot/rsrc/css/layout/phabricator-action-list-view.css
index 446b4e2b26..349972a6db 100644
--- a/webroot/rsrc/css/layout/phabricator-action-list-view.css
+++ b/webroot/rsrc/css/layout/phabricator-action-list-view.css
@@ -17,16 +17,20 @@
font-size: 12px;
}
-.device-desktop .phabricator-header-shell + .phabricator-action-list-view {
+.device-desktop .phui-header-shell + .phabricator-action-list-view {
margin-top: -33px;
}
-.device-desktop .phabricator-header-shell.phabricator-header-has-image +
+.device-desktop .phui-header-shell.phui-header-tall + .phabricator-action-list-view {
+ margin-top: -55px;
+}
+
+.device-desktop .phui-header-shell.phui-header-has-image +
.phabricator-action-list-view {
margin-top: -53px;
}
-.device .phabricator-header-shell + .phabricator-action-list-view {
+.device .phui-header-shell + .phabricator-action-list-view {
margin-top: -1px;
}
diff --git a/webroot/rsrc/css/layout/phabricator-crumbs-view.css b/webroot/rsrc/css/layout/phabricator-crumbs-view.css
index 7b106ddb3f..14bb3c6a20 100644
--- a/webroot/rsrc/css/layout/phabricator-crumbs-view.css
+++ b/webroot/rsrc/css/layout/phabricator-crumbs-view.css
@@ -37,7 +37,7 @@
background: rgba(0,0,0,.1);
}
-.phabricator-crumbs-view + .phabricator-header-shell {
+.phabricator-crumbs-view + .phui-header-shell {
border-top: none;
}
diff --git a/webroot/rsrc/css/layout/phabricator-property-list-view.css b/webroot/rsrc/css/layout/phabricator-property-list-view.css
index ffda2fdc39..a3e500ecb7 100644
--- a/webroot/rsrc/css/layout/phabricator-property-list-view.css
+++ b/webroot/rsrc/css/layout/phabricator-property-list-view.css
@@ -98,12 +98,12 @@
/* In the common case where we immediately follow a header, move back up 30px
so we snuggle next to the header. */
-.device-desktop .phabricator-header-view
+.device-desktop .phui-header-view
+ .phabricator-action-list-view {
margin-top: -30px;
}
-.device-desktop .phabricator-header-view
+.device-desktop .phui-header-view
+ .phabricator-action-list-view
+ .phabricator-property-list-view {
margin-top: 0px;
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
index c04acc9c65..72519cccbc 100644
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -62,25 +62,25 @@
float: right;
}
-.phui-document-content .phabricator-header-shell {
+.phui-document-content .phui-header-shell {
border-top: none;
border-bottom: 1px solid {$lightblueborder};
}
.phui-document-content
- .phabricator-header-shell.phabricator-header-no-backgound {
+ .phui-header-shell.phui-header-no-backgound {
border-bottom: 1px solid {$thinblueborder};
margin: 0 0 16px 0;
}
.phui-document-content
- .phabricator-header-shell.phabricator-header-no-backgound
- .phabricator-header-view {
+ .phui-header-shell.phui-header-no-backgound
+ .phui-header-view {
padding: 8px 0 4px;
font-size: 14px;
}
-.phui-document-content .phabricator-header-view {
+.phui-document-content .phui-header-view {
padding: 16px;
color: {$bluetext};
text-shadow: 0 1px 2px #fff;
diff --git a/webroot/rsrc/css/layout/phabricator-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
similarity index 59%
rename from webroot/rsrc/css/layout/phabricator-header-view.css
rename to webroot/rsrc/css/phui/phui-header-view.css
index 71944e4cc3..e3522fba67 100644
--- a/webroot/rsrc/css/layout/phabricator-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -1,8 +1,8 @@
/**
- * @provides phabricator-header-view-css
+ * @provides phui-header-view-css
*/
-.phabricator-header-shell {
+.phui-header-shell {
background-color: #e0e3ec;
border-width: 1px 0;
border-style: solid;
@@ -10,12 +10,12 @@
overflow: hidden;
}
-body .phabricator-header-shell.phabricator-header-no-backgound {
+body .phui-header-shell.phui-header-no-backgound {
background-color: transparent;
border: none;
}
-body .phabricator-header-shell.phabricator-bleed-header {
+body .phui-header-shell.phui-bleed-header {
background-color: {$lightgreybackground};
border-top: 1px solid {$thinblueborder};
border-bottom: none;
@@ -23,13 +23,13 @@ body .phabricator-header-shell.phabricator-bleed-header {
margin-bottom: 16px;
}
-body .phabricator-header-shell.phabricator-bleed-header
- .phabricator-header-view {
+body .phui-header-shell.phui-bleed-header
+ .phui-header-view {
padding: 8px 24px 8px 16px;
color: {$bluetext};
}
-.phabricator-header-shell + .phabricator-form-view {
+.phui-header-shell + .phabricator-form-view {
border-top-width: 0;
}
@@ -37,30 +37,30 @@ body .phabricator-header-shell.phabricator-bleed-header
margin-top: -1px;
}
-.phabricator-header-view {
+.phui-header-view {
padding: 16px;
font-size: 15px;
color: {$darkbluetext};
}
-body.device-phone .phabricator-header-view {
+body.device-phone .phui-header-view {
padding: 12px 8px;
}
-.device-desktop .phabricator-header-view {
+.device-desktop .phui-header-view {
width: 66%;
}
-.phabricator-header-tags {
+.phui-header-tags {
margin-left: 12px;
font-size: 13px;
}
-.phabricator-header-tags .phabricator-tag-view {
+.phui-header-tags .phabricator-tag-view {
margin-left: 4px;
}
-.phabricator-header-image {
+.phui-header-image {
display: inline-block;
background-repeat: no-repeat;
border: 1px solid white;
@@ -70,9 +70,18 @@ body.device-phone .phabricator-header-view {
float: left;
}
-.phabricator-header-subheader {
+.phui-header-subheader {
color: {$lightbluetext};
font-weight: normal;
font-size: 13px;
margin-top: 4px;
}
+
+.phui-header-subheader .sprite-status {
+ display: inline-block;
+ margin: -2px 4px -2px 0;
+}
+
+.phui-header-subheader .policy-link {
+ color: {$darkbluetext};
+}
diff --git a/webroot/rsrc/css/phui/phui-icon.css b/webroot/rsrc/css/phui/phui-icon.css
index 1e7ef4fd75..8a7b18b59d 100644
--- a/webroot/rsrc/css/phui/phui-icon.css
+++ b/webroot/rsrc/css/phui/phui-icon.css
@@ -18,7 +18,8 @@
}
.phui-icon-view.sprite-apps,
-.phui-icon-view.sprite-icons {
+.phui-icon-view.sprite-icons,
+.phui-icon-view.sprite-status {
height: 14px;
width: 14px;
}
diff --git a/webroot/rsrc/css/sprite-status.css b/webroot/rsrc/css/sprite-status.css
index e5551dbd8c..d4135a1d95 100644
--- a/webroot/rsrc/css/sprite-status.css
+++ b/webroot/rsrc/css/sprite-status.css
@@ -13,7 +13,7 @@ only screen and (min-device-pixel-ratio: 1.5),
only screen and (-webkit-min-device-pixel-ratio: 1.5) {
.sprite-status {
background-image: url(/rsrc/image/sprite-status-X2.png);
- background-size: 120px 120px;
+ background-size: 135px 135px;
}
}
@@ -51,225 +51,261 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) {
}
.status-add-red {
- background-position: 0px -15px;
+ background-position: -120px 0px;
}
.status-add-white {
- background-position: -15px -15px;
+ background-position: 0px -15px;
}
.status-down-blue {
- background-position: -30px -15px;
+ background-position: -15px -15px;
}
.status-down-dark {
- background-position: -45px -15px;
+ background-position: -30px -15px;
}
.status-down-green {
- background-position: -60px -15px;
+ background-position: -45px -15px;
}
.status-down-red {
- background-position: -75px -15px;
+ background-position: -60px -15px;
}
.status-down-white {
- background-position: -90px -15px;
+ background-position: -75px -15px;
}
.status-info-blue {
- background-position: -105px -15px;
+ background-position: -90px -15px;
}
.status-info-dark {
- background-position: 0px -30px;
+ background-position: -105px -15px;
}
.status-info-green {
- background-position: -15px -30px;
+ background-position: 0px -30px;
}
.status-info-red {
- background-position: -30px -30px;
+ background-position: -15px -30px;
}
.status-info-white {
- background-position: -45px -30px;
+ background-position: -30px -30px;
}
.status-left-blue {
- background-position: -60px -30px;
+ background-position: -45px -30px;
}
.status-left-dark {
- background-position: -75px -30px;
+ background-position: -60px -30px;
}
.status-left-green {
- background-position: -90px -30px;
+ background-position: -75px -30px;
}
.status-left-red {
- background-position: -105px -30px;
+ background-position: -90px -30px;
}
.status-left-white {
- background-position: 0px -45px;
+ background-position: -105px -30px;
}
.status-minus-blue {
- background-position: -15px -45px;
+ background-position: 0px -45px;
}
.status-minus-dark {
- background-position: -30px -45px;
+ background-position: -15px -45px;
}
.status-minus-green {
- background-position: -45px -45px;
+ background-position: -30px -45px;
}
.status-minus-red {
- background-position: -60px -45px;
+ background-position: -45px -45px;
}
.status-minus-white {
+ background-position: -60px -45px;
+}
+
+.status-oh-closed {
background-position: -75px -45px;
}
-.status-open-blue {
+.status-oh-open {
background-position: -90px -45px;
}
-.status-open-dark {
+.status-open-blue {
background-position: -105px -45px;
}
-.status-open-green {
+.status-open-dark {
background-position: 0px -60px;
}
-.status-open-red {
+.status-open-green {
background-position: -15px -60px;
}
-.status-open-white {
+.status-open-red {
background-position: -30px -60px;
}
-.status-question-blue {
+.status-open-white {
background-position: -45px -60px;
}
-.status-question-dark {
+.status-policy-admin {
background-position: -60px -60px;
}
-.status-question-green {
+.status-policy-all {
background-position: -75px -60px;
}
-.status-question-red {
+.status-policy-custom {
background-position: -90px -60px;
}
-.status-question-white {
+.status-policy-noone {
background-position: -105px -60px;
}
-.status-reject-blue {
+.status-policy-project {
background-position: 0px -75px;
}
-.status-reject-dark {
+.status-policy-public {
background-position: -15px -75px;
}
-.status-reject-green {
+.status-policy-unknown {
background-position: -30px -75px;
}
-.status-reject-red {
+.status-question-blue {
background-position: -45px -75px;
}
-.status-reject-white {
+.status-question-dark {
background-position: -60px -75px;
}
-.status-right-blue {
+.status-question-green {
background-position: -75px -75px;
}
-.status-right-dark {
+.status-question-red {
background-position: -90px -75px;
}
-.status-right-green {
+.status-question-white {
background-position: -105px -75px;
}
-.status-right-red {
+.status-reject-blue {
background-position: 0px -90px;
}
-.status-right-white {
+.status-reject-dark {
background-position: -15px -90px;
}
-.status-time-green {
+.status-reject-green {
background-position: -30px -90px;
}
-.status-time-orange {
+.status-reject-red {
background-position: -45px -90px;
}
-.status-time-red {
+.status-reject-white {
background-position: -60px -90px;
}
-.status-time-yellow {
+.status-right-blue {
background-position: -75px -90px;
}
-.status-up-blue {
+.status-right-dark {
background-position: -90px -90px;
}
-.status-up-dark {
+.status-right-green {
background-position: -105px -90px;
}
-.status-up-green {
+.status-right-red {
background-position: 0px -105px;
}
-.status-up-red {
+.status-right-white {
background-position: -15px -105px;
}
-.status-up-white {
+.status-time-green {
background-position: -30px -105px;
}
-.status-warning-blue {
+.status-time-orange {
background-position: -45px -105px;
}
-.status-warning-dark {
+.status-time-red {
background-position: -60px -105px;
}
-.status-warning-green {
+.status-time-yellow {
background-position: -75px -105px;
}
-.status-warning-red {
+.status-up-blue {
background-position: -90px -105px;
}
-.status-warning-white {
+.status-up-dark {
background-position: -105px -105px;
}
+
+.status-up-green {
+ background-position: 0px -120px;
+}
+
+.status-up-red {
+ background-position: -15px -120px;
+}
+
+.status-up-white {
+ background-position: -30px -120px;
+}
+
+.status-warning-blue {
+ background-position: -45px -120px;
+}
+
+.status-warning-dark {
+ background-position: -60px -120px;
+}
+
+.status-warning-green {
+ background-position: -75px -120px;
+}
+
+.status-warning-red {
+ background-position: -90px -120px;
+}
+
+.status-warning-white {
+ background-position: -105px -120px;
+}
diff --git a/webroot/rsrc/image/sprite-status-X2.png b/webroot/rsrc/image/sprite-status-X2.png
index 937fff3c2b..304bf3bade 100644
Binary files a/webroot/rsrc/image/sprite-status-X2.png and b/webroot/rsrc/image/sprite-status-X2.png differ
diff --git a/webroot/rsrc/image/sprite-status.png b/webroot/rsrc/image/sprite-status.png
index d31644bb62..d19988306e 100644
Binary files a/webroot/rsrc/image/sprite-status.png and b/webroot/rsrc/image/sprite-status.png differ