Page MenuHomePhabricator
Files F15524155

D15017.id36269.diff
No OneTemporary
Actions

D15017.id36269.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'a29c91b0',
+ 'core.pkg.css' => '50a1c6bd',
'core.pkg.js' => '6ae03393',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9',
@@ -143,7 +143,7 @@
'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
- 'rsrc/css/phui/phui-profile-menu.css' => '5a1644af',
+ 'rsrc/css/phui/phui-profile-menu.css' => '213398e6',
'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -821,7 +821,7 @@
'phui-object-item-list-view-css' => '26c30d3f',
'phui-pager-css' => 'bea33d23',
'phui-pinboard-view-css' => '2495140e',
- 'phui-profile-menu-css' => '5a1644af',
+ 'phui-profile-menu-css' => '213398e6',
'phui-property-list-view-css' => '27b2849e',
'phui-remarkup-preview-css' => '1a8f2591',
'phui-spacing-css' => '042804d6',
diff --git a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
--- a/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
+++ b/src/applications/celerity/postprocessor/CelerityDefaultPostprocessor.php
@@ -197,6 +197,8 @@
'menu.profile.icon' => '#ffffff',
'menu.profile.icon.disabled' => '#b9bcc2',
+ 'menu.main.height' => '44px',
+
);
}
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -29,11 +29,13 @@
private $menuID;
private $iconNav;
private $isProfileMenu;
+ private $footer = array();
public function setMenuID($menu_id) {
$this->menuID = $menu_id;
return $this;
}
+
public function getMenuID() {
return $this->menuID;
}
@@ -187,6 +189,11 @@
return $this->selectedFilter;
}
+ public function appendFooter($footer) {
+ $this->footer[] = $footer;
+ return $this;
+ }
+
public function render() {
if ($this->menu->getItems()) {
if (!$this->baseURI) {
@@ -220,7 +227,7 @@
if ($this->getIsProfileMenu()) {
require_celerity_resource('phui-profile-menu-css');
- $nav_classes[] = 'phui-profile-menu';
+ // No class, we're going to put it on the shell instead.
} else if ($this->iconNav) {
$nav_classes[] = 'phabricator-icon-nav';
} else {
@@ -301,7 +308,17 @@
$nav_classes = array_merge($nav_classes, $this->classes);
- return phutil_tag(
+ $footer = $this->footer;
+
+ if ($this->getIsProfileMenu()) {
+ $internal_footer = $footer;
+ $external_footer = null;
+ } else {
+ $internal_footer = null;
+ $external_footer = $footer;
+ }
+
+ $menu = phutil_tag(
'div',
array(
'class' => implode(' ', $nav_classes),
@@ -319,8 +336,27 @@
array(
$crumbs,
$this->renderChildren(),
+ $internal_footer,
)),
));
+
+ if ($this->getIsProfileMenu()) {
+ $shell = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-navigation-shell phui-profile-menu',
+ ),
+ array(
+ $menu,
+ ));
+ } else {
+ $shell = array(
+ $menu,
+ $external_footer,
+ );
+ }
+
+ return $shell;
}
}
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -478,6 +478,8 @@
$body = parent::getBody();
+ $footer = $this->renderFooter();
+
$nav = $this->getNavigation();
if ($nav) {
$crumbs = $this->getCrumbs();
@@ -485,18 +487,25 @@
$nav->setCrumbs($crumbs);
}
$nav->appendChild($body);
- $body = phutil_implode_html('', array($nav->render()));
+ $nav->appendFooter($footer);
+ $content = phutil_implode_html('', array($nav->render()));
} else {
+ $contnet = array();
+
$crumbs = $this->getCrumbs();
if ($crumbs) {
- $body = phutil_implode_html('', array($crumbs, $body));
+ $content[] = $crumbs;
}
+
+ $content[] = $body;
+ $content[] = $footer;
+
+ $content = phutil_implode_html('', $content);
}
return array(
($console ? hsprintf('<darkconsole />') : null),
- $body,
- $this->renderFooter(),
+ $content,
);
}
diff --git a/webroot/rsrc/css/phui/phui-profile-menu.css b/webroot/rsrc/css/phui/phui-profile-menu.css
--- a/webroot/rsrc/css/phui/phui-profile-menu.css
+++ b/webroot/rsrc/css/phui/phui-profile-menu.css
@@ -2,22 +2,32 @@
* @provides phui-profile-menu-css
*/
-.phui-profile-menu .phabricator-side-menu {
- background: {$menu.profile.background};
- box-shadow: inset -2px 0 2px rgba(0, 0, 0, 0.150);
- width: 240px;
+.device-desktop .phui-navigation-shell.phui-profile-menu {
+ display: table;
+ height: calc(100vh - {$menu.main.height});
+}
+
+.device-desktop .phui-profile-menu .phabricator-nav {
+ display: table-row;
}
-.phui-profile-menu .phabricator-nav-local {
+.device-desktop .phui-profile-menu .phabricator-nav-local {
+ display: table-cell;
+ position: relative;
+ vertical-align: top;
+ width: 240px;
margin-top: 0;
}
.device-desktop .phui-profile-menu .phabricator-nav-content {
- margin-left: 240px;
+ display: table-cell;
+ margin-left: 0;
}
-.device-desktop .phui-profile-menu + .phabricator-standard-page-footer {
- margin-left: 256px;
+.phui-profile-menu .phabricator-side-menu {
+ background: {$menu.profile.background};
+ box-shadow: inset -2px 0 2px rgba(0, 0, 0, 0.150);
+ width: 240px;
}
.phui-profile-menu .phabricator-side-menu .phui-list-item-view {

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 22, 6:16 AM (1 d, 15 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705639
Default Alt Text
D15017.id36269.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility