revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 23:02:42 +01:00
Code Issues Releases Wiki Activity

PHUIList, PHUIDocument updates

Browse source 
Summary:
This diff covers a bit of ground.

- PHUIDocumentExample has been added
- PHUIDocument has been extended with new features
- PhabricatorMenuView is now PHUIListView
- PhabricatorMenuItemView is now PHUIItemListView

Overall - I think I've gotten all the edges covered here. There is some derpi-ness that we can talk about, comments in the code. Responsive design is missing from the new features on PHUIDocument, will follow up later.

Test Plan: Tested mobile and desktop menus, old phriction layout, new document views, new lists, and object lists.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D6130
This commit is contained in:
Chad Little 2013-06-05 08:41:43 -07:00
parent d78386584f
commit f1bf27959f
67 changed files with 774 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/sprite/manifest/gradient.json
View file

@ -18,7 +18,7 @@
}, },
"gradient-dark-menu-label" : { "gradient-dark-menu-label" : {
"name" : "gradient-dark-menu-label", "name" : "gradient-dark-menu-label",
"rule" : ".gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label", "rule" : ".gradient-dark-menu-label, .phabricator-dark-menu .phui-list-item-type-label",
"hash" : "8a11efa454f788aa2419ed8c745dece2" "hash" : "8a11efa454f788aa2419ed8c745dece2"
}, },
"gradient-green-header" : { "gradient-green-header" : {
@ -33,7 +33,7 @@
}, },
"gradient-menu-label" : { "gradient-menu-label" : {
"name" : "gradient-menu-label", "name" : "gradient-menu-label",
"rule" : ".gradient-menu-label, .phabricator-side-menu .phabricator-menu-item-type-label", "rule" : ".gradient-menu-label, .phabricator-side-menu .phui-list-item-type-label",
"hash" : "e2aa8e74c3b2c0b18de34d336d318b5c" "hash" : "e2aa8e74c3b2c0b18de34d336d318b5c"
}, },
"gradient-red-header" : { "gradient-red-header" : {
@ -50,6 +50,6 @@
"scales" : [ "scales" : [
1 1
], ],
"header" : "\/**\n * @provides sprite-gradient-css\n * @generated\n *\/\n\n.sprite-gradient, .phabricator-dark-menu .phabricator-menu-item-type-label, .phabricator-side-menu .phabricator-menu-item-type-label {\n background-image: url(\/rsrc\/image\/sprite-gradient.png);\n background-repeat: repeat-x;\n}\n\n\n", "header" : "\/**\n * @provides sprite-gradient-css\n * @generated\n *\/\n\n.sprite-gradient, .phabricator-dark-menu .phui-list-item-type-label, .phabricator-side-menu .phui-list-item-type-label {\n background-image: url(\/rsrc\/image\/sprite-gradient.png);\n background-repeat: repeat-x;\n}\n\n\n",
"type" : "repeat-x" "type" : "repeat-x"
} }

111
src/__celerity_resource_map__.php
View file

