Remove all older-style navs

Summary: Move all navs to use the newer-style, darker, textured look. I'm //pretty// sure this doesn't break anything.

Test Plan: Looked at a bunch of apps.

Reviewers: btrahan, chad

Reviewed By: chad

CC: aran

Differential Revision: https://secure.phabricator.com/D4376

Author: epriestley

scripts/celerity_mapper.php

@@ -66,7 +66,6 @@
     'aphront-dialog-view-css',
     'aphront-form-view-css',
     'aphront-panel-view-css',
-    'aphront-side-nav-view-css',
     'aphront-table-view-css',
     'aphront-crumbs-view-css',
     'aphront-tokenizer-control-css',

src/__celerity_resource_map__.php

@@ -679,15 +679,6 @@
     ),
     'disk' => '/rsrc/css/aphront/request-failure-view.css',
   ),
-  'aphront-side-nav-view-css' =>
-  array(
-    'uri' => '/res/f697dc9b/rsrc/css/aphront/side-nav-view.css',
-    'type' => 'css',
-    'requires' =>
-    array(
-    ),
-    'disk' => '/rsrc/css/aphront/side-nav-view.css',
-  ),
   'aphront-table-view-css' =>
   array(
     'uri' => '/res/94d76d56/rsrc/css/aphront/table-view.css',
@@ -3241,7 +3232,7 @@
 ), array(
   'packages' =>
   array(
-    '3c048ceb' =>
+    'd169975b' =>
     array(
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -3253,41 +3244,40 @@
         4 => 'aphront-dialog-view-css',
         5 => 'aphront-form-view-css',
         6 => 'aphront-panel-view-css',
-        7 => 'aphront-side-nav-view-css',
-        8 => 'aphront-table-view-css',
-        9 => 'aphront-crumbs-view-css',
-        10 => 'aphront-tokenizer-control-css',
-        11 => 'aphront-typeahead-control-css',
-        12 => 'aphront-list-filter-view-css',
-        13 => 'phabricator-directory-css',
-        14 => 'phabricator-jump-nav',
-        15 => 'phabricator-app-buttons-css',
-        16 => 'phabricator-remarkup-css',
-        17 => 'syntax-highlighting-css',
-        18 => 'aphront-pager-view-css',
-        19 => 'phabricator-transaction-view-css',
-        20 => 'aphront-tooltip-css',
-        21 => 'aphront-headsup-view-css',
-        22 => 'phabricator-flag-css',
-        23 => 'aphront-error-view-css',
-        24 => 'sprite-icon-css',
-        25 => 'sprite-gradient-css',
-        26 => 'sprite-menu-css',
-        27 => 'sprite-apps-large-css',
-        28 => 'phabricator-main-menu-view',
-        29 => 'phabricator-notification-css',
-        30 => 'phabricator-notification-menu-css',
-        31 => 'lightbox-attachment-css',
-        32 => 'phabricator-header-view-css',
-        33 => 'phabricator-form-view-css',
-        34 => 'phabricator-filetree-view-css',
-        35 => 'phabricator-nav-view-css',
-        36 => 'phabricator-side-menu-view-css',
-        37 => 'phabricator-crumbs-view-css',
-        38 => 'phabricator-object-item-list-view-css',
-        39 => 'global-drag-and-drop-css',
+        7 => 'aphront-table-view-css',
+        8 => 'aphront-crumbs-view-css',
+        9 => 'aphront-tokenizer-control-css',
+        10 => 'aphront-typeahead-control-css',
+        11 => 'aphront-list-filter-view-css',
+        12 => 'phabricator-directory-css',
+        13 => 'phabricator-jump-nav',
+        14 => 'phabricator-app-buttons-css',
+        15 => 'phabricator-remarkup-css',
+        16 => 'syntax-highlighting-css',
+        17 => 'aphront-pager-view-css',
+        18 => 'phabricator-transaction-view-css',
+        19 => 'aphront-tooltip-css',
+        20 => 'aphront-headsup-view-css',
+        21 => 'phabricator-flag-css',
+        22 => 'aphront-error-view-css',
+        23 => 'sprite-icon-css',
+        24 => 'sprite-gradient-css',
+        25 => 'sprite-menu-css',
+        26 => 'sprite-apps-large-css',
+        27 => 'phabricator-main-menu-view',
+        28 => 'phabricator-notification-css',
+        29 => 'phabricator-notification-menu-css',
+        30 => 'lightbox-attachment-css',
+        31 => 'phabricator-header-view-css',
+        32 => 'phabricator-form-view-css',
+        33 => 'phabricator-filetree-view-css',
+        34 => 'phabricator-nav-view-css',
+        35 => 'phabricator-side-menu-view-css',
+        36 => 'phabricator-crumbs-view-css',
+        37 => 'phabricator-object-item-list-view-css',
+        38 => 'global-drag-and-drop-css',
       ),
-      'uri' => '/res/pkg/3c048ceb/core.pkg.css',
+      'uri' => '/res/pkg/d169975b/core.pkg.css',
       'type' => 'css',
     ),
     '2921e259' =>
@@ -3476,20 +3466,19 @@
   'reverse' =>
   array(
     'aphront-attached-file-view-css' => 'ac211174',
-    'aphront-crumbs-view-css' => '3c048ceb',
-    'aphront-dialog-view-css' => '3c048ceb',
-    'aphront-error-view-css' => '3c048ceb',
-    'aphront-form-view-css' => '3c048ceb',
+    'aphront-crumbs-view-css' => 'd169975b',
+    'aphront-dialog-view-css' => 'd169975b',
+    'aphront-error-view-css' => 'd169975b',
+    'aphront-form-view-css' => 'd169975b',
     'aphront-headsup-action-list-view-css' => '20933a11',
-    'aphront-headsup-view-css' => '3c048ceb',
-    'aphront-list-filter-view-css' => '3c048ceb',
-    'aphront-pager-view-css' => '3c048ceb',
-    'aphront-panel-view-css' => '3c048ceb',
-    'aphront-side-nav-view-css' => '3c048ceb',
-    'aphront-table-view-css' => '3c048ceb',
-    'aphront-tokenizer-control-css' => '3c048ceb',
-    'aphront-tooltip-css' => '3c048ceb',
-    'aphront-typeahead-control-css' => '3c048ceb',
+    'aphront-headsup-view-css' => 'd169975b',
+    'aphront-list-filter-view-css' => 'd169975b',
+    'aphront-pager-view-css' => 'd169975b',
+    'aphront-panel-view-css' => 'd169975b',
+    'aphront-table-view-css' => 'd169975b',
+    'aphront-tokenizer-control-css' => 'd169975b',
+    'aphront-tooltip-css' => 'd169975b',
+    'aphront-typeahead-control-css' => 'd169975b',
     'differential-changeset-view-css' => '20933a11',
     'differential-core-view-css' => '20933a11',
     'differential-inline-comment-editor' => '76556a8f',
@@ -3503,7 +3492,7 @@
     'differential-table-of-contents-css' => '20933a11',
     'diffusion-commit-view-css' => 'c8ce2d88',
     'diffusion-icons-css' => 'c8ce2d88',
-    'global-drag-and-drop-css' => '3c048ceb',
+    'global-drag-and-drop-css' => 'd169975b',
     'inline-comment-summary-css' => '20933a11',
     'javelin-aphlict' => '2921e259',
     'javelin-behavior' => 'fbeded59',
@@ -3572,49 +3561,49 @@
     'javelin-util' => 'fbeded59',
     'javelin-vector' => 'fbeded59',
     'javelin-workflow' => 'fbeded59',
-    'lightbox-attachment-css' => '3c048ceb',
+    'lightbox-attachment-css' => 'd169975b',
     'maniphest-task-summary-css' => 'ac211174',
     'maniphest-transaction-detail-css' => 'ac211174',
-    'phabricator-app-buttons-css' => '3c048ceb',
+    'phabricator-app-buttons-css' => 'd169975b',
     'phabricator-busy' => '2921e259',
     'phabricator-content-source-view-css' => '20933a11',
-    'phabricator-core-buttons-css' => '3c048ceb',
-    'phabricator-core-css' => '3c048ceb',
-    'phabricator-crumbs-view-css' => '3c048ceb',
-    'phabricator-directory-css' => '3c048ceb',
+    'phabricator-core-buttons-css' => 'd169975b',
+    'phabricator-core-css' => 'd169975b',
+    'phabricator-crumbs-view-css' => 'd169975b',
+    'phabricator-directory-css' => 'd169975b',
     'phabricator-drag-and-drop-file-upload' => '76556a8f',
     'phabricator-dropdown-menu' => '2921e259',
     'phabricator-file-upload' => '2921e259',
-    'phabricator-filetree-view-css' => '3c048ceb',
-    'phabricator-flag-css' => '3c048ceb',
-    'phabricator-form-view-css' => '3c048ceb',
-    'phabricator-header-view-css' => '3c048ceb',
-    'phabricator-jump-nav' => '3c048ceb',
+    'phabricator-filetree-view-css' => 'd169975b',
+    'phabricator-flag-css' => 'd169975b',
+    'phabricator-form-view-css' => 'd169975b',
+    'phabricator-header-view-css' => 'd169975b',
+    'phabricator-jump-nav' => 'd169975b',
     'phabricator-keyboard-shortcut' => '2921e259',
     'phabricator-keyboard-shortcut-manager' => '2921e259',
-    'phabricator-main-menu-view' => '3c048ceb',
+    'phabricator-main-menu-view' => 'd169975b',
     'phabricator-menu-item' => '2921e259',
-    'phabricator-nav-view-css' => '3c048ceb',
+    'phabricator-nav-view-css' => 'd169975b',
     'phabricator-notification' => '2921e259',
-    'phabricator-notification-css' => '3c048ceb',
-    'phabricator-notification-menu-css' => '3c048ceb',
-    'phabricator-object-item-list-view-css' => '3c048ceb',
+    'phabricator-notification-css' => 'd169975b',
+    'phabricator-notification-menu-css' => 'd169975b',
+    'phabricator-object-item-list-view-css' => 'd169975b',
     'phabricator-object-selector-css' => '20933a11',
     'phabricator-paste-file-upload' => '2921e259',
     'phabricator-prefab' => '2921e259',
     'phabricator-project-tag-css' => 'ac211174',
-    'phabricator-remarkup-css' => '3c048ceb',
+    'phabricator-remarkup-css' => 'd169975b',
     'phabricator-shaped-request' => '76556a8f',
-    'phabricator-side-menu-view-css' => '3c048ceb',
-    'phabricator-standard-page-view' => '3c048ceb',
+    'phabricator-side-menu-view-css' => 'd169975b',
+    'phabricator-standard-page-view' => 'd169975b',
     'phabricator-textareautils' => '2921e259',
     'phabricator-tooltip' => '2921e259',
-    'phabricator-transaction-view-css' => '3c048ceb',
-    'phabricator-zindex-css' => '3c048ceb',
-    'sprite-apps-large-css' => '3c048ceb',
-    'sprite-gradient-css' => '3c048ceb',
-    'sprite-icon-css' => '3c048ceb',
-    'sprite-menu-css' => '3c048ceb',
-    'syntax-highlighting-css' => '3c048ceb',
+    'phabricator-transaction-view-css' => 'd169975b',
+    'phabricator-zindex-css' => 'd169975b',
+    'sprite-apps-large-css' => 'd169975b',
+    'sprite-gradient-css' => 'd169975b',
+    'sprite-icon-css' => 'd169975b',
+    'sprite-menu-css' => 'd169975b',
+    'syntax-highlighting-css' => 'd169975b',
   ),
 ));

src/applications/base/controller/PhabricatorController.php

@@ -160,7 +160,6 @@ public function buildApplicationPage($view, array $options) {
     }
 
     $view->setUser($this->getRequest()->getUser());
-    $view->setFlexNav(true);
 
     $page->appendChild($view);
 

src/view/layout/AphrontSideNavFilterView.php

@@ -21,7 +21,6 @@ final class AphrontSideNavFilterView extends AphrontView {
   private $items = array();
   private $baseURI;
   private $selectedFilter = false;
-  private $flexNav;
   private $flexible;
   private $active;
   private $menu;
@@ -52,11 +51,6 @@ public function setActive($active) {
     return $this;
   }
 
-  public function setFlexNav($flex_nav) {
-    $this->flexNav = $flex_nav;
-    return $this;
-  }
-
   public function setFlexible($flexible) {
     $this->flexible = $flexible;
     return $this;
@@ -156,11 +150,7 @@ public function render() {
 
     require_celerity_resource('phabricator-side-menu-view-css');
 
-    if ($this->flexNav) {
-      return $this->renderFlexNav();
-    } else {
-      return $this->renderLegacyNav();
-    }
+    return $this->renderFlexNav();
   }
 
   private function renderFlexNav() {
@@ -259,20 +249,4 @@ private function renderFlexNav() {
         $this->renderChildren()));
   }
 
-  public function renderLegacyNav() {
-    require_celerity_resource('aphront-side-nav-view-css');
-
-    return
-      '<table class="aphront-side-nav-view phabricator-side-menu">'.
-        '<tr>'.
-          '<th class="aphront-side-nav-navigation">'.
-            self::renderSingleView($this->menu).
-          '</th>'.
-          '<td class="aphront-side-nav-content">'.
-            $this->renderChildren().
-          '</td>'.
-        '</tr>'.
-      '</table>';
-  }
-
 }