diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ 'names' => array( 'conpherence.pkg.css' => '0b64e988', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => '85f51b68', + 'core.pkg.css' => 'e75e4f9d', 'core.pkg.js' => 'f70cb91f', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '9535a7e6', @@ -34,7 +34,7 @@ 'rsrc/css/aphront/typeahead.css' => 'd4f16145', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '0877ed6e', - 'rsrc/css/application/base/main-menu-view.css' => '7bc94bc2', + 'rsrc/css/application/base/main-menu-view.css' => '8eac4166', 'rsrc/css/application/base/notification-menu.css' => '6a697e43', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601', 'rsrc/css/application/base/phui-theme.css' => '798c69b8', @@ -798,7 +798,7 @@ 'phabricator-flag-css' => 'bba8f811', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => '4a021c10', - 'phabricator-main-menu-view' => '7bc94bc2', + 'phabricator-main-menu-view' => '8eac4166', 'phabricator-nav-view-css' => 'b29426e9', 'phabricator-notification' => 'ccf1cbf8', 'phabricator-notification-css' => '3f6c89c9', @@ -1502,9 +1502,6 @@ 'owners-path-editor', 'javelin-behavior', ), - '7bc94bc2' => array( - 'phui-theme-css', - ), '7cbe244b' => array( 'javelin-install', 'javelin-util', @@ -1618,6 +1615,9 @@ 'javelin-stratcom', 'javelin-util', ), + '8eac4166' => array( + 'phui-theme-css', + ), '8ff5e24c' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/src/applications/home/application/PhabricatorHomeApplication.php b/src/applications/home/application/PhabricatorHomeApplication.php --- a/src/applications/home/application/PhabricatorHomeApplication.php +++ b/src/applications/home/application/PhabricatorHomeApplication.php @@ -86,14 +86,29 @@ PhabricatorUser $viewer, $application) { + $person_to_show = id(new PHUIObjectItemView()) + ->setObjectName($viewer->getRealName()) + ->setSubHead($viewer->getUsername()) + ->setImageURI($viewer->getProfileImageURI()); + + $user_view = id(new PHUIObjectItemListView()) + ->setViewer($viewer) + ->setFlush(true) + ->setSimple(true) + ->addItem($person_to_show) + ->addClass('phabricator-core-user-profile-object'); + $view = id(new PhabricatorActionListView()) ->setViewer($viewer); // User Menu $view->addAction( id(new PhabricatorActionView()) - ->setName($viewer->getRealName()) - ->setLabel(true)); + ->appendChild($user_view)); + + $view->addAction( + id(new PhabricatorActionView()) + ->setType(PhabricatorActionView::TYPE_DIVIDER)); $view->addAction( id(new PhabricatorActionView()) @@ -131,6 +146,7 @@ ->setName(pht('Log Out %s', $viewer->getUsername())) ->addSigil('logout-item') ->setHref('/logout/') + ->setColor(PhabricatorActionView::RED) ->setWorkflow(true)); return $view; diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php --- a/src/view/layout/PhabricatorActionView.php +++ b/src/view/layout/PhabricatorActionView.php @@ -284,7 +284,7 @@ 'class' => 'phabricator-action-view-item', 'sigil' => $sigils, ), - array($icon, $this->name)); + array($icon, $this->name, $this->renderChildren())); } $classes = array(); diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -627,6 +627,29 @@ margin: 3px 0 0 0; } +ul.phabricator-core-user-profile-object .phui-oi-objname { + font-size: {$biggestfontsize}; +} + +ul.phabricator-core-user-profile-object li.phui-oi, +ul.phabricator-core-user-profile-object .phui-oi-name, +ul.phabricator-core-user-profile-object .phui-oi-content, +ul.phabricator-core-user-profile-object .phui-oi-subhead { + padding: 0; + margin: 0; +} + +ul.phabricator-core-user-profile-object.phui-oi-list-simple .phui-oi-image { + height: 36px; + width: 36px; +} + +ul.phabricator-core-user-profile-object.phui-oi-list-simple + .phui-oi-content-box { + margin-left: 44px; +} + + /* - Print --------------------------------------------------------------------- */