@ -3145,7 +3145,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-main-menu-view' => 'phabricator-main-menu-view' =>
array( array(
'uri' => '/res/50479234/rsrc/css/application/base/main-menu-view.css', 'uri' => '/res/0c386cc5/rsrc/css/application/base/main-menu-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3206,7 +3206,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-object-item-list-view-css' => 'phabricator-object-item-list-view-css' =>
array( array(
'uri' => '/res/b8b2fe24/rsrc/css/layout/phabricator-object-item-list-view.css', 'uri' => '/res/b114bc9a/rsrc/css/layout/phabricator-object-item-list-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3347,7 +3347,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-side-menu-view-css' => 'phabricator-side-menu-view-css' =>
array( array(
'uri' => '/res/2a1ac469/rsrc/css/layout/phabricator-side-menu-view.css', 'uri' => '/res/f43a8365/rsrc/css/layout/phabricator-side-menu-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3574,7 +3574,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-workpanel-view-css' => 'phabricator-workpanel-view-css' =>
array( array(
'uri' => '/res/ff5d5b26/rsrc/css/layout/phabricator-workpanel-view.css', 'uri' => '/res/d0cdb62e/rsrc/css/layout/phabricator-workpanel-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3669,7 +3669,7 @@ celerity_register_resource_map(array(
), ),
'phui-document-view-css' => 'phui-document-view-css' =>
array( array(
'uri' => '/res/ca376da1/rsrc/css/phui/phui-document.css', 'uri' => '/res/1b54e1c1/rsrc/css/phui/phui-document.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3703,6 +3703,15 @@ celerity_register_resource_map(array(
), ),
'disk' => '/rsrc/css/phui/phui-icon.css', 'disk' => '/rsrc/css/phui/phui-icon.css',
), ),
'phui-list-view-css' =>
array(
'uri' => '/res/c27c269d/rsrc/css/phui/phui-list.css',
'type' => 'css',
'requires' =>
array(
),
'disk' => '/rsrc/css/phui/phui-list.css',
),
'phui-text-css' => 'phui-text-css' =>
array( array(
'uri' => '/res/ca884ca6/rsrc/css/phui/phui-text.css', 'uri' => '/res/ca884ca6/rsrc/css/phui/phui-text.css',
@ -3867,7 +3876,7 @@ celerity_register_resource_map(array(
), ),
'spacing-css' => 'spacing-css' =>
array( array(
'uri' => '/res/59e4c9b1/rsrc/css/core/spacing.css', 'uri' => '/res/61563661/rsrc/css/core/spacing.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3930,7 +3939,7 @@ celerity_register_resource_map(array(
), ),
'sprite-gradient-css' => 'sprite-gradient-css' =>
array( array(
'uri' => '/res/ca88b981/rsrc/css/sprite-gradient.css', 'uri' => '/res/af8d50a1/rsrc/css/sprite-gradient.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -4003,7 +4012,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'8e459ff2' => '2626aa1d' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -4051,7 +4060,7 @@ celerity_register_resource_map(array(
40 => 'phabricator-property-list-view-css', 40 => 'phabricator-property-list-view-css',
41 => 'phabricator-tag-view-css', 41 => 'phabricator-tag-view-css',
), ),
'uri' => '/res/pkg/8e459ff2/core.pkg.css', 'uri' => '/res/pkg/2626aa1d/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'98f60e3f' => '98f60e3f' =>
@ -4245,16 +4254,16 @@ celerity_register_resource_map(array(
'reverse' => 'reverse' =>
array( array(
'aphront-attached-file-view-css' => '03ab92cf', 'aphront-attached-file-view-css' => '03ab92cf',
'aphront-dialog-view-css' => '8e459ff2', 'aphront-dialog-view-css' => '2626aa1d',
'aphront-error-view-css' => '8e459ff2', 'aphront-error-view-css' => '2626aa1d',
'aphront-form-view-css' => '8e459ff2', 'aphront-form-view-css' => '2626aa1d',
'aphront-list-filter-view-css' => '8e459ff2', 'aphront-list-filter-view-css' => '2626aa1d',
'aphront-pager-view-css' => '8e459ff2', 'aphront-pager-view-css' => '2626aa1d',
'aphront-panel-view-css' => '8e459ff2', 'aphront-panel-view-css' => '2626aa1d',
'aphront-table-view-css' => '8e459ff2', 'aphront-table-view-css' => '2626aa1d',
'aphront-tokenizer-control-css' => '8e459ff2', 'aphront-tokenizer-control-css' => '2626aa1d',
'aphront-tooltip-css' => '8e459ff2', 'aphront-tooltip-css' => '2626aa1d',
'aphront-typeahead-control-css' => '8e459ff2', 'aphront-typeahead-control-css' => '2626aa1d',
'differential-changeset-view-css' => 'dd27a69b', 'differential-changeset-view-css' => 'dd27a69b',
'differential-core-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b',
'differential-inline-comment-editor' => '9488bb69', 'differential-inline-comment-editor' => '9488bb69',
@ -4268,7 +4277,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => 'dd27a69b', 'differential-table-of-contents-css' => 'dd27a69b',
'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => '8e459ff2', 'global-drag-and-drop-css' => '2626aa1d',
'inline-comment-summary-css' => 'dd27a69b', 'inline-comment-summary-css' => 'dd27a69b',
'javelin-aphlict' => '98f60e3f', 'javelin-aphlict' => '98f60e3f',
'javelin-behavior' => 'a9f14d76', 'javelin-behavior' => 'a9f14d76',
@ -4342,55 +4351,55 @@ celerity_register_resource_map(array(
'javelin-util' => 'a9f14d76', 'javelin-util' => 'a9f14d76',
'javelin-vector' => 'a9f14d76', 'javelin-vector' => 'a9f14d76',
'javelin-workflow' => 'a9f14d76', 'javelin-workflow' => 'a9f14d76',
'lightbox-attachment-css' => '8e459ff2', 'lightbox-attachment-css' => '2626aa1d',
'maniphest-task-summary-css' => '03ab92cf', 'maniphest-task-summary-css' => '03ab92cf',
'maniphest-transaction-detail-css' => '03ab92cf', 'maniphest-transaction-detail-css' => '03ab92cf',
'phabricator-action-list-view-css' => '8e459ff2', 'phabricator-action-list-view-css' => '2626aa1d',
'phabricator-application-launch-view-css' => '8e459ff2', 'phabricator-application-launch-view-css' => '2626aa1d',
'phabricator-busy' => '98f60e3f', 'phabricator-busy' => '98f60e3f',
'phabricator-content-source-view-css' => 'dd27a69b', 'phabricator-content-source-view-css' => 'dd27a69b',
'phabricator-core-buttons-css' => '8e459ff2', 'phabricator-core-buttons-css' => '2626aa1d',
'phabricator-core-css' => '8e459ff2', 'phabricator-core-css' => '2626aa1d',
'phabricator-crumbs-view-css' => '8e459ff2', 'phabricator-crumbs-view-css' => '2626aa1d',
'phabricator-drag-and-drop-file-upload' => '9488bb69', 'phabricator-drag-and-drop-file-upload' => '9488bb69',
'phabricator-dropdown-menu' => '98f60e3f', 'phabricator-dropdown-menu' => '98f60e3f',
'phabricator-file-upload' => '98f60e3f', 'phabricator-file-upload' => '98f60e3f',
'phabricator-filetree-view-css' => '8e459ff2', 'phabricator-filetree-view-css' => '2626aa1d',
'phabricator-flag-css' => '8e459ff2', 'phabricator-flag-css' => '2626aa1d',
'phabricator-form-view-css' => '8e459ff2', 'phabricator-form-view-css' => '2626aa1d',
'phabricator-header-view-css' => '8e459ff2', 'phabricator-header-view-css' => '2626aa1d',
'phabricator-hovercard' => '98f60e3f', 'phabricator-hovercard' => '98f60e3f',
'phabricator-jump-nav' => '8e459ff2', 'phabricator-jump-nav' => '2626aa1d',
'phabricator-keyboard-shortcut' => '98f60e3f', 'phabricator-keyboard-shortcut' => '98f60e3f',
'phabricator-keyboard-shortcut-manager' => '98f60e3f', 'phabricator-keyboard-shortcut-manager' => '98f60e3f',
'phabricator-main-menu-view' => '8e459ff2', 'phabricator-main-menu-view' => '2626aa1d',
'phabricator-menu-item' => '98f60e3f', 'phabricator-menu-item' => '98f60e3f',
'phabricator-nav-view-css' => '8e459ff2', 'phabricator-nav-view-css' => '2626aa1d',
'phabricator-notification' => '98f60e3f', 'phabricator-notification' => '98f60e3f',
'phabricator-notification-css' => '8e459ff2', 'phabricator-notification-css' => '2626aa1d',
'phabricator-notification-menu-css' => '8e459ff2', 'phabricator-notification-menu-css' => '2626aa1d',
'phabricator-object-item-list-view-css' => '8e459ff2', 'phabricator-object-item-list-view-css' => '2626aa1d',
'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-object-selector-css' => 'dd27a69b',
'phabricator-phtize' => '98f60e3f', 'phabricator-phtize' => '98f60e3f',
'phabricator-prefab' => '98f60e3f', 'phabricator-prefab' => '98f60e3f',
'phabricator-project-tag-css' => '03ab92cf', 'phabricator-project-tag-css' => '03ab92cf',
'phabricator-property-list-view-css' => '8e459ff2', 'phabricator-property-list-view-css' => '2626aa1d',
'phabricator-remarkup-css' => '8e459ff2', 'phabricator-remarkup-css' => '2626aa1d',
'phabricator-shaped-request' => '9488bb69', 'phabricator-shaped-request' => '9488bb69',
'phabricator-side-menu-view-css' => '8e459ff2', 'phabricator-side-menu-view-css' => '2626aa1d',
'phabricator-standard-page-view' => '8e459ff2', 'phabricator-standard-page-view' => '2626aa1d',
'phabricator-tag-view-css' => '8e459ff2', 'phabricator-tag-view-css' => '2626aa1d',
'phabricator-textareautils' => '98f60e3f', 'phabricator-textareautils' => '98f60e3f',
'phabricator-tooltip' => '98f60e3f', 'phabricator-tooltip' => '98f60e3f',
'phabricator-transaction-view-css' => '8e459ff2', 'phabricator-transaction-view-css' => '2626aa1d',
'phabricator-zindex-css' => '8e459ff2', 'phabricator-zindex-css' => '2626aa1d',
'phui-form-css' => '8e459ff2', 'phui-form-css' => '2626aa1d',
'phui-icon-view-css' => '8e459ff2', 'phui-icon-view-css' => '2626aa1d',
'spacing-css' => '8e459ff2', 'spacing-css' => '2626aa1d',
'sprite-apps-large-css' => '8e459ff2', 'sprite-apps-large-css' => '2626aa1d',
'sprite-gradient-css' => '8e459ff2', 'sprite-gradient-css' => '2626aa1d',
'sprite-icons-css' => '8e459ff2', 'sprite-icons-css' => '2626aa1d',
'sprite-menu-css' => '8e459ff2', 'sprite-menu-css' => '2626aa1d',
'syntax-highlighting-css' => '8e459ff2', 'syntax-highlighting-css' => '2626aa1d',
), ),
)); ));

14
src/__phutil_library_map__.php
View file

@ -686,6 +686,7 @@ phutil_register_library_map(array(
'PHUI' => 'view/phui/PHUI.php', 'PHUI' => 'view/phui/PHUI.php',
'PHUIBoxExample' => 'applications/uiexample/examples/PHUIBoxExample.php', 'PHUIBoxExample' => 'applications/uiexample/examples/PHUIBoxExample.php',
'PHUIBoxView' => 'view/phui/PHUIBoxView.php', 'PHUIBoxView' => 'view/phui/PHUIBoxView.php',
'PHUIDocumentExample' => 'applications/uiexample/examples/PHUIDocumentExample.php',
'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php', 'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php',
'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php', 'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php',
'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php',
@ -695,6 +696,9 @@ phutil_register_library_map(array(
'PHUIFormPageView' => 'view/form/PHUIFormPageView.php', 'PHUIFormPageView' => 'view/form/PHUIFormPageView.php',
'PHUIIconExample' => 'applications/uiexample/examples/PHUIIconExample.php', 'PHUIIconExample' => 'applications/uiexample/examples/PHUIIconExample.php',
'PHUIIconView' => 'view/phui/PHUIIconView.php', 'PHUIIconView' => 'view/phui/PHUIIconView.php',
'PHUIListItemView' => 'view/phui/PHUIListItemView.php',
'PHUIListView' => 'view/phui/PHUIListView.php',
'PHUIListViewTestCase' => 'view/layout/__tests__/PHUIListViewTestCase.php',
'PHUIPagedFormView' => 'view/form/PHUIPagedFormView.php', 'PHUIPagedFormView' => 'view/form/PHUIPagedFormView.php',
'PHUITextExample' => 'applications/uiexample/examples/PHUITextExample.php', 'PHUITextExample' => 'applications/uiexample/examples/PHUITextExample.php',
'PHUITextView' => 'view/phui/PHUITextView.php', 'PHUITextView' => 'view/phui/PHUITextView.php',
@ -1138,9 +1142,6 @@ phutil_register_library_map(array(
'PhabricatorMarkupEngine' => 'infrastructure/markup/PhabricatorMarkupEngine.php', 'PhabricatorMarkupEngine' => 'infrastructure/markup/PhabricatorMarkupEngine.php',
'PhabricatorMarkupInterface' => 'infrastructure/markup/PhabricatorMarkupInterface.php', 'PhabricatorMarkupInterface' => 'infrastructure/markup/PhabricatorMarkupInterface.php',
'PhabricatorMarkupOneOff' => 'infrastructure/markup/PhabricatorMarkupOneOff.php', 'PhabricatorMarkupOneOff' => 'infrastructure/markup/PhabricatorMarkupOneOff.php',
'PhabricatorMenuItemView' => 'view/layout/PhabricatorMenuItemView.php',
'PhabricatorMenuView' => 'view/layout/PhabricatorMenuView.php',
'PhabricatorMenuViewTestCase' => 'view/layout/__tests__/PhabricatorMenuViewTestCase.php',
'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php', 'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php',
'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php', 'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php',
'PhabricatorMetaMTAConfigOptions' => 'applications/config/option/PhabricatorMetaMTAConfigOptions.php', 'PhabricatorMetaMTAConfigOptions' => 'applications/config/option/PhabricatorMetaMTAConfigOptions.php',
@ -2505,6 +2506,7 @@ phutil_register_library_map(array(
'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler', 'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
'PHUIBoxExample' => 'PhabricatorUIExample', 'PHUIBoxExample' => 'PhabricatorUIExample',
'PHUIBoxView' => 'AphrontTagView', 'PHUIBoxView' => 'AphrontTagView',
'PHUIDocumentExample' => 'PhabricatorUIExample',
'PHUIDocumentView' => 'AphrontTagView', 'PHUIDocumentView' => 'AphrontTagView',
'PHUIFeedStoryExample' => 'PhabricatorUIExample', 'PHUIFeedStoryExample' => 'PhabricatorUIExample',
'PHUIFeedStoryView' => 'AphrontView', 'PHUIFeedStoryView' => 'AphrontView',
@ -2514,6 +2516,9 @@ phutil_register_library_map(array(
'PHUIFormPageView' => 'AphrontView', 'PHUIFormPageView' => 'AphrontView',
'PHUIIconExample' => 'PhabricatorUIExample', 'PHUIIconExample' => 'PhabricatorUIExample',
'PHUIIconView' => 'AphrontTagView', 'PHUIIconView' => 'AphrontTagView',
'PHUIListItemView' => 'AphrontTagView',
'PHUIListView' => 'AphrontTagView',
'PHUIListViewTestCase' => 'PhabricatorTestCase',
'PHUIPagedFormView' => 'AphrontTagView', 'PHUIPagedFormView' => 'AphrontTagView',
'PHUITextExample' => 'PhabricatorUIExample', 'PHUITextExample' => 'PhabricatorUIExample',
'PHUITextView' => 'AphrontTagView', 'PHUITextView' => 'AphrontTagView',
@ -2960,9 +2965,6 @@ phutil_register_library_map(array(
'PhabricatorManiphestTaskTestDataGenerator' => 'PhabricatorTestDataGenerator', 'PhabricatorManiphestTaskTestDataGenerator' => 'PhabricatorTestDataGenerator',
'PhabricatorMarkupCache' => 'PhabricatorCacheDAO', 'PhabricatorMarkupCache' => 'PhabricatorCacheDAO',
'PhabricatorMarkupOneOff' => 'PhabricatorMarkupInterface', 'PhabricatorMarkupOneOff' => 'PhabricatorMarkupInterface',
'PhabricatorMenuItemView' => 'AphrontTagView',
'PhabricatorMenuView' => 'AphrontTagView',
'PhabricatorMenuViewTestCase' => 'PhabricatorTestCase',
'PhabricatorMetaMTAConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorMetaMTAConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorMetaMTAController' => 'PhabricatorController', 'PhabricatorMetaMTAController' => 'PhabricatorController',
'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO', 'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',

2
src/applications/audit/events/AuditPeopleMenuEventListener.php
View file

@ -24,7 +24,7 @@ final class AuditPeopleMenuEventListener extends PhutilEventListener {
$name = pht('Commits'); $name = pht('Commits');
$menu->addMenuItemToLabel('activity', $menu->addMenuItemToLabel('activity',
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIsExternal(true) ->setIsExternal(true)
->setName($name) ->setName($name)
->setHref($href) ->setHref($href)

2
src/applications/auth/application/PhabricatorApplicationAuth.php
View file

@ -17,7 +17,7 @@ final class PhabricatorApplicationAuth extends PhabricatorApplication {
$items = array(); $items = array();
if ($user->isLoggedIn()) { if ($user->isLoggedIn()) {
$item = new PhabricatorMenuItemView(); $item = new PHUIListItemView();
$item->setName(pht('Log Out')); $item->setName(pht('Log Out'));
$item->setIcon('power'); $item->setIcon('power');
$item->setWorkflow(true); $item->setWorkflow(true);

14
src/applications/conpherence/controller/ConpherenceController.php
View file

@ -7,24 +7,24 @@ abstract class ConpherenceController extends PhabricatorController {
private $conpherences; private $conpherences;
public function buildApplicationMenu() { public function buildApplicationMenu() {
$nav = new PhabricatorMenuView(); $nav = new PHUIListView();
$nav->newLink( $nav->newLink(
pht('New Message'), pht('New Message'),
$this->getApplicationURI('new/')); $this->getApplicationURI('new/'));
$nav->addMenuItem( $nav->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Add Participants')) ->setName(pht('Add Participants'))
->setType(PhabricatorMenuItemView::TYPE_LINK) ->setType(PHUIListItemView::TYPE_LINK)
->setHref('#') ->setHref('#')
->addSigil('conpherence-widget-adder') ->addSigil('conpherence-widget-adder')
->setMetadata(array('widget' => 'widgets-people'))); ->setMetadata(array('widget' => 'widgets-people')));
$nav->addMenuItem( $nav->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('New Calendar Item')) ->setName(pht('New Calendar Item'))
->setType(PhabricatorMenuItemView::TYPE_LINK) ->setType(PHUIListItemView::TYPE_LINK)
->setHref('/calendar/status/create/') ->setHref('/calendar/status/create/')
->addSigil('conpherence-widget-adder') ->addSigil('conpherence-widget-adder')
->setMetadata(array('widget' => 'widgets-calendar'))); ->setMetadata(array('widget' => 'widgets-calendar')));
@ -37,13 +37,13 @@ abstract class ConpherenceController extends PhabricatorController {
$crumbs $crumbs
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('New Message')) ->setName(pht('New Message'))
->setHref($this->getApplicationURI('new/')) ->setHref($this->getApplicationURI('new/'))
->setIcon('create') ->setIcon('create')
->setWorkflow(true)) ->setWorkflow(true))
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Thread')) ->setName(pht('Thread'))
->setHref('#') ->setHref('#')
->setIcon('action-menu') ->setIcon('action-menu')

2
src/applications/conpherence/events/ConpherencePeopleMenuEventListener.php
View file

@ -24,7 +24,7 @@ final class ConpherencePeopleMenuEventListener extends PhutilEventListener {
$name = pht('Message'); $name = pht('Message');
$menu->addMenuItemBefore('activity', $menu->addMenuItemBefore('activity',
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIsExternal(true) ->setIsExternal(true)
->setName($name) ->setName($name)
->setHref($conpherence_uri) ->setHref($conpherence_uri)

16
src/applications/conpherence/view/ConpherenceThreadListView.php
View file

@ -33,7 +33,7 @@ final class ConpherenceThreadListView extends AphrontView {
public function render() { public function render() {
require_celerity_resource('conpherence-menu-css'); require_celerity_resource('conpherence-menu-css');
$menu = id(new PhabricatorMenuView()) $menu = id(new PHUIListView())
->addClass('conpherence-menu') ->addClass('conpherence-menu')
->setID('conpherence-menu'); ->setID('conpherence-menu');
@ -69,8 +69,8 @@ final class ConpherenceThreadListView extends AphrontView {
} }
private function renderThreadItem(ConpherenceThread $thread) { private function renderThreadItem(ConpherenceThread $thread) {
return id(new PhabricatorMenuItemView()) return id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_CUSTOM) ->setType(PHUIListItemView::TYPE_CUSTOM)
->setName($this->renderThread($thread)); ->setName($this->renderThread($thread));
} }
@ -105,7 +105,7 @@ final class ConpherenceThreadListView extends AphrontView {
} }
private function addThreadsToMenu( private function addThreadsToMenu(
PhabricatorMenuView $menu, PHUIListView $menu,
array $conpherences) { array $conpherences) {
if ($this->scrollUpParticipant->getID()) { if ($this->scrollUpParticipant->getID()) {
@ -139,11 +139,11 @@ final class ConpherenceThreadListView extends AphrontView {
} else { } else {
$name = pht('Load Older Threads'); $name = pht('Load Older Threads');
} }
$item = id(new PhabricatorMenuItemView()) $item = id(new PHUIListItemView())
->addSigil('conpherence-menu-scroller') ->addSigil('conpherence-menu-scroller')
->setName($name) ->setName($name)
->setHref($this->baseURI) ->setHref($this->baseURI)
->setType(PhabricatorMenuItemView::TYPE_BUTTON) ->setType(PHUIListItemView::TYPE_BUTTON)
->setMetadata(array( ->setMetadata(array(
'participant_id' => $participant->getID(), 'participant_id' => $participant->getID(),
'conpherence_phid' => $participant->getConpherencePHID(), 'conpherence_phid' => $participant->getConpherencePHID(),
@ -160,8 +160,8 @@ final class ConpherenceThreadListView extends AphrontView {
), ),
pht('No conpherences.')); pht('No conpherences.'));
return id(new PhabricatorMenuItemView()) return id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_CUSTOM) ->setType(PHUIListItemView::TYPE_CUSTOM)
->setName($message); ->setName($message);
} }

2
src/applications/countdown/controller/PhabricatorCountdownController.php
View file

@ -27,7 +27,7 @@ abstract class PhabricatorCountdownController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Countdown')) ->setName(pht('Create Countdown'))
->setHref($this->getApplicationURI('edit/')) ->setHref($this->getApplicationURI('edit/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/differential/controller/DifferentialController.php
View file

@ -26,7 +26,7 @@ abstract class DifferentialController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref($this->getApplicationURI('/diff/create/')) ->setHref($this->getApplicationURI('/diff/create/'))
->setName(pht('Create Diff')) ->setName(pht('Create Diff'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/differential/events/DifferentialPeopleMenuEventListener.php
View file

@ -24,7 +24,7 @@ final class DifferentialPeopleMenuEventListener extends PhutilEventListener {
$name = pht('Revisions'); $name = pht('Revisions');
$menu->addMenuItemToLabel('activity', $menu->addMenuItemToLabel('activity',
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIsExternal(true) ->setIsExternal(true)
->setHref($href) ->setHref($href)
->setName($name) ->setName($name)

2
src/applications/diffusion/events/DiffusionPeopleMenuEventListener.php
View file

@ -23,7 +23,7 @@ final class DiffusionPeopleMenuEventListener extends PhutilEventListener {
$name = pht('Lint Messages'); $name = pht('Lint Messages');
$menu->addMenuItemToLabel('activity', $menu->addMenuItemToLabel('activity',
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIsExternal(true) ->setIsExternal(true)
->setHref($href) ->setHref($href)
->setName($name) ->setName($name)

14
src/applications/directory/controller/PhabricatorDirectoryController.php
View file

@ -81,13 +81,13 @@ abstract class PhabricatorDirectoryController extends PhabricatorController {
$show_item_id = celerity_generate_unique_node_id(); $show_item_id = celerity_generate_unique_node_id();
$hide_item_id = celerity_generate_unique_node_id(); $hide_item_id = celerity_generate_unique_node_id();
$show_item = id(new PhabricatorMenuItemView()) $show_item = id(new PHUIListItemView())
->setName(pht('Show More Applications')) ->setName(pht('Show More Applications'))
->setHref('#') ->setHref('#')
->addSigil('reveal-content') ->addSigil('reveal-content')
->setID($show_item_id); ->setID($show_item_id);
$hide_item = id(new PhabricatorMenuItemView()) $hide_item = id(new PHUIListItemView())
->setName(pht('Show Fewer Applications')) ->setName(pht('Show Fewer Applications'))
->setHref('#') ->setHref('#')
->setStyle('display: none') ->setStyle('display: none')
@ -118,14 +118,16 @@ abstract class PhabricatorDirectoryController extends PhabricatorController {
while (count($tiles) % 3) { while (count($tiles) % 3) {
$tiles[] = id(new PhabricatorApplicationLaunchView()); $tiles[] = id(new PhabricatorApplicationLaunchView());
} }
$label = id(new PhabricatorMenuItemView()) $label = id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setType(PHUIListItemView::TYPE_LABEL)
->setName($groups[$group]); ->setName($groups[$group]);
if ($is_hide) { if ($is_hide) {
$label->setStyle('display: none');
$label_id = celerity_generate_unique_node_id(); $label_id = celerity_generate_unique_node_id();
$label->setID($label_id); $attrs = array();
$attrs['style'] = 'display: none;';
$attrs['id'] = $label_id;
$label->setContainerAttrs($attrs);
$tile_ids[] = $label_id; $tile_ids[] = $label_id;
} }

2
src/applications/diviner/application/PhabricatorApplicationDiviner.php
View file

@ -51,7 +51,7 @@ final class PhabricatorApplicationDiviner extends PhabricatorApplication {
} }
if ($application && $application->getHelpURI()) { if ($application && $application->getHelpURI()) {
$item = new PhabricatorMenuItemView(); $item = new PHUIListItemView();
$item->setName(pht('%s Help', $application->getName())); $item->setName(pht('%s Help', $application->getName()));
$item->setIcon('help'); $item->setIcon('help');
$item->setHref($application->getHelpURI()); $item->setHref($application->getHelpURI());

2
src/applications/diviner/controller/DivinerController.php
View file

@ -12,7 +12,7 @@ abstract class DivinerController extends PhabricatorController {
} }
private function buildMenu() { private function buildMenu() {
$menu = new PhabricatorMenuView(); $menu = new PHUIListView();
id(new DivinerAtomSearchEngine()) id(new DivinerAtomSearchEngine())
->setViewer($this->getRequest()->getUser()) ->setViewer($this->getRequest()->getUser())

4
src/applications/files/controller/PhabricatorFileController.php
View file

@ -5,7 +5,7 @@ abstract class PhabricatorFileController extends PhabricatorController {
public function buildApplicationCrumbs() { public function buildApplicationCrumbs() {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Upload File')) ->setName(pht('Upload File'))
->setIcon('create') // TODO: Get @chad to build an "upload" icon. ->setIcon('create') // TODO: Get @chad to build an "upload" icon.
->setHref($this->getApplicationURI('/upload/'))); ->setHref($this->getApplicationURI('/upload/')));
@ -23,7 +23,7 @@ abstract class PhabricatorFileController extends PhabricatorController {
} }
private function buildMenu($for_devices) { private function buildMenu($for_devices) {
$menu = new PhabricatorMenuView(); $menu = new PHUIListView();
if ($for_devices) { if ($for_devices) {
$menu->newLink(pht('Upload File'), $this->getApplicationURI('/upload/')); $menu->newLink(pht('Upload File'), $this->getApplicationURI('/upload/'));

2
src/applications/herald/controller/HeraldController.php
View file

@ -24,7 +24,7 @@ abstract class HeraldController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Herald Rule')) ->setName(pht('Create Herald Rule'))
->setHref($this->getApplicationURI('new/')) ->setHref($this->getApplicationURI('new/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/herald/view/HeraldRuleListView.php
View file

@ -68,7 +68,7 @@ final class HeraldRuleListView extends AphrontView {
->addAttribute($edit_log) ->addAttribute($edit_log)
->addIcon('none', $author) ->addIcon('none', $author)
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref('/herald/delete/'.$rule->getID().'/') ->setHref('/herald/delete/'.$rule->getID().'/')
->setIcon('delete') ->setIcon('delete')
->setWorkflow(true)); ->setWorkflow(true));

2
src/applications/macro/controller/PhabricatorMacroController.php
View file

@ -29,7 +29,7 @@ abstract class PhabricatorMacroController
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Macro')) ->setName(pht('Create Macro'))
->setHref($this->getApplicationURI('/create/')) ->setHref($this->getApplicationURI('/create/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/mailinglists/controller/PhabricatorMailingListsController.php
View file

@ -26,7 +26,7 @@ abstract class PhabricatorMailingListsController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create List')) ->setName(pht('Create List'))
->setHref($this->getApplicationURI('edit/')) ->setHref($this->getApplicationURI('edit/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/maniphest/controller/ManiphestTaskDetailController.php
View file

@ -336,7 +336,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
->setHref('/'.$object_name)) ->setHref('/'.$object_name))
->setActionList($actions) ->setActionList($actions)
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref($this->getApplicationURI('/task/create/')) ->setHref($this->getApplicationURI('/task/create/'))
->setName(pht('Create Task')) ->setName(pht('Create Task'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/maniphest/controller/ManiphestTaskEditController.php
View file

@ -554,7 +554,7 @@ final class ManiphestTaskEditController extends ManiphestController {
->setName($header_name) ->setName($header_name)
->setHref($this->getApplicationURI('/task/create/'))) ->setHref($this->getApplicationURI('/task/create/')))
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref($this->getApplicationURI('/task/create/')) ->setHref($this->getApplicationURI('/task/create/'))
->setName(pht('Create Task')) ->setName(pht('Create Task'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/maniphest/controller/ManiphestTaskListController.php
View file

@ -416,7 +416,7 @@ final class ManiphestTaskListController extends ManiphestController {
id(new PhabricatorCrumbView()) id(new PhabricatorCrumbView())
->setName($title)) ->setName($title))
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref($this->getApplicationURI('/task/create/')) ->setHref($this->getApplicationURI('/task/create/'))
->setName(pht('Create Task')) ->setName(pht('Create Task'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/maniphest/event/ManiphestPeopleMenuEventListener.php
View file

@ -23,7 +23,7 @@ final class ManiphestPeopleMenuEventListener extends PhutilEventListener {
$name = pht('Tasks'); $name = pht('Tasks');
$menu->addMenuItemToLabel('activity', $menu->addMenuItemToLabel('activity',
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIsExternal(true) ->setIsExternal(true)
->setHref($href) ->setHref($href)
->setName($name) ->setName($name)

2
src/applications/maniphest/view/ManiphestTaskListView.php
View file

@ -101,7 +101,7 @@ final class ManiphestTaskListView extends ManiphestView {
if ($this->showBatchControls) { if ($this->showBatchControls) {
$item->addAction( $item->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIcon('edit') ->setIcon('edit')
->addSigil('maniphest-edit-task') ->addSigil('maniphest-edit-task')
->setHref('/maniphest/task/edit/'.$task->getID().'/')); ->setHref('/maniphest/task/edit/'.$task->getID().'/'));

2
src/applications/owners/controller/PhabricatorOwnersController.php
View file

@ -50,7 +50,7 @@ abstract class PhabricatorOwnersController extends PhabricatorController {
->setName($title)); ->setName($title));
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Package')) ->setName(pht('Create Package'))
->setHref('/owners/new/') ->setHref('/owners/new/')
->setIcon('create')); ->setIcon('create'));

2
src/applications/paste/controller/PhabricatorPasteController.php
View file

@ -29,7 +29,7 @@ abstract class PhabricatorPasteController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Paste')) ->setName(pht('Create Paste'))
->setHref($this->getApplicationURI('create/')) ->setHref($this->getApplicationURI('create/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/people/application/PhabricatorApplicationPeople.php
View file

@ -61,7 +61,7 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication {
if ($user->isLoggedIn()) { if ($user->isLoggedIn()) {
$image = $user->loadProfileImageURI(); $image = $user->loadProfileImageURI();
$item = new PhabricatorMenuItemView(); $item = new PHUIListItemView();
$item->setName($user->getUsername()); $item->setName($user->getUsername());
$item->setHref('/p/'.$user->getUsername().'/'); $item->setHref('/p/'.$user->getUsername().'/');
$item->addClass('phabricator-core-menu-item'); $item->addClass('phabricator-core-menu-item');

2
src/applications/people/controller/PhabricatorPeopleController.php
View file

@ -39,7 +39,7 @@ abstract class PhabricatorPeopleController extends PhabricatorController {
if ($viewer->getIsAdmin()) { if ($viewer->getIsAdmin()) {
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create New User')) ->setName(pht('Create New User'))
->setHref($this->getApplicationURI('edit')) ->setHref($this->getApplicationURI('edit'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/people/controller/PhabricatorPeopleListController.php
View file

@ -69,7 +69,7 @@ final class PhabricatorPeopleListController extends PhabricatorPeopleController
if ($viewer->getIsAdmin()) { if ($viewer->getIsAdmin()) {
$uid = $user->getID(); $uid = $user->getID();
$item->addAction( $item->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIcon('edit') ->setIcon('edit')
->setHref($this->getApplicationURI('edit/'.$uid.'/'))); ->setHref($this->getApplicationURI('edit/'.$uid.'/')));
} }

6
src/applications/people/controller/PhabricatorPeopleProfileController.php
View file

@ -55,7 +55,7 @@ final class PhabricatorPeopleProfileController
$profile = $user->loadUserProfile(); $profile = $user->loadUserProfile();
$username = phutil_escape_uri($user->getUserName()); $username = phutil_escape_uri($user->getUserName());
$menu = new PhabricatorMenuView(); $menu = new PHUIListView();
foreach ($this->getMainFilters($username) as $filter) { foreach ($this->getMainFilters($username) as $filter) {
$menu->newLink($filter['name'], $filter['href'], $filter['key']); $menu->newLink($filter['name'], $filter['href'], $filter['key']);
} }
@ -91,11 +91,11 @@ final class PhabricatorPeopleProfileController
$added_label = true; $added_label = true;
} }
$menu->addMenuItem( $menu->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIsExternal(true) ->setIsExternal(true)
->setName($name) ->setName($name)
->setHref($href) ->setHref($href)
->setType(PhabricatorMenuItemView::TYPE_LINK)); ->setType(PHUIListItemView::TYPE_LINK));
} }
} }

4
src/applications/phame/controller/PhameController.php
View file

@ -96,12 +96,12 @@ abstract class PhameController extends PhabricatorController {
protected function buildApplicationCrumbs() { protected function buildApplicationCrumbs() {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('New Blog')) ->setName(pht('New Blog'))
->setHref($this->getApplicationURI('/blog/new')) ->setHref($this->getApplicationURI('/blog/new'))
->setIcon('create')); ->setIcon('create'));
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('New Post')) ->setName(pht('New Post'))
->setHref($this->getApplicationURI('/post/new')) ->setHref($this->getApplicationURI('/post/new'))
->setIcon('new')); ->setIcon('new'));

2
src/applications/phlux/controller/PhluxController.php
View file

@ -5,7 +5,7 @@ abstract class PhluxController extends PhabricatorController {
protected function buildApplicationCrumbs() { protected function buildApplicationCrumbs() {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Variable')) ->setName(pht('Create Variable'))
->setHref($this->getApplicationURI('/edit/')) ->setHref($this->getApplicationURI('/edit/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/pholio/controller/PholioController.php
View file

@ -24,7 +24,7 @@ abstract class PholioController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Mock')) ->setName(pht('Create Mock'))
->setHref($this->getApplicationURI('new/')) ->setHref($this->getApplicationURI('new/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/phortune/controller/PhortuneProductListController.php
View file

@ -22,7 +22,7 @@ final class PhortuneProductListController extends PhabricatorController {
->setName('Products') ->setName('Products')
->setHref($this->getApplicationURI('product/'))); ->setHref($this->getApplicationURI('product/')));
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Product')) ->setName(pht('Create Product'))
->setHref($this->getApplicationURI('product/edit/')) ->setHref($this->getApplicationURI('product/edit/'))
->setIcon('create')); ->setIcon('create'));

4
src/applications/phriction/controller/PhrictionController.php
View file

@ -51,14 +51,14 @@ abstract class PhrictionController extends PhabricatorController {
if (get_class($this) != 'PhrictionListController') { if (get_class($this) != 'PhrictionListController') {
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Index')) ->setName(pht('Index'))
->setHref('/phriction/') ->setHref('/phriction/')
->setIcon('transcript')); ->setIcon('transcript'));
} }
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('New Document')) ->setName(pht('New Document'))
->setHref('/phriction/new/?slug='.$this->getDocumentSlug()) ->setHref('/phriction/new/?slug='.$this->getDocumentSlug())
->setWorkflow(true) ->setWorkflow(true)

2
src/applications/ponder/controller/PonderController.php
View file

@ -32,7 +32,7 @@ abstract class PonderController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs $crumbs
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('New Question')) ->setName(pht('New Question'))
->setHref('/ponder/question/ask') ->setHref('/ponder/question/ask')
->setIcon('create')); ->setIcon('create'));

2
src/applications/project/controller/PhabricatorProjectController.php
View file

@ -71,7 +71,7 @@ abstract class PhabricatorProjectController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Project')) ->setName(pht('Create Project'))
->setHref($this->getApplicationURI('create/')) ->setHref($this->getApplicationURI('create/'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/releeph/controller/branch/ReleephBranchViewController.php
View file

@ -70,7 +70,7 @@ final class ReleephBranchViewController extends ReleephController {
if ($releeph_branch->isActive()) { if ($releeph_branch->isActive()) {
$create_uri = $releeph_branch->getURI('request/'); $create_uri = $releeph_branch->getURI('request/');
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref($create_uri) ->setHref($create_uri)
->setName(pht('Request Pick')) ->setName(pht('Request Pick'))
->setIcon('create')); ->setIcon('create'));

2
src/applications/releeph/controller/project/ReleephProjectViewController.php
View file

@ -26,7 +26,7 @@ final class ReleephProjectViewController extends ReleephController {
if ($releeph_project->getIsActive()) { if ($releeph_project->getIsActive()) {
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref($releeph_project->getURI('cutbranch')) ->setHref($releeph_project->getURI('cutbranch'))
->setName(pht('Cut New Branch')) ->setName(pht('Cut New Branch'))
->setIcon('create')); ->setIcon('create'));

5
src/applications/search/controller/PhabricatorApplicationSearchController.php
View file

@ -250,7 +250,7 @@ final class PhabricatorApplicationSearchController
} }
$item->addAction( $item->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIcon($icon) ->setIcon($icon)
->setHref('/search/delete/'.$key.'/'.$class.'/') ->setHref('/search/delete/'.$key.'/'.$class.'/')
->setWorkflow(true)); ->setWorkflow(true));
@ -263,8 +263,9 @@ final class PhabricatorApplicationSearchController
} }
$item->setBarColor('grey'); $item->setBarColor('grey');
} else { } else {
$item->addIcon('none', $date_created);
$item->addAction( $item->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setIcon('edit') ->setIcon('edit')
->setHref('/search/edit/'.$key.'/')); ->setHref('/search/edit/'.$key.'/'));
} }

2
src/applications/search/engine/PhabricatorApplicationSearchEngine.php
View file

@ -106,7 +106,7 @@ abstract class PhabricatorApplicationSearchEngine {
} }
public function addNavigationItems(PhabricatorMenuView $menu) { public function addNavigationItems(PHUIListView $menu) {
$viewer = $this->requireViewer(); $viewer = $this->requireViewer();
$menu->newLabel(pht('Queries')); $menu->newLabel(pht('Queries'));

2
src/applications/settings/application/PhabricatorApplicationSettings.php
View file

@ -39,7 +39,7 @@ final class PhabricatorApplicationSettings extends PhabricatorApplication {
if ($user->isLoggedIn()) { if ($user->isLoggedIn()) {
$selected = ($controller instanceof PhabricatorSettingsMainController); $selected = ($controller instanceof PhabricatorSettingsMainController);
$item = new PhabricatorMenuItemView(); $item = new PHUIListItemView();
$item->setName(pht('Settings')); $item->setName(pht('Settings'));
$item->setIcon('settings'); $item->setIcon('settings');
$item->addClass('phabricator-core-menu-item'); $item->addClass('phabricator-core-menu-item');

2
src/applications/slowvote/controller/PhabricatorSlowvoteController.php
View file

@ -51,7 +51,7 @@ abstract class PhabricatorSlowvoteController extends PhabricatorController {
$crumbs = parent::buildApplicationCrumbs(); $crumbs = parent::buildApplicationCrumbs();
$crumbs->addAction( $crumbs->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Create Question')) ->setName(pht('Create Question'))
->setHref($this->getApplicationURI('create/')) ->setHref($this->getApplicationURI('create/'))
->setIcon('create')); ->setIcon('create'));

196
src/applications/uiexample/examples/PHUIDocumentExample.php Normal file
View file

@ -0,0 +1,196 @@
<?php
final class PHUIDocumentExample extends PhabricatorUIExample {
public function getName() {
return pht('Document View');
}
public function getDescription() {
return pht('Useful for areas of large content navigation');
}
public function renderExample() {
$request = $this->getRequest();
$user = $request->getUser();
$action = id(new PHUIListItemView())
->setName('Actions')
->setType(PHUIListItemView::TYPE_LABEL);
$action1 = id(new PHUIListItemView())
->setName('Edit Document')
->setHref('#')
->setIcon('edit')
->setType(PHUIListItemView::TYPE_LINK);
$action2 = id(new PHUIListItemView())
->setName('Move Document')
->setHref('#')
->setIcon('move')
->setType(PHUIListItemView::TYPE_LINK);
$action3 = id(new PHUIListItemView())
->setName('Delete Document')
->setHref('#')
->setIcon('delete')
->setType(PHUIListItemView::TYPE_LINK);
$action4 = id(new PHUIListItemView())
->setName('View History')
->setHref('#')
->setIcon('history')
->setType(PHUIListItemView::TYPE_LINK);
$action5 = id(new PHUIListItemView())
->setName('Subscribe')
->setHref('#')
->setIcon('subscribe-add')
->setType(PHUIListItemView::TYPE_LINK);
$divider = id(new PHUIListItemView)
->setType(PHUIListItemView::TYPE_DIVIDER);
$header = id(new PhabricatorHeaderView())
->setHeader('Installation');
$label1 = id(new PHUIListItemView())
->setName('Getting Started')
->setType(PHUIListItemView::TYPE_LABEL);
$label2 = id(new PHUIListItemView())
->setName('Documentation')
->setType(PHUIListItemView::TYPE_LABEL);
$item1 = id(new PHUIListItemView())
->setName('Installation')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$item2 = id(new PHUIListItemView())
->setName('Webserver Config')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$item3 = id(new PHUIListItemView())
->setName('Adding Users')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$item4 = id(new PHUIListItemView())
->setName('Debugging')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$sidenav = id(new PHUIListView())
->addMenuItem($action)
->addMenuItem($action1)
->addMenuItem($action2)
->addMenuItem($action3)
->addMenuItem($action4)
->addMenuItem($action5)
->addMenuItem($divider)
->addMenuItem($label1)
->addMenuItem($item1)
->addMenuItem($item2)
->addMenuItem($item3)
->addMenuItem($item4)
->addMenuItem($label2)
->addMenuItem($item2)
->addMenuItem($item3)
->addMenuItem($item4)
->addMenuItem($item1);
$home = id(new PHUIListItemView())
->setIcon('transcript')
->setHref('#')
->setType(PHUIListItemView::TYPE_ICON);
$item1 = id(new PHUIListItemView())
->setName('Installation')
->setHref('#')
->setSelected(true)
->setType(PHUIListItemView::TYPE_LINK);
$item2 = id(new PHUIListItemView())
->setName('Webserver Config')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$item3 = id(new PHUIListItemView())
->setName('Adding Users')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$item4 = id(new PHUIListItemView())
->setName('Debugging')
->setHref('#')
->setType(PHUIListItemView::TYPE_LINK);
$topnav = id(new PHUIListView())
->addMenuItem($home)
->addMenuItem($item1)
->addMenuItem($item2)
->addMenuItem($item3)
->addMenuItem($item4);
$document = hsprintf(
'<p class="pl">Lorem ipsum dolor sit amet, consectetur adipisicing, '.
'sed do eiusmod tempor incididunt ut labore et dolore magna '.
'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '.
'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '.
'aute irure dolor in reprehenderit in voluptate velit esse cillum '.
'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '.
'cupidatat non proident, sunt in culpa qui officia deserunt '.
'mollit anim id est laborum.</p>'.
'<p class="plr pll plb">Lorem ipsum dolor sit amet, consectetur, '.
'sed do eiusmod tempor incididunt ut labore et dolore magna '.
'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '.
'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '.
'aute irure dolor in reprehenderit in voluptate velit esse cillum '.
'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '.
'cupidatat non proident, sunt in culpa qui officia deserunt '.
'mollit anim id est laborum.</p>'.
'<p class="plr pll plb">Lorem ipsum dolor sit amet, consectetur, '.
'sed do eiusmod tempor incididunt ut labore et dolore magna '.
'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '.
'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '.
'aute irure dolor in reprehenderit in voluptate velit esse cillum '.
'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '.
'cupidatat non proident, sunt in culpa qui officia deserunt '.
'mollit anim id est laborum.</p>'.
'<p class="plr pll plb">Lorem ipsum dolor sit amet, consectetur, '.
'sed do eiusmod tempor incididunt ut labore et dolore magna '.
'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '.
'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '.
'aute irure dolor in reprehenderit in voluptate velit esse cillum '.
'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '.
'cupidatat non proident, sunt in culpa qui officia deserunt '.
'mollit anim id est laborum.</p>'.
'<p class="plr pll plb">Lorem ipsum dolor sit amet, consectetur, '.
'sed do eiusmod tempor incididunt ut labore et dolore magna '.
'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '.
'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '.
'aute irure dolor in reprehenderit in voluptate velit esse cillum '.
'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '.
'cupidatat non proident, sunt in culpa qui officia deserunt '.
'mollit anim id est laborum.</p>'.
'<p class="plr pll plb">Lorem ipsum dolor sit amet, consectetur, '.
'sed do eiusmod tempor incididunt ut labore et dolore magna '.
'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '.
'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '.
'aute irure dolor in reprehenderit in voluptate velit esse cillum '.
'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '.
'cupidatat non proident, sunt in culpa qui officia deserunt '.
'mollit anim id est laborum.</p>');
$content = new PHUIDocumentView();
$content->setBook('Book or Project Name', 'Article');
$content->setHeader($header);
$content->setTopNav($topnav);
$content->setSidenav($sidenav);
$content->appendChild($document);
return $content;
}
}

8
src/applications/uiexample/examples/PhabricatorObjectItemListExample.php
View file

@ -154,7 +154,7 @@ final class PhabricatorObjectItemListExample extends PhabricatorUIExample {
->setGrippable(true) ->setGrippable(true)
->setBarColor('green') ->setBarColor('green')
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref('#') ->setHref('#')
->setIcon('delete'))); ->setIcon('delete')));
@ -170,7 +170,7 @@ final class PhabricatorObjectItemListExample extends PhabricatorUIExample {
->setHref('#') ->setHref('#')
->setBarColor('blue') ->setBarColor('blue')
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref('#') ->setHref('#')
->setIcon('edit'))); ->setIcon('edit')));
@ -180,11 +180,11 @@ final class PhabricatorObjectItemListExample extends PhabricatorUIExample {
->setHref('#') ->setHref('#')
->setBarColor('violet') ->setBarColor('violet')
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref('#') ->setHref('#')
->setIcon('edit')) ->setIcon('edit'))
->addAction( ->addAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setHref('#') ->setHref('#')
->setIcon('delete'))); ->setIcon('delete')));

2
src/applications/uiexample/examples/PhabricatorWorkboardExample.php
View file

@ -103,7 +103,7 @@ final class PhabricatorWorkboardExample extends PhabricatorUIExample {
->setCards($list) ->setCards($list)
->setHeader('Business Stuff') ->setHeader('Business Stuff')
->setFooterAction( ->setFooterAction(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setName(pht('Add Task')) ->setName(pht('Add Task'))
->setIcon('new') ->setIcon('new')
->setHref('/maniphest/task/create/')); ->setHref('/maniphest/task/create/'));

8
src/infrastructure/celerity/CeleritySpriteGenerator.php
View file

@ -459,9 +459,9 @@ final class CeleritySpriteGenerator {
$extra_css = array( $extra_css = array(
'dark-menu-label' => 'dark-menu-label' =>
', .phabricator-dark-menu .phabricator-menu-item-type-label', ', .phabricator-dark-menu .phui-list-item-type-label',
'menu-label' => 'menu-label' =>
', .phabricator-side-menu .phabricator-menu-item-type-label', ', .phabricator-side-menu .phui-list-item-type-label',
); );
$sprites = array(); $sprites = array();
@ -481,8 +481,8 @@ final class CeleritySpriteGenerator {
'gradient', 'gradient',
false, false,
PhutilSpriteSheet::TYPE_REPEAT_X, PhutilSpriteSheet::TYPE_REPEAT_X,
', .phabricator-dark-menu .phabricator-menu-item-type-label, '. ', .phabricator-dark-menu .phui-list-item-type-label, '.
'.phabricator-side-menu .phabricator-menu-item-type-label'); '.phabricator-side-menu .phui-list-item-type-label');
foreach ($sprites as $sprite) { foreach ($sprites as $sprite) {
$sheet->addSprite($sprite); $sheet->addSprite($sprite);
} }

3
src/view/AphrontTagView.php
View file

@ -126,7 +126,8 @@ abstract class AphrontTagView extends AphrontView {
$tag_view_attributes = array( $tag_view_attributes = array(
'id' => $this->id, 'id' => $this->id,
'class' => $this->classes ? implode(' ', $this->classes) : null, 'class' => $this->classes ?
implode(' ', array_filter($this->classes)) : null,
'style' => $this->style, 'style' => $this->style,
'meta' => $this->metadata, 'meta' => $this->metadata,

22
src/view/layout/AphrontSideNavFilterView.php
View file

@ -37,7 +37,7 @@ final class AphrontSideNavFilterView extends AphrontView {
} }
public function __construct() { public function __construct() {
$this->menu = new PhabricatorMenuView(); $this->menu = new PHUIListView();
} }
public function addClass($class) { public function addClass($class) {
@ -45,7 +45,7 @@ final class AphrontSideNavFilterView extends AphrontView {
return $this; return $this;
} }
public static function newFromMenu(PhabricatorMenuView $menu) { public static function newFromMenu(PHUIListView $menu) {
$object = new AphrontSideNavFilterView(); $object = new AphrontSideNavFilterView();
$object->setBaseURI(new PhutilURI('/')); $object->setBaseURI(new PhutilURI('/'));
$object->menu = $menu; $object->menu = $menu;
@ -80,7 +80,7 @@ final class AphrontSideNavFilterView extends AphrontView {
return $this->menu; return $this->menu;
} }
public function addMenuItem(PhabricatorMenuItemView $item) { public function addMenuItem(PHUIListItemView $item) {
$this->menu->addMenuItem($item); $this->menu->addMenuItem($item);
return $this; return $this;
} }
@ -91,12 +91,12 @@ final class AphrontSideNavFilterView extends AphrontView {
public function addFilter($key, $name, $uri = null) { public function addFilter($key, $name, $uri = null) {
return $this->addThing( return $this->addThing(
$key, $name, $uri, PhabricatorMenuItemView::TYPE_LINK); $key, $name, $uri, PHUIListItemView::TYPE_LINK);
} }
public function addButton($key, $name, $uri = null) { public function addButton($key, $name, $uri = null) {
return $this->addThing( return $this->addThing(
$key, $name, $uri, PhabricatorMenuItemView::TYPE_BUTTON); $key, $name, $uri, PHUIListItemView::TYPE_BUTTON);
} }
private function addThing( private function addThing(
@ -105,7 +105,7 @@ final class AphrontSideNavFilterView extends AphrontView {
$uri = null, $uri = null,
$type) { $type) {
$item = id(new PhabricatorMenuItemView()) $item = id(new PHUIListItemView())
->setName($name) ->setName($name)
->setType($type); ->setType($type);
@ -128,16 +128,16 @@ final class AphrontSideNavFilterView extends AphrontView {
public function addCustomBlock($block) { public function addCustomBlock($block) {
$this->menu->addMenuItem( $this->menu->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_CUSTOM) ->setType(PHUIListItemView::TYPE_CUSTOM)
->appendChild($block)); ->appendChild($block));
return $this; return $this;
} }
public function addLabel($name) { public function addLabel($name) {
return $this->addMenuItem( return $this->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setType(PHUIListItemView::TYPE_LABEL)
->setName($name)); ->setName($name));
} }
@ -175,7 +175,7 @@ final class AphrontSideNavFilterView extends AphrontView {
if ($this->selectedFilter !== null) { if ($this->selectedFilter !== null) {
$selected_item = $this->menu->getItem($this->selectedFilter); $selected_item = $this->menu->getItem($this->selectedFilter);
if ($selected_item) { if ($selected_item) {
$selected_item->addClass('phabricator-menu-item-selected'); $selected_item->addClass('phui-list-item-selected');
} }
} }

2
src/view/layout/PhabricatorCrumbsView.php
View file

@ -15,7 +15,7 @@ final class PhabricatorCrumbsView extends AphrontView {
return $this; return $this;
} }
public function addAction(PhabricatorMenuItemView $action) { public function addAction(PHUIListItemView $action) {
$this->actions[] = $action; $this->actions[] = $action;
return $this; return $this;
} }

4
src/view/layout/PhabricatorObjectItemView.php
View file

@ -77,7 +77,7 @@ final class PhabricatorObjectItemView extends AphrontTagView {
return $this; return $this;
} }
public function addAction(PhabricatorMenuItemView $action) { public function addAction(PHUIListItemView $action) {
if (count($this->actions) >= 3) { if (count($this->actions) >= 3) {
throw new Exception("Limit 3 actions per item."); throw new Exception("Limit 3 actions per item.");
} }
@ -412,7 +412,7 @@ final class PhabricatorObjectItemView extends AphrontTagView {
$actions[] = $action; $actions[] = $action;
} }
$actions = phutil_tag( $actions = phutil_tag(
'div', 'ul',
array( array(
'class' => 'phabricator-object-item-actions', 'class' => 'phabricator-object-item-actions',
), ),

4
src/view/layout/PhabricatorWorkpanelView.php
View file

@ -22,7 +22,7 @@ final class PhabricatorWorkpanelView extends AphrontView {
return $this; return $this;
} }
public function setFooterAction(PhabricatorMenuItemView $footer_action) { public function setFooterAction(PHUIListItemView $footer_action) {
$this->footerAction = $footer_action; $this->footerAction = $footer_action;
return $this; return $this;
} }
@ -34,7 +34,7 @@ final class PhabricatorWorkpanelView extends AphrontView {
if ($this->footerAction) { if ($this->footerAction) {
$footer_tag = $this->footerAction; $footer_tag = $this->footerAction;
$footer = phutil_tag( $footer = phutil_tag(
'div', 'ul',
array( array(
'class' => 'phabricator-workpanel-footer-action mst ps' 'class' => 'phabricator-workpanel-footer-action mst ps'
), ),

14
src/view/layout/__tests__/PhabricatorMenuViewTestCase.php → src/view/layout/__tests__/PHUIListViewTestCase.php
View file

@ -1,6 +1,6 @@
<?php <?php
final class PhabricatorMenuViewTestCase extends PhabricatorTestCase { final class PHUIListViewTestCase extends PhabricatorTestCase {
public function testAppend() { public function testAppend() {
$menu = $this->newABCMenu(); $menu = $this->newABCMenu();
@ -73,7 +73,7 @@ final class PhabricatorMenuViewTestCase extends PhabricatorTestCase {
} }
public function testAppendLabel() { public function testAppendLabel() {
$menu = new PhabricatorMenuView(); $menu = new PHUIListView();
$menu->addMenuItem($this->newLabel('fruit')); $menu->addMenuItem($this->newLabel('fruit'));
$menu->addMenuItem($this->newLabel('animals')); $menu->addMenuItem($this->newLabel('animals'));
@ -107,21 +107,21 @@ final class PhabricatorMenuViewTestCase extends PhabricatorTestCase {
} }
private function newLink($key) { private function newLink($key) {
return id(new PhabricatorMenuItemView()) return id(new PHUIListItemView())
->setKey($key) ->setKey($key)
->setHref('#') ->setHref('#')
->setName('Link'); ->setName('Link');
} }
private function newLabel($key) { private function newLabel($key) {
return id(new PhabricatorMenuItemView()) return id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setType(PHUIListItemView::TYPE_LABEL)
->setKey($key) ->setKey($key)
->setName('Label'); ->setName('Label');
} }
private function newABCMenu() { private function newABCMenu() {
$menu = new PhabricatorMenuView(); $menu = new PHUIListView();
$menu->addMenuItem($this->newLink('a')); $menu->addMenuItem($this->newLink('a'));
$menu->addMenuItem($this->newLink('b')); $menu->addMenuItem($this->newLink('b'));
@ -130,7 +130,7 @@ final class PhabricatorMenuViewTestCase extends PhabricatorTestCase {
return $menu; return $menu;
} }
private function assertMenuKeys(array $expect, PhabricatorMenuView $menu) { private function assertMenuKeys(array $expect, PHUIListView $menu) {
$items = $menu->getItems(); $items = $menu->getItems();
$keys = mpull($items, 'getKey'); $keys = mpull($items, 'getKey');
$keys = array_values($keys); $keys = array_values($keys);

2
src/view/page/PhabricatorStandardPageView.php
View file

@ -18,7 +18,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
private $pageObjects = array(); private $pageObjects = array();
private $applicationMenu; private $applicationMenu;
public function setApplicationMenu(PhabricatorMenuView $application_menu) { public function setApplicationMenu(PHUIListView $application_menu) {
$this->applicationMenu = $application_menu; $this->applicationMenu = $application_menu;
return $this; return $this;
} }

16
src/view/page/menu/PhabricatorMainMenuView.php
View file

@ -6,7 +6,7 @@ final class PhabricatorMainMenuView extends AphrontView {
private $controller; private $controller;
private $applicationMenu; private $applicationMenu;
public function setApplicationMenu(PhabricatorMenuView $application_menu) { public function setApplicationMenu(PHUIListView $application_menu) {
$this->applicationMenu = $application_menu; $this->applicationMenu = $application_menu;
return $this; return $this;
} }
@ -106,7 +106,7 @@ final class PhabricatorMainMenuView extends AphrontView {
Javelin::initBehavior('phabricator-keyboard-shortcuts', $keyboard_config); Javelin::initBehavior('phabricator-keyboard-shortcuts', $keyboard_config);
if ($result) { if ($result) {
$result = id(new PhabricatorMenuItemView()) $result = id(new PHUIListItemView())
->addClass('phabricator-main-menu-search') ->addClass('phabricator-main-menu-search')
->appendChild($result); ->appendChild($result);
} }
@ -157,7 +157,7 @@ final class PhabricatorMainMenuView extends AphrontView {
$view = $this->getApplicationMenu(); $view = $this->getApplicationMenu();
if (!$view) { if (!$view) {
$view = new PhabricatorMenuView(); $view = new PHUIListView();
} }
$view->addClass('phabricator-dark-menu'); $view->addClass('phabricator-dark-menu');
@ -165,9 +165,9 @@ final class PhabricatorMainMenuView extends AphrontView {
if ($actions) { if ($actions) {
$view->addMenuItem( $view->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->addClass('phabricator-core-item-device') ->addClass('phabricator-core-item-device')
->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setType(PHUIListItemView::TYPE_LABEL)
->setName(pht('Actions'))); ->setName(pht('Actions')));
foreach ($actions as $action) { foreach ($actions as $action) {
$icon = $action->getIcon(); $icon = $action->getIcon();
@ -184,8 +184,8 @@ final class PhabricatorMainMenuView extends AphrontView {
if ($user->isLoggedIn()) { if ($user->isLoggedIn()) {
$view->addMenuItem( $view->addMenuItem(
id(new PhabricatorMenuItemView()) id(new PHUIListItemView())
->addClass('phabricator-menu-item-type-link') ->addClass('phui-list-item-type-link')
->addClass('phabricator-core-menu-item') ->addClass('phabricator-core-menu-item')
->setName(pht('Log Out')) ->setName(pht('Log Out'))
->setHref('/logout/') ->setHref('/logout/')
@ -221,7 +221,7 @@ final class PhabricatorMainMenuView extends AphrontView {
private function renderPhabricatorSearchMenu() { private function renderPhabricatorSearchMenu() {
$view = new PhabricatorMenuView(); $view = new PHUIListView();
$view->addClass('phabricator-dark-menu'); $view->addClass('phabricator-dark-menu');
$view->addClass('phabricator-search-menu'); $view->addClass('phabricator-search-menu');

123
src/view/phui/PHUIDocumentView.php
View file

@ -3,12 +3,44 @@
final class PHUIDocumentView extends AphrontTagView { final class PHUIDocumentView extends AphrontTagView {
private $offset; private $offset;
private $header;
private $sidenav;
private $topnav;
private $crumbs;
private $bookname;
private $bookdescription;
public function setOffset($offset) { public function setOffset($offset) {
$this->offset = $offset; $this->offset = $offset;
return $this; return $this;
} }
public function setHeader(PhabricatorHeaderView $header) {
$this->header = $header;
return $this;
}
public function setSideNav(PHUIListView $list) {
$this->sidenav = $list;
return $this;
}
public function setTopNav(PHUIListView $list) {
$this->topnav = $list;
return $this;
}
public function setCrumbs(PHUIListView $list) {
$this->crumbs = $list;
return $this;
}
public function setBook($name, $description) {
$this->bookname = $name;
$this->bookdescription = $description;
return $this;
}
public function getTagAttributes() { public function getTagAttributes() {
$classes = array(); $classes = array();
@ -24,17 +56,94 @@ final class PHUIDocumentView extends AphrontTagView {
public function getTagContent() { public function getTagContent() {
require_celerity_resource('phui-document-view-css'); require_celerity_resource('phui-document-view-css');
return phutil_tag( $classes = array();
'div', $classes[] = 'phui-document-view';
array( if ($this->offset) {
'class' => 'phui-document-view', $classes[] = 'phui-offset-view';
), }
phutil_tag( if ($this->sidenav) {
$classes[] = 'phui-sidenav-view';
}
$sidenav = null;
if ($this->sidenav) {
$sidenav = phutil_tag(
'div',
array(
'class' => 'phui-document-sidenav'
),
$this->sidenav);
}
$book = null;
if ($this->bookname) {
$book = phutil_tag(
'div',
array(
'class' => 'phui-document-bookname grouped'
),
array(
phutil_tag(
'span',
array('class' => 'bookname'),
$this->bookname),
phutil_tag(
'span',
array('class' => 'bookdescription'),
$this->bookdescription)));
}
$topnav = null;
if ($this->topnav) {
$topnav = phutil_tag(
'div',
array(
'class' => 'phui-document-topnav'
),
$this->topnav);
}
$crumbs = null;
if ($this->crumbs) {
$crumbs = phutil_tag(
'div',
array(
'class' => 'phui-document-crumbs'
),
$this->bookName);
}
$content_inner = phutil_tag(
'div',
array(
'class' => 'phui-document-inner',
),
array(
$book,
$this->header,
$topnav,
$this->renderChildren(),
$crumbs
));
$content = phutil_tag(
'div', 'div',
array( array(
'class' => 'phui-document-content', 'class' => 'phui-document-content',
), ),
$this->renderChildren())); array(
$sidenav,
$content_inner
));
$view = phutil_tag(
'div',
array(
'class' => implode(' ', $classes),
),
$content);
return $view;
} }
} }

37
src/view/layout/PhabricatorMenuItemView.php → src/view/phui/PHUIListItemView.php
View file

@ -1,12 +1,14 @@
<?php <?php
final class PhabricatorMenuItemView extends AphrontTagView { final class PHUIListItemView extends AphrontTagView {
const TYPE_LINK = 'type-link'; const TYPE_LINK = 'type-link';
const TYPE_SPACER = 'type-spacer'; const TYPE_SPACER = 'type-spacer';
const TYPE_LABEL = 'type-label'; const TYPE_LABEL = 'type-label';
const TYPE_BUTTON = 'type-button'; const TYPE_BUTTON = 'type-button';
const TYPE_CUSTOM = 'type-custom'; const TYPE_CUSTOM = 'type-custom';
const TYPE_DIVIDER = 'type-divider';
const TYPE_ICON = 'type-icon';
private $name; private $name;
private $href; private $href;
@ -15,6 +17,7 @@ final class PhabricatorMenuItemView extends AphrontTagView {
private $key; private $key;
private $icon; private $icon;
private $selected; private $selected;
private $containerAttrs;
public function setProperty($property) { public function setProperty($property) {
$this->property = $property; $this->property = $property;
@ -88,18 +91,34 @@ final class PhabricatorMenuItemView extends AphrontTagView {
return $this->isExternal; return $this->isExternal;
} }
// Maybe should be add ?
public function setContainerAttrs($attrs) {
$this->containerAttrs = $attrs;
return $this;
}
protected function getTagName() { protected function getTagName() {
return $this->href ? 'a' : 'div'; return $this->href ? 'a' : 'div';
} }
protected function renderTagContainer($tag) {
$classes = array(
'phui-list-item-view',
'phui-list-item-'.$this->type,
$this->icon ? 'phui-list-item-has-icon' : null,
$this->selected ? 'phui-list-item-selected' : null
);
// This is derptastical
$this->containerAttrs['class'] = implode(' ', array_filter($classes));
return phutil_tag('li', $this->containerAttrs, $tag);
}
protected function getTagAttributes() { protected function getTagAttributes() {
return array( return array(
'class' => array( 'class' => $this->href ? 'phui-list-item-href' : '',
'phabricator-menu-item-view', 'href' => $this->href);
'phabricator-menu-item-'.$this->type,
),
'href' => $this->href,
);
} }
protected function getTagContent() { protected function getTagContent() {
@ -115,7 +134,7 @@ final class PhabricatorMenuItemView extends AphrontTagView {
$name = phutil_tag( $name = phutil_tag(
'span', 'span',
array( array(
'class' => 'phabricator-menu-item-name', 'class' => 'phui-list-item-name',
), ),
array( array(
$this->name, $this->name,
@ -125,7 +144,7 @@ final class PhabricatorMenuItemView extends AphrontTagView {
if ($this->icon) { if ($this->icon) {
$icon = id(new PHUIIconView()) $icon = id(new PHUIIconView())
->addClass('phabricator-menu-item-icon') ->addClass('phui-list-item-icon')
->setSpriteSheet(PHUIIconView::SPRITE_ICONS) ->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
->setSpriteIcon($this->icon); ->setSpriteIcon($this->icon);
} }

32
src/view/layout/PhabricatorMenuView.php → src/view/phui/PHUIListView.php
View file

@ -1,6 +1,6 @@
<?php <?php
final class PhabricatorMenuView extends AphrontTagView { final class PHUIListView extends AphrontTagView {
private $items = array(); private $items = array();
@ -9,8 +9,8 @@ final class PhabricatorMenuView extends AphrontTagView {
} }
public function newLabel($name, $key = null) { public function newLabel($name, $key = null) {
$item = id(new PhabricatorMenuItemView()) $item = id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_LABEL) ->setType(PHUIListItemView::TYPE_LABEL)
->setName($name); ->setName($name);
if ($key !== null) { if ($key !== null) {
@ -23,8 +23,8 @@ final class PhabricatorMenuView extends AphrontTagView {
} }
public function newLink($name, $href, $key = null) { public function newLink($name, $href, $key = null) {
$item = id(new PhabricatorMenuItemView()) $item = id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_LINK) ->setType(PHUIListItemView::TYPE_LINK)
->setName($name) ->setName($name)
->setHref($href); ->setHref($href);
@ -38,8 +38,8 @@ final class PhabricatorMenuView extends AphrontTagView {
} }
public function newButton($name, $href) { public function newButton($name, $href) {
$item = id(new PhabricatorMenuItemView()) $item = id(new PHUIListItemView())
->setType(PhabricatorMenuItemView::TYPE_BUTTON) ->setType(PHUIListItemView::TYPE_BUTTON)
->setName($name) ->setName($name)
->setHref($href); ->setHref($href);
@ -48,11 +48,11 @@ final class PhabricatorMenuView extends AphrontTagView {
return $item; return $item;
} }
public function addMenuItem(PhabricatorMenuItemView $item) { public function addMenuItem(PHUIListItemView $item) {
return $this->addMenuItemAfter(null, $item); return $this->addMenuItemAfter(null, $item);
} }
public function addMenuItemAfter($key, PhabricatorMenuItemView $item) { public function addMenuItemAfter($key, PHUIListItemView $item) {
if ($key === null) { if ($key === null) {
$this->items[] = $item; $this->items[] = $item;
return $this; return $this;
@ -75,7 +75,7 @@ final class PhabricatorMenuView extends AphrontTagView {
return $this; return $this;
} }
public function addMenuItemBefore($key, PhabricatorMenuItemView $item) { public function addMenuItemBefore($key, PHUIListItemView $item) {
if ($key === null) { if ($key === null) {
array_unshift($this->items, $item); array_unshift($this->items, $item);
return $this; return $this;
@ -95,11 +95,11 @@ final class PhabricatorMenuView extends AphrontTagView {
return $this; return $this;
} }
public function addMenuItemToLabel($key, PhabricatorMenuItemView $item) { public function addMenuItemToLabel($key, PHUIListItemView $item) {
$this->requireKey($key); $this->requireKey($key);
$other = $this->getItem($key); $other = $this->getItem($key);
if ($other->getType() != PhabricatorMenuItemView::TYPE_LABEL) { if ($other->getType() != PHUIListItemView::TYPE_LABEL) {
throw new Exception(pht("Menu item '%s' is not a label!", $key)); throw new Exception(pht("Menu item '%s' is not a label!", $key));
} }
@ -111,7 +111,7 @@ final class PhabricatorMenuView extends AphrontTagView {
$seen = true; $seen = true;
} }
} else { } else {
if ($other->getType() == PhabricatorMenuItemView::TYPE_LABEL) { if ($other->getType() == PHUIListItemView::TYPE_LABEL) {
break; break;
} }
} }
@ -161,9 +161,13 @@ final class PhabricatorMenuView extends AphrontTagView {
} }
} }
public function getTagName() {
return 'ul';
}
protected function getTagAttributes() { protected function getTagAttributes() {
return array( return array(
'class' => 'phabricator-menu-view', 'class' => 'phui-list-view',
); );
} }

41
webroot/rsrc/css/application/base/main-menu-view.css
View file

@ -274,31 +274,24 @@
*/ */
.device .phabricator-dark-menu, .device .phabricator-dark-menu,
.device .phabricator-dark-menu a.phabricator-menu-item-type-link { .device .phabricator-dark-menu a.phui-list-item-href {
color: #fff; color: #fff;
} }
.device .phabricator-dark-menu .phabricator-menu-item-type-label { .device .phabricator-dark-menu .phui-list-item-type-label {
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 12px;
background-color: #151719; background-color: #151719;
padding: 0 0 0 12px; padding: 5px 0;
height: 25px; display: block;
font-weight: bold; font-weight: bold;
} }
.device .phabricator-dark-menu .phabricator-menu-item-type-label .device .phabricator-dark-menu .phui-list-item-href {
.phabricator-menu-item-name {
display: block;
padding: 6px 0 0;
}
.device .phabricator-dark-menu .phabricator-menu-item-type-link {
border-width: 1px 0; border-width: 1px 0;
border-style: solid; border-style: solid;
border-color: #34373b transparent #282c2d; border-color: #34373b transparent #282c2d;
background-image: url(/rsrc/image/texture/dark-menu.png); background-image: url(/res/41ee673a/rsrc/image/texture/dark-menu.png);
padding: 4px 0; padding: 4px 0;
display: block; display: block;
} }
@ -328,15 +321,15 @@
padding-top: 44px; padding-top: 44px;
} }
.device .phabricator-dark-menu .phabricator-menu-item-type-link { .device .phabricator-dark-menu .phui-list-item-type-link {
font-size: 15px; font-size: 15px;
min-height: 30px; min-height: 30px;
line-height: 28px; line-height: 28px;
} }
.device .phabricator-menu-item-type-link .device .phui-list-item-type-link
.phabricator-core-menu-icon + .phabricator-menu-item-name { .phabricator-core-menu-icon + .phui-list-item-name {
margin-left: 36px; margin-left: 30px;
} }
.device-desktop .phabricator-application-menu { .device-desktop .phabricator-application-menu {
@ -346,22 +339,22 @@
vertical-align: top; vertical-align: top;
} }
.device-desktop .phabricator-application-menu a.phabricator-menu-item-view, .device-desktop .phabricator-application-menu a.phui-list-item-view,
.device-desktop .phabricator-application-menu .phabricator-menu-item-name { .device-desktop .phabricator-application-menu .phui-list-item-name {
display: none; display: none;
} }
.device-desktop .phabricator-application-menu .device-desktop .phabricator-application-menu
a.phabricator-menu-item-view.phabricator-core-menu-item { a.phui-list-item-view.phabricator-core-menu-item {
display: block; display: block;
} }
.device-desktop .phabricator-application-menu .device-desktop .phabricator-application-menu
a.phabricator-menu-item-view.phabricator-core-menu-item:hover { a.phui-list-item-view.phabricator-core-menu-item:hover {
background-color: #1e2225; background-color: #1e2225;
} }
.device-desktop .phabricator-application-menu .phabricator-menu-item-view { .device-desktop .phabricator-application-menu .phui-list-item-view {
display: block; display: block;
float: left; float: left;
position: relative; position: relative;
@ -401,10 +394,10 @@
} }
.device .phabricator-application-menu, .device .phabricator-application-menu,
.device-desktop .phabricator-dark-menu .phabricator-menu-item-type-label { .device-desktop .phabricator-dark-menu .phui-list-item-type-label {
display: none; display: none;
} }
.phabricator-application-menu .phabricator-menu-item-name { .phabricator-application-menu .phui-list-item-name {
padding-left: 12px; padding-left: 12px;
} }

60
webroot/rsrc/css/core/spacing.css
View file

@ -3,129 +3,129 @@
*/ */
.pl { .pl {
padding: 20px; padding: 16px;
} }
.pm { .pm {
padding: 10px; padding: 8px;
} }
.ps { .ps {
padding: 5px; padding: 4px;
} }
.ml { .ml {
margin: 20px; margin: 16px;
} }
.mm { .mm {
margin: 10px; margin: 8px;
} }
.ms { .ms {
margin: 5px; margin: 4px;
} }
/* left */ /* left */
.pll { .pll {
padding-left: 20px; padding-left: 16px;
} }
.pml { .pml {
padding-left: 10px padding-left: 8px
} }
.psl { .psl {
padding-left: 5px; padding-left: 4px;
} }
.mll { .mll {
margin-left: 20px; margin-left: 16px;
} }
.mml { .mml {
margin-left: 10px; margin-left: 8px;
} }
.msl { .msl {
margin-left: 5px; margin-left: 4px;
} }
/* Right */ /* Right */
.plr { .plr {
padding-right: 20px; padding-right: 16px;
} }
.pmr { .pmr {
padding-right: 10px; padding-right: 8px;
} }
.psr { .psr {
padding-right: 5px; padding-right: 4px;
} }
.mlr { .mlr {
margin-right: 20px; margin-right: 16px;
} }
.mmr { .mmr {
margin-right: 10px; margin-right: 8px;
} }
.msr { .msr {
margin-right: 5px; margin-right: 4px;
} }
/* Bottom */ /* Bottom */
.plb { .plb {
padding-bottom: 20px; padding-bottom: 16px;
} }
.pmb { .pmb {
padding-bottom: 10px; padding-bottom: 8px;
} }
.psb { .psb {
padding-bottom: 5px; padding-bottom: 4px;
} }
.mlb { .mlb {
margin-bottom: 20px; margin-bottom: 16px;
} }
.mmb { .mmb {
margin-bottom: 10px; margin-bottom: 8px;
} }
.msb { .msb {
margin-bottom: 5px; margin-bottom: 4px;
} }
/* Top */ /* Top */
.plt { .plt {
padding-top: 20px; padding-top: 16px;
} }
.pmt { .pmt {
padding-top: 10px; padding-top: 8px;
} }
.pst { .pst {
padding-top: 5px; padding-top: 4px;
} }
.mlt { .mlt {
margin-top: 20px; margin-top: 16px;
} }
.mmt { .mmt {
margin-top: 10px; margin-top: 8px;
} }
.mst { .mst {
margin-top: 5px; margin-top: 4px;
} }

19
webroot/rsrc/css/layout/phabricator-object-item-list-view.css
View file

@ -98,7 +98,7 @@
box-shadow: inset 1px 0 1px 0px rgba(0, 0, 0, 0.07); box-shadow: inset 1px 0 1px 0px rgba(0, 0, 0, 0.07);
} }
.phabricator-object-item-actions .phabricator-menu-item-view { .phabricator-object-item-actions .phui-list-item-view {
float: right; float: right;
height: 100%; height: 100%;
width: 24px; width: 24px;
@ -106,16 +106,23 @@
position: relative; position: relative;
} }
.phabricator-object-item-actions .phabricator-menu-item-view + .phabricator-object-item-actions .phui-list-item-view +
.phabricator-menu-item-view { .phui-list-item-view {
border-right: 1px solid #d6d6e9; border-right: 1px solid #d6d6e9;
} }
.phabricator-object-item-actions .phabricator-menu-item-view:hover { .phabricator-object-item-actions .phui-list-item-href {
display: inline-block;
position: relative;
width: 24px;
height: 100%;
}
.phabricator-object-item-actions .phui-list-item-href:hover {
background: #e9e9f9; background: #e9e9f9;
} }
.phabricator-object-item-actions .phabricator-menu-item-icon { .phabricator-object-item-actions .phui-list-item-icon {
width: 14px; width: 14px;
height: 14px; height: 14px;
position: absolute; position: absolute;
@ -125,7 +132,7 @@
left: 5px; left: 5px;
} }
.phabricator-object-item-actions .phabricator-menu-item-name { .phabricator-object-item-actions .phui-list-item-name {
display: none; display: none;
} }

21
webroot/rsrc/css/layout/phabricator-side-menu-view.css
View file

@ -2,27 +2,28 @@
* @provides phabricator-side-menu-view-css * @provides phabricator-side-menu-view-css
*/ */
.phabricator-side-menu .phabricator-menu-item-view { .phabricator-side-menu .phui-list-item-view {
display: block; display: block;
white-space: nowrap; white-space: nowrap;
text-decoration: none; text-decoration: none;
font-size: 13px; font-size: 13px;
} }
.phabricator-side-menu .phabricator-menu-item-type-link { .phabricator-side-menu .phui-list-item-href {
display: block;
padding: 6px 8px 6px 24px; padding: 6px 8px 6px 24px;
color: #e1e2e5; color: #e1e2e5;
text-shadow: rgba(0, 0, 0, 1) 0px 1px 1px; text-shadow: rgba(0, 0, 0, 1) 0px 1px 1px;
} }
.phabricator-side-menu .phabricator-menu-item-selected, .phabricator-side-menu .phui-list-item-selected,
.device-desktop .phabricator-side-menu .device-desktop .phui-side-menu
.phabricator-menu-item-selected.phabricator-menu-item-type-link:hover { .phui-list-item-selected.phui-list-item-href:hover {
background-color: #305c85; background-color: #305c85;
color: #fff; color: #fff;
} }
.phabricator-side-menu .phabricator-menu-item-type-label { .phabricator-side-menu .phui-list-item-type-label {
padding: 6px 8px 4px 12px; padding: 6px 8px 4px 12px;
color: #f7f7f7; color: #f7f7f7;
text-transform: uppercase; text-transform: uppercase;
@ -32,8 +33,8 @@
background-color: #000; background-color: #000;
} }
.phabricator-dark-menu .phabricator-menu-item-type-button, .phabricator-dark-menu .phui-list-item-type-button,
.phabricator-side-menu .phabricator-menu-item-type-button { .phabricator-side-menu .phui-list-item-type-button {
width: 50%; width: 50%;
padding: 5px 8px; padding: 5px 8px;
display: block; display: block;
@ -47,11 +48,11 @@
text-align: center; text-align: center;
} }
.phabricator-side-menu .phabricator-menu-item-type-button:hover { .phabricator-side-menu .phui-list-item-type-button:hover {
background-color: #1e2225; background-color: #1e2225;
} }
.device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover { .device-desktop .phabricator-side-menu a.phui-list-item-href:hover {
text-decoration: none; text-decoration: none;
background-color: #1e2225; background-color: #1e2225;
} }

4
webroot/rsrc/css/layout/phabricator-workpanel-view.css
View file

@ -32,13 +32,13 @@
border-radius: 3px; border-radius: 3px;
} }
.phabricator-workpanel-view .phabricator-menu-item-icon { .phabricator-workpanel-view .phui-list-item-icon {
height: 12px; height: 12px;
width: 12px; width: 12px;
display: inline-block; display: inline-block;
} }
.phabricator-workpanel-view .phabricator-menu-item-name { .phabricator-workpanel-view .phui-list-item-name {
padding-left: 5px; padding-left: 5px;
display: inline-block; display: inline-block;
} }

152
webroot/rsrc/css/phui/phui-document.css
View file

@ -3,16 +3,68 @@
*/ */
.phui-document-view { .phui-document-view {
margin-bottom: 20px; margin-bottom: 16px;
position: relative;
} }
.device-desktop .phui-document-view { .device-desktop .phui-document-view {
position: relative;
border-left: 1px solid #e7e7e7; border-left: 1px solid #e7e7e7;
border-right: 1px solid #e7e7e7; border-right: 1px solid #e7e7e7;
border-bottom: 1px solid #c0c5d1; border-bottom: 1px solid #c0c5d1;
max-width: 960px;
margin: 16px auto;
}
.device-desktop .phui-document-view.phui-offset-view {
max-width: 800px; max-width: 800px;
margin: 20px auto; }
.phui-document-sidenav {
position:absolute;
width: 182px;
text-overflow: ellipsis;
padding: 6px 8px 8px 8px;
top: 0;
right: 0;
}
.phui-sidenav-view .phui-document-inner {
margin-right: 200px;
border-right: 1px solid #e7e7e7;
background: #fff;
}
.phui-document-bookname {
padding: 8px 16px;
color: #9ca5b5;
}
.phui-document-bookname .bookname {
font-size: 14px;
font-weight: bold;
float: left;
}
.phui-document-bookname .bookdescription {
font-size: 14px;
float: right;
}
.phui-document-content .phabricator-header-shell {
background-color: #f6f7f8;
border-top: 1px solid #e7e7e7;
border-bottom: 1px solid #e7e7e7;
}
.phui-document-content .phabricator-header-view {
padding: 16px;
}
.phui-document-content .phabricator-property-list-view {
border: none;
box-shadow: none;
margin: 0;
background-color: #f6f7f8;
} }
.phui-document-content { .phui-document-content {
@ -37,16 +89,12 @@
background: #f7f7f7; background: #f7f7f7;
} }
.phui-document-content .phabricator-header-shell {
border-top: none;
}
.phui-document-content .phabricator-remarkup { .phui-document-content .phabricator-remarkup {
padding: 20px; padding: 16px;
} }
.device-phone .phui-document-content .phabricator-remarkup { .device-phone .phui-document-content .phabricator-remarkup {
padding: 10px; padding: 8px;
} }
.device-desktop .phui-document-content .phabricator-action-list-view { .device-desktop .phui-document-content .phabricator-action-list-view {
@ -70,9 +118,93 @@
.phui-document-content .phabricator-remarkup .remarkup-code-block { .phui-document-content .phabricator-remarkup .remarkup-code-block {
clear: both; clear: both;
margin: 20px 0; margin: 16px 0;
} }
.device-desktop .phui-document-offset { .device-desktop .phui-document-offset {
padding-right: 160px; padding-right: 160px;
} }
/* Sidenav */
.phui-document-sidenav .phui-list-item-view {
line-height: 20px;
}
.phui-document-sidenav .phui-list-item-type-link {
margin-left: 8px;
}
.phui-document-sidenav .phui-list-item-type-label .phui-list-item-name {
font-size: 12px;
font-weight: bold;
color: #9ca5b5;
text-transform: uppercase;
}
.phui-document-sidenav .phui-list-item-type-divider {
margin: 8px 0;
border-bottom: 1px solid #e7e7e7;
}
.phui-document-sidenav .phui-list-item-icon {
height: 14px;
width: 14px;
display: inline-block;
position: absolute;
top: 2px;
}
.phui-document-sidenav .phui-list-item-icon + .phui-list-item-name {
padding-left: 20px;
}
.phui-document-sidenav .phui-list-item-has-icon {
margin: 0;
position: relative;
}
.phui-document-sidenav .phui-list-item-has-icon .phui-list-item-href {
color: #000;
}
/* Topnav */
.phui-document-topnav .phui-list-view {
list-style: none;
overflow: hidden;
border-bottom: 1px solid #e7e7e7;
}
.phui-document-topnav .phui-list-view > li {
list-style: none;
float: left;
display: block;
border-right: 1px solid #e7e7e7;
}
.phui-document-topnav .phui-list-view > li > * {
display: block;
}
.phui-document-topnav .phui-list-item-href {
color: #9ca5b5;
padding: 8px 16px;
font-size: 12px;
}
.phui-document-topnav .phui-list-item-selected .phui-list-item-href {
background: #f6f7f8;
color: #555;
}
.phui-document-topnav .phui-list-item-href:hover {
background: #e8e9ec;
color: #555;
text-decoration: none;
}
.phui-document-topnav .phui-list-item-icon {
height: 14px;
width: 14px;
display: block;
}

16
webroot/rsrc/css/phui/phui-list.css Normal file
View file

@ -0,0 +1,16 @@
/**
* @provides phui-list-view-css
*/
.phui-list-item {
line-height: 16px;
}
.phui-list-item-header,
.phui-list-item-header a {
color: #9ca5b5;
text-transform: uppercase;
font-weight: bold;
font-size: 12px;
text-shadow: 0 1px 0 rgba(255,255,255,0.90);
}

6
webroot/rsrc/css/sprite-gradient.css
View file

@ -3,7 +3,7 @@
* @generated * @generated
*/ */
.sprite-gradient, .phabricator-dark-menu .phabricator-menu-item-type-label, .phabricator-side-menu .phabricator-menu-item-type-label { .sprite-gradient, .phabricator-dark-menu .phui-list-item-type-label, .phabricator-side-menu .phui-list-item-type-label {
background-image: url(/rsrc/image/sprite-gradient.png); background-image: url(/rsrc/image/sprite-gradient.png);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
@ -23,7 +23,7 @@
background-position: 0px -154px; background-position: 0px -154px;
} }
.gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label { .gradient-dark-menu-label, .phabricator-dark-menu .phui-list-item-type-label {
background-position: 0px -25px; background-position: 0px -25px;
} }
@ -35,7 +35,7 @@
background-position: 0px -296px; background-position: 0px -296px;
} }
.gradient-menu-label, .phabricator-side-menu .phabricator-menu-item-type-label { .gradient-menu-label, .phabricator-side-menu .phui-list-item-type-label {
background-position: 0px 0px; background-position: 0px 0px;
} }