From eeb80ba96b59b3a00ebc0512a96a64ba6124ae3d Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Wed, 30 Nov 2016 09:56:43 -0800
Subject: [PATCH] Add sidenav back to workboards

Summary: This is still reasonably functional and useful to people, and we don't have better mechanics to offset the change.

Test Plan: New Workboard, set Workboard color, test mobile, desktop.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16964
---
 resources/celerity/map.php                    |  8 +++---
 .../PhabricatorProjectBoardViewController.php |  3 ++
 .../phui/workboards/phui-workboard-color.css  | 28 +++++++++++++++++++
 .../css/phui/workboards/phui-workboard.css    | 21 ++++++++++++--
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f5b7e95810..e9e01f77cd 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -166,8 +166,8 @@ return array(
     'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
     'rsrc/css/phui/phui-timeline-view.css' => 'bc523970',
     'rsrc/css/phui/phui-two-column-view.css' => 'bbe32c23',
-    'rsrc/css/phui/workboards/phui-workboard-color.css' => '207828dd',
-    'rsrc/css/phui/workboards/phui-workboard.css' => '60d09514',
+    'rsrc/css/phui/workboards/phui-workboard-color.css' => 'b60ef38a',
+    'rsrc/css/phui/workboards/phui-workboard.css' => '16441d5e',
     'rsrc/css/phui/workboards/phui-workcard.css' => '0c62d7c5',
     'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373',
     'rsrc/css/sprite-login.css' => '6dbbbd97',
@@ -885,8 +885,8 @@ return array(
     'phui-theme-css' => '798c69b8',
     'phui-timeline-view-css' => 'bc523970',
     'phui-two-column-view-css' => 'bbe32c23',
-    'phui-workboard-color-css' => '207828dd',
-    'phui-workboard-view-css' => '60d09514',
+    'phui-workboard-color-css' => 'b60ef38a',
+    'phui-workboard-view-css' => '16441d5e',
     'phui-workcard-view-css' => '0c62d7c5',
     'phui-workpanel-view-css' => '92197373',
     'phuix-action-list-view' => 'b5c256b8',
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 93ff739a90..da992d9b19 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -416,6 +416,8 @@ final class PhabricatorProjectBoardViewController
       ->appendChild($board)
       ->addClass('project-board-wrapper');
 
+    $nav = $this->getProfileMenu();
+
     $divider = id(new PHUIListItemView())
       ->setType(PHUIListItemView::TYPE_DIVIDER);
     $fullscreen = $this->buildFullscreenMenu();
@@ -438,6 +440,7 @@ final class PhabricatorProjectBoardViewController
         ))
       ->setPageObjectPHIDs(array($project->getPHID()))
       ->setShowFooter(false)
+      ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->addQuicksandConfig(
         array(
diff --git a/webroot/rsrc/css/phui/workboards/phui-workboard-color.css b/webroot/rsrc/css/phui/workboards/phui-workboard-color.css
index c8b514e23a..13c9847af9 100644
--- a/webroot/rsrc/css/phui/workboards/phui-workboard-color.css
+++ b/webroot/rsrc/css/phui/workboards/phui-workboard-color.css
@@ -2,6 +2,10 @@
  * @provides phui-workboard-color-css
  */
 
+.phui-workboard-color .phabricator-nav-content .phui-workboard-view-shadow {
+  background-color: transparent;
+}
+
 .phui-workboard-color .phui-crumbs-view {
   background-color: rgba({$alphagrey},.15);
   border: none;
@@ -26,12 +30,36 @@
   background-color: rgba({$alphawhite},.6);
 }
 
+body.phui-workboard-color .phui-profile-menu .phabricator-side-menu {
+  background-color: rgba({$alphagrey},.3);
+}
+
+body.phui-workboard-color .phabricator-side-menu .phui-profile-menu-footer-1 {
+  background-color: transparent;
+}
+
+.phui-workboard-color .phui-profile-menu .phabricator-side-menu {
+  box-shadow: none;
+}
+
 .phui-workboard-color-preview {
   width: 50px;
   height: 50px;
   font-size: 34px;
 }
 
+.phui-workboard-color .phui-profile-menu .phabricator-side-menu
+  .phui-list-item-href {
+    color: rgba({$alphawhite},.8);
+}
+
+.phui-workboard-color .phui-profile-menu .phabricator-side-menu
+  .phui-list-item-icon,
+.phui-workboard-color .phui-profile-menu .phabricator-side-menu
+  .phui-list-item-href .phui-list-item-icon {
+    color: rgba({$alphawhite},.8);
+}
+
 /* Gradients */
 
 .phui-workboard-gradient-red {
diff --git a/webroot/rsrc/css/phui/workboards/phui-workboard.css b/webroot/rsrc/css/phui/workboards/phui-workboard.css
index a14e5e7ae6..4a5446bf5b 100644
--- a/webroot/rsrc/css/phui/workboards/phui-workboard.css
+++ b/webroot/rsrc/css/phui/workboards/phui-workboard.css
@@ -31,6 +31,15 @@
   background: {$lightbluetext};
 }
 
+.device-desktop .project-board-wrapper .phui-workboard-view-shadow {
+  left: {$menu.profile.width};
+}
+
+.device-desktop .phui-profile-menu-collapsed .project-board-wrapper
+  .phui-workboard-view-shadow {
+  left: {$menu.profile.width.collapsed};
+}
+
 !print .project-board-wrapper .phui-workboard-view-shadow {
   position: static;
 }
@@ -65,15 +74,21 @@
   display: none;
 }
 
-.device-desktop .phui-workboard-fullscreen .phui-workboard-view-shadow {
-  top: 35px;
-  left: 0;
+.device-desktop .phui-workboard-fullscreen .phui-profile-menu
+  .phui-workboard-view-shadow {
+    top: 35px;
+    left: 0;
 }
 
 .device-desktop .phui-workboard-fullscreen .phui-workpanel-body-content {
   max-height: calc(100vh - 120px);
 }
 
+.device-desktop .phui-workboard-fullscreen .phui-profile-menu
+  .phabricator-nav-local {
+    display: none;
+}
+
 .device .phui-workboard-expand-icon {
   display: none;
 }