Fix footer display when IconNav is present

Summary: Fixes T7382, specifically we were drawing double navs, removed those from each page and added the correct CSS rule.

Test Plan: Test a number of people and profile pages with a footer set.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T7382

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

resources/celerity/map.php

@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '4e2c8d53',
+    'core.pkg.css' => 'fa9788b4',
     'core.pkg.js' => '23d653bb',
     'darkconsole.pkg.js' => '8ab24e01',
     'differential.pkg.css' => '14f0fa92',
@@ -38,7 +38,7 @@ return array(
     'rsrc/css/application/base/main-menu-view.css' => 'f9f5cd1b',
     'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
-    'rsrc/css/application/base/standard-page-view.css' => '60d0df9a',
+    'rsrc/css/application/base/standard-page-view.css' => '926b7e2d',
     'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
     'rsrc/css/application/config/config-options.css' => '7fedf08b',
     'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
@@ -353,7 +353,7 @@ return array(
     'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
     'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
     'rsrc/js/application/conpherence/behavior-durable-column.js' => '0c404426',
-    'rsrc/js/application/conpherence/behavior-menu.js' => 'b255d93b',
+    'rsrc/js/application/conpherence/behavior-menu.js' => '869e3445',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '86df5915',
     'rsrc/js/application/conpherence/behavior-widget-pane.js' => '40b1ff90',
     'rsrc/js/application/countdown/timer.js' => 'e4cc26b3',
@@ -557,7 +557,7 @@ return array(
     'javelin-behavior-boards-dropdown' => '0ec56e1d',
     'javelin-behavior-choose-control' => '6153c708',
     'javelin-behavior-config-reorder-fields' => '14a827de',
-    'javelin-behavior-conpherence-menu' => 'b255d93b',
+    'javelin-behavior-conpherence-menu' => '869e3445',
     'javelin-behavior-conpherence-pontificate' => '86df5915',
     'javelin-behavior-conpherence-widget-pane' => '40b1ff90',
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
@@ -744,7 +744,7 @@ return array(
     'phabricator-side-menu-view-css' => '7e8c6341',
     'phabricator-slowvote-css' => '266df6a1',
     'phabricator-source-code-view-css' => '7d346aa4',
-    'phabricator-standard-page-view' => '60d0df9a',
+    'phabricator-standard-page-view' => '926b7e2d',
     'phabricator-textareautils' => '5c93c52c',
     'phabricator-title' => '5c1c758c',
     'phabricator-tooltip' => '1d298e3a',
@@ -1457,6 +1457,17 @@ return array(
     '85ea0626' => array(
       'javelin-install',
     ),
+    '869e3445' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-behavior-device',
+      'javelin-history',
+      'javelin-vector',
+      'phabricator-shaped-request',
+    ),
     '86df5915' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1648,17 +1659,6 @@ return array(
       'javelin-dom',
       'javelin-reactor-dom',
     ),
-    'b255d93b' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-behavior-device',
-      'javelin-history',
-      'javelin-vector',
-      'phabricator-shaped-request',
-    ),
     'b2b4fbaf' => array(
       'javelin-behavior',
       'javelin-dom',

src/applications/people/controller/PhabricatorPeopleCalendarController.php

@@ -80,9 +80,7 @@ final class PhabricatorPeopleCalendarController
     $nav->appendChild($month_view);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-     ),
       array(
         'title' => pht('Calendar'),
       ));

src/applications/people/controller/PhabricatorPeopleFeedController.php

@@ -50,9 +50,7 @@ final class PhabricatorPeopleFeedController
     $nav->appendChild($feed);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-     ),
       array(
         'title' => pht('Feed'),
       ));

src/applications/people/controller/PhabricatorPeopleProfileController.php

@@ -157,9 +157,7 @@ final class PhabricatorPeopleProfileController
     $nav->appendChild($object_box);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $user->getUsername(),
       ));

src/applications/people/controller/PhabricatorPeopleProfileEditController.php

@@ -83,9 +83,7 @@ final class PhabricatorPeopleProfileEditController
     $nav->appendChild($form_box);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/people/controller/PhabricatorPeopleProfilePictureController.php

@@ -246,9 +246,7 @@ final class PhabricatorPeopleProfilePictureController
     $nav->appendChild($upload_box);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/project/controller/PhabricatorProjectBoardViewController.php

@@ -333,9 +333,7 @@ final class PhabricatorProjectBoardViewController
     $nav->appendChild($board_box);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => pht('%s Board', $project->getName()),
         'showFooter' => false,

src/applications/project/controller/PhabricatorProjectColumnDetailController.php

@@ -62,9 +62,7 @@ final class PhabricatorProjectColumnDetailController
     $nav->appendChild($timeline);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/project/controller/PhabricatorProjectColumnEditController.php

@@ -155,9 +155,7 @@ final class PhabricatorProjectColumnEditController
     $nav->appendChild($form_box);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/project/controller/PhabricatorProjectEditDetailsController.php

@@ -306,9 +306,7 @@ final class PhabricatorProjectEditDetailsController
     }
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/project/controller/PhabricatorProjectEditPictureController.php

@@ -296,9 +296,7 @@ final class PhabricatorProjectEditPictureController
     $nav->appendChild($upload_box);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/project/controller/PhabricatorProjectFeedController.php

@@ -51,9 +51,7 @@ final class PhabricatorProjectFeedController
     $nav->appendChild($content);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $project->getName(),
       ));

src/applications/project/controller/PhabricatorProjectMembersEditController.php

@@ -110,9 +110,7 @@ final class PhabricatorProjectMembersEditController
     $nav->appendChild($member_list);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $title,
       ));

src/applications/project/controller/PhabricatorProjectProfileController.php

@@ -64,9 +64,7 @@ final class PhabricatorProjectProfileController
     $nav->appendChild($timeline);
 
     return $this->buildApplicationPage(
-      array(
       $nav,
-      ),
       array(
         'title' => $project->getName(),
       ));

webroot/rsrc/css/application/base/standard-page-view.css

@@ -25,6 +25,10 @@
   margin-left: 221px;
 }
 
+.device-desktop div.phabricator-icon-nav + .phabricator-standard-page-footer {
+  margin-left: 58px;
+}
+
 .keyboard-shortcut-help td,
 .keyboard-shortcut-help th {
   padding: 8px;