Minor tweaks to Profile/Project

Summary:
- Redirect to profileview when new image is uploaded.
- Add ProfileNav to EditPicture on Profile
- Add ProfileNav to EditProfile on Profile

Test Plan: Set new images on Profiles and Projects. See new redirect. See new navs.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

src/applications/people/controller/PhabricatorPeopleProfileEditController.php

@@ -86,9 +86,13 @@ final class PhabricatorPeopleProfileEditController
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Edit Profile'));
 
+    $nav = $this->getProfileMenu();
+    $nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
+      ->setNavigation($nav)
       ->appendChild($form_box);
   }
 }

src/applications/people/controller/PhabricatorPeopleProfilePictureController.php

@@ -22,8 +22,9 @@ final class PhabricatorPeopleProfilePictureController
     }
 
     $this->setUser($user);
+    $name = $user->getUserName();
 
-    $done_uri = $this->getApplicationURI("manage/{$id}/");
+    $done_uri = '/p/'.$name.'/';
 
     $supported_formats = PhabricatorFile::getTransformableImageFormats();
     $e_file = true;
@@ -251,9 +252,13 @@ final class PhabricatorPeopleProfilePictureController
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Edit Profile Picture'));
 
+    $nav = $this->getProfileMenu();
+    $nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
+      ->setNavigation($nav)
       ->appendChild(
         array(
           $form_box,

src/applications/project/controller/PhabricatorProjectEditPictureController.php

@@ -23,8 +23,8 @@ final class PhabricatorProjectEditPictureController
 
     $this->setProject($project);
 
-    $edit_uri = $this->getApplicationURI('manage/'.$project->getID().'/');
-    $view_uri = $this->getApplicationURI('manage/'.$project->getID().'/');
+    $edit_uri = $this->getApplicationURI('profile/'.$project->getID().'/');
+    $view_uri = $this->getApplicationURI('profile/'.$project->getID().'/');
 
     $supported_formats = PhabricatorFile::getTransformableImageFormats();
     $e_file = true;