1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 16:52:41 +01:00
This commit is contained in:
epriestley 2012-12-07 13:43:11 -08:00
parent abc79a2101
commit 54fe74d621
3 changed files with 56 additions and 70 deletions

View file

@ -2621,7 +2621,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-main-menu-view' => 'phabricator-main-menu-view' =>
array( array(
'uri' => '/res/acf54ce6/rsrc/css/application/base/main-menu-view.css', 'uri' => '/res/a29dfe00/rsrc/css/application/base/main-menu-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3227,7 +3227,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'6147bf7a' => 'eab98f7c' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -3265,7 +3265,7 @@ celerity_register_resource_map(array(
30 => 'phabricator-filetree-view-css', 30 => 'phabricator-filetree-view-css',
31 => 'phabricator-nav-view-css', 31 => 'phabricator-nav-view-css',
), ),
'uri' => '/res/pkg/6147bf7a/core.pkg.css', 'uri' => '/res/pkg/eab98f7c/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'5b0b945b' => '5b0b945b' =>
@ -3453,20 +3453,20 @@ celerity_register_resource_map(array(
'reverse' => 'reverse' =>
array( array(
'aphront-attached-file-view-css' => '7839ae2d', 'aphront-attached-file-view-css' => '7839ae2d',
'aphront-crumbs-view-css' => '6147bf7a', 'aphront-crumbs-view-css' => 'eab98f7c',
'aphront-dialog-view-css' => '6147bf7a', 'aphront-dialog-view-css' => 'eab98f7c',
'aphront-error-view-css' => '6147bf7a', 'aphront-error-view-css' => 'eab98f7c',
'aphront-form-view-css' => '6147bf7a', 'aphront-form-view-css' => 'eab98f7c',
'aphront-headsup-action-list-view-css' => 'c904bbee', 'aphront-headsup-action-list-view-css' => 'c904bbee',
'aphront-headsup-view-css' => '6147bf7a', 'aphront-headsup-view-css' => 'eab98f7c',
'aphront-list-filter-view-css' => '6147bf7a', 'aphront-list-filter-view-css' => 'eab98f7c',
'aphront-pager-view-css' => '6147bf7a', 'aphront-pager-view-css' => 'eab98f7c',
'aphront-panel-view-css' => '6147bf7a', 'aphront-panel-view-css' => 'eab98f7c',
'aphront-side-nav-view-css' => '6147bf7a', 'aphront-side-nav-view-css' => 'eab98f7c',
'aphront-table-view-css' => '6147bf7a', 'aphront-table-view-css' => 'eab98f7c',
'aphront-tokenizer-control-css' => '6147bf7a', 'aphront-tokenizer-control-css' => 'eab98f7c',
'aphront-tooltip-css' => '6147bf7a', 'aphront-tooltip-css' => 'eab98f7c',
'aphront-typeahead-control-css' => '6147bf7a', 'aphront-typeahead-control-css' => 'eab98f7c',
'differential-changeset-view-css' => 'c904bbee', 'differential-changeset-view-css' => 'c904bbee',
'differential-core-view-css' => 'c904bbee', 'differential-core-view-css' => 'c904bbee',
'differential-inline-comment-editor' => '7ecd31fa', 'differential-inline-comment-editor' => '7ecd31fa',
@ -3547,42 +3547,42 @@ celerity_register_resource_map(array(
'javelin-util' => 'db6d724d', 'javelin-util' => 'db6d724d',
'javelin-vector' => 'db6d724d', 'javelin-vector' => 'db6d724d',
'javelin-workflow' => 'db6d724d', 'javelin-workflow' => 'db6d724d',
'lightbox-attachment-css' => '6147bf7a', 'lightbox-attachment-css' => 'eab98f7c',
'maniphest-task-summary-css' => '7839ae2d', 'maniphest-task-summary-css' => '7839ae2d',
'maniphest-transaction-detail-css' => '7839ae2d', 'maniphest-transaction-detail-css' => '7839ae2d',
'phabricator-app-buttons-css' => '6147bf7a', 'phabricator-app-buttons-css' => 'eab98f7c',
'phabricator-busy' => '5b0b945b', 'phabricator-busy' => '5b0b945b',
'phabricator-content-source-view-css' => 'c904bbee', 'phabricator-content-source-view-css' => 'c904bbee',
'phabricator-core-buttons-css' => '6147bf7a', 'phabricator-core-buttons-css' => 'eab98f7c',
'phabricator-core-css' => '6147bf7a', 'phabricator-core-css' => 'eab98f7c',
'phabricator-directory-css' => '6147bf7a', 'phabricator-directory-css' => 'eab98f7c',
'phabricator-drag-and-drop-file-upload' => '7ecd31fa', 'phabricator-drag-and-drop-file-upload' => '7ecd31fa',
'phabricator-dropdown-menu' => '5b0b945b', 'phabricator-dropdown-menu' => '5b0b945b',
'phabricator-file-upload' => '5b0b945b', 'phabricator-file-upload' => '5b0b945b',
'phabricator-filetree-view-css' => '6147bf7a', 'phabricator-filetree-view-css' => 'eab98f7c',
'phabricator-flag-css' => '6147bf7a', 'phabricator-flag-css' => 'eab98f7c',
'phabricator-form-view-css' => '6147bf7a', 'phabricator-form-view-css' => 'eab98f7c',
'phabricator-header-view-css' => '6147bf7a', 'phabricator-header-view-css' => 'eab98f7c',
'phabricator-jump-nav' => '6147bf7a', 'phabricator-jump-nav' => 'eab98f7c',
'phabricator-keyboard-shortcut' => '5b0b945b', 'phabricator-keyboard-shortcut' => '5b0b945b',
'phabricator-keyboard-shortcut-manager' => '5b0b945b', 'phabricator-keyboard-shortcut-manager' => '5b0b945b',
'phabricator-main-menu-view' => '6147bf7a', 'phabricator-main-menu-view' => 'eab98f7c',
'phabricator-menu-item' => '5b0b945b', 'phabricator-menu-item' => '5b0b945b',
'phabricator-nav-view-css' => '6147bf7a', 'phabricator-nav-view-css' => 'eab98f7c',
'phabricator-notification' => '5b0b945b', 'phabricator-notification' => '5b0b945b',
'phabricator-notification-css' => '6147bf7a', 'phabricator-notification-css' => 'eab98f7c',
'phabricator-notification-menu-css' => '6147bf7a', 'phabricator-notification-menu-css' => 'eab98f7c',
'phabricator-object-selector-css' => 'c904bbee', 'phabricator-object-selector-css' => 'c904bbee',
'phabricator-paste-file-upload' => '5b0b945b', 'phabricator-paste-file-upload' => '5b0b945b',
'phabricator-prefab' => '5b0b945b', 'phabricator-prefab' => '5b0b945b',
'phabricator-project-tag-css' => '7839ae2d', 'phabricator-project-tag-css' => '7839ae2d',
'phabricator-remarkup-css' => '6147bf7a', 'phabricator-remarkup-css' => 'eab98f7c',
'phabricator-shaped-request' => '7ecd31fa', 'phabricator-shaped-request' => '7ecd31fa',
'phabricator-standard-page-view' => '6147bf7a', 'phabricator-standard-page-view' => 'eab98f7c',
'phabricator-textareautils' => '5b0b945b', 'phabricator-textareautils' => '5b0b945b',
'phabricator-tooltip' => '5b0b945b', 'phabricator-tooltip' => '5b0b945b',
'phabricator-transaction-view-css' => '6147bf7a', 'phabricator-transaction-view-css' => 'eab98f7c',
'sprite-icon-css' => '6147bf7a', 'sprite-icon-css' => 'eab98f7c',
'syntax-highlighting-css' => '6147bf7a', 'syntax-highlighting-css' => 'eab98f7c',
), ),
)); ));

View file

@ -50,49 +50,25 @@ final class PhabricatorMainMenuView extends AphrontView {
$header_id = celerity_generate_unique_node_id(); $header_id = celerity_generate_unique_node_id();
$menus = array(); $menus = array();
$alerts = array();
$group = new PhabricatorMainMenuGroupView();
$group->addClass('phabricator-main-menu-group-logo');
$group->setCollapsible(false);
$group->appendChild(
phutil_render_tag(
'a',
array(
'class' => 'phabricator-main-menu-logo',
'href' => '/',
),
''));
if (PhabricatorEnv::getEnvConfig('notification.enabled') && if (PhabricatorEnv::getEnvConfig('notification.enabled') &&
$user->isLoggedIn()) { $user->isLoggedIn()) {
list($menu, $dropdown) = $this->renderNotificationMenu(); list($menu, $dropdown) = $this->renderNotificationMenu();
$group->appendChild($menu); $alerts[] = $menu;
$menus[] = $dropdown; $menus[] = $dropdown;
} }
$group->appendChild(
javelin_render_tag(
'a',
array(
'class' => 'phabricator-main-menu-expand-button',
'sigil' => 'jx-toggle-class',
'meta' => array(
'map' => array(
$header_id => 'phabricator-core-menu-expand',
),
),
),
''));
$logo = $group->render();
$phabricator_menu = $this->renderPhabricatorMenu(); $phabricator_menu = $this->renderPhabricatorMenu();
// $menus[] = $this->renderApplicationMenu();
if ($alerts) {
$alerts = phutil_render_tag(
'div',
$actions = ''; array(
'class' => 'phabricator-main-menu-alerts',
),
self::renderSingleView($alerts));
}
$application_menu = $this->getApplicationMenu(); $application_menu = $this->getApplicationMenu();
if ($application_menu) { if ($application_menu) {
@ -305,6 +281,16 @@ final class PhabricatorMainMenuView extends AphrontView {
return $view; return $view;
} }
private function renderPhabricatorLogo() {
return phutil_render_tag(
'a',
array(
'class' => 'phabricator-main-menu-logo',
'href' => '/',
),
'');
}
private function renderNotificationMenu() { private function renderNotificationMenu() {
$user = $this->user; $user = $this->user;

View file

@ -1,4 +1,4 @@
<<</** /**
* @provides phabricator-main-menu-view * @provides phabricator-main-menu-view
*/ */