From ad4c4acafcff6beec932beb3b0cd78617a4b03b9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 9 Jan 2013 13:57:31 -0800
Subject: [PATCH] Break profiles less after D4376

Summary: This won't win any awards, but makes User and Project profile pages significantly less broken in the wake of D4376.

Test Plan:
{F28858}
{F28859}

Reviewers: btrahan, chad

Reviewed By: chad

CC: aran

Differential Revision: https://secure.phabricator.com/D4382
---
 .../controller/PhabricatorPeopleProfileController.php    | 9 +++++----
 .../controller/PhabricatorProjectProfileController.php   | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
index 838d511200..5712d90370 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -130,9 +130,10 @@ final class PhabricatorPeopleProfileController
       }
     }
 
-    $header->appendChild($nav);
-    $nav->appendChild(
-      '<div style="padding: 1em;">'.$content.'</div>');
+    $nav->appendChild($header);
+
+    $content = '<div style="padding: 1em;">'.$content.'</div>';
+    $header->appendChild($content);
 
     if ($user->getPHID() == $viewer->getPHID()) {
       $nav->addSpacer();
@@ -148,7 +149,7 @@ final class PhabricatorPeopleProfileController
     }
 
     return $this->buildApplicationPage(
-      $header,
+      $nav,
       array(
         'title' => $user->getUsername(),
       ));
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 4f6a45d29a..cb0d7e6d0e 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -68,8 +68,6 @@ final class PhabricatorProjectProfileController
         throw new Exception("Unimplemented filter '{$this->page}'.");
     }
 
-    $content = '<div style="padding: 1em;">'.$content.'</div>';
-    $nav_view->appendChild($content);
 
     $header = new PhabricatorProfileHeaderView();
     $header->setName($project->getName());
@@ -112,10 +110,13 @@ final class PhabricatorProjectProfileController
 
     $header->addAction($action);
 
-    $header->appendChild($nav_view);
+    $nav_view->appendChild($header);
+
+    $content = '<div style="padding: 1em;">'.$content.'</div>';
+    $header->appendChild($content);
 
     return $this->buildStandardPageResponse(
-      $header,
+      $nav_view,
       array(
         'title' => $project->getName().' Project',
       ));