D11272.id27165.diff
No OneTemporary
Actions

Size

34 KB

Referenced Files

None

Subscribers

None

D11272.id27165.diff
View Options

	diff --git a/resources/celerity/map.php b/resources/celerity/map.php
	--- a/resources/celerity/map.php
	+++ b/resources/celerity/map.php
	@@ -7,7 +7,7 @@
	*/
	return array(
	'names' => array(
	- 'core.pkg.css' => '63e782fb',
	+ 'core.pkg.css' => 'ebd4cf1c',
	'core.pkg.js' => '44aac665',
	'darkconsole.pkg.js' => '8ab24e01',
	'differential.pkg.css' => '8af45893',
	@@ -23,7 +23,7 @@
	'rsrc/css/aphront/error-view.css' => '3462dbee',
	'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
	'rsrc/css/aphront/list-filter-view.css' => '2ae43867',
	- 'rsrc/css/aphront/multi-column.css' => '6d72e772',
	+ 'rsrc/css/aphront/multi-column.css' => '41a848c0',
	'rsrc/css/aphront/notification.css' => '9c279160',
	'rsrc/css/aphront/pager-view.css' => '2e3539af',
	'rsrc/css/aphront/panel-view.css' => '5846dfa2',
	@@ -115,7 +115,7 @@
	'rsrc/css/layout/phabricator-crumbs-view.css' => 'a49339de',
	'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
	'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783',
	- 'rsrc/css/layout/phabricator-side-menu-view.css' => '90eafc85',
	+ 'rsrc/css/layout/phabricator-side-menu-view.css' => 'd5307ad3',
	'rsrc/css/layout/phabricator-source-code-view.css' => '7d346aa4',
	'rsrc/css/phui/calendar/phui-calendar-day.css' => 'de035c8a',
	'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
	@@ -145,7 +145,7 @@
	'rsrc/css/phui/phui-tag-view.css' => '6b74282b',
	'rsrc/css/phui/phui-text.css' => 'cf019f54',
	'rsrc/css/phui/phui-timeline-view.css' => '415bf348',
	- 'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00',
	+ 'rsrc/css/phui/phui-workboard-view.css' => '8896938c',
	'rsrc/css/phui/phui-workpanel-view.css' => 'e495a5cc',
	'rsrc/css/sprite-apps-large.css' => '20ec0cc0',
	'rsrc/css/sprite-apps.css' => 'd5baed0f',
	@@ -499,7 +499,7 @@
	'aphront-dialog-view-css' => '4dbbe3bb',
	'aphront-error-view-css' => '3462dbee',
	'aphront-list-filter-view-css' => '2ae43867',
	- 'aphront-multi-column-view-css' => '6d72e772',
	+ 'aphront-multi-column-view-css' => '41a848c0',
	'aphront-pager-view-css' => '2e3539af',
	'aphront-panel-view-css' => '5846dfa2',
	'aphront-table-view-css' => 'b22b7216',
	@@ -733,7 +733,7 @@
	'phabricator-remarkup-css' => '7604f12e',
	'phabricator-search-results-css' => 'f240504c',
	'phabricator-shaped-request' => '7cbe244b',
	- 'phabricator-side-menu-view-css' => '90eafc85',
	+ 'phabricator-side-menu-view-css' => 'd5307ad3',
	'phabricator-slowvote-css' => '266df6a1',
	'phabricator-source-code-view-css' => '7d346aa4',
	'phabricator-standard-page-view' => '2c96cfb5',
	@@ -790,7 +790,7 @@
	'phui-tag-view-css' => '6b74282b',
	'phui-text-css' => 'cf019f54',
	'phui-timeline-view-css' => '415bf348',
	- 'phui-workboard-view-css' => '2bf82d00',
	+ 'phui-workboard-view-css' => '8896938c',
	'phui-workpanel-view-css' => 'e495a5cc',
	'phuix-action-list-view' => 'b5c256b8',
	'phuix-action-view' => '6e8cefa4',
	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -2225,6 +2225,7 @@
	'PhabricatorProjectTransactionQuery' => 'applications/project/query/PhabricatorProjectTransactionQuery.php',
	'PhabricatorProjectUIEventListener' => 'applications/project/events/PhabricatorProjectUIEventListener.php',
	'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
	+ 'PhabricatorProjectViewController' => 'applications/project/controller/PhabricatorProjectViewController.php',
	'PhabricatorProjectWatchController' => 'applications/project/controller/PhabricatorProjectWatchController.php',
	'PhabricatorProjectWikiExplainController' => 'applications/project/controller/PhabricatorProjectWikiExplainController.php',
	'PhabricatorProjectsPolicyRule' => 'applications/policy/rule/PhabricatorProjectsPolicyRule.php',
	@@ -5445,6 +5446,7 @@
	'PhabricatorProjectTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorProjectUIEventListener' => 'PhabricatorEventListener',
	'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
	+ 'PhabricatorProjectViewController' => 'PhabricatorProjectController',
	'PhabricatorProjectWatchController' => 'PhabricatorProjectController',
	'PhabricatorProjectWikiExplainController' => 'PhabricatorProjectController',
	'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
	diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
	--- a/src/applications/project/application/PhabricatorProjectApplication.php
	+++ b/src/applications/project/application/PhabricatorProjectApplication.php
	@@ -52,8 +52,10 @@
	=> 'PhabricatorProjectMembersEditController',
	'members/(?P<id>[1-9]\d*)/remove/'
	=> 'PhabricatorProjectMembersRemoveController',
	- 'view/(?P<id>[1-9]\d*)/'
	+ 'profile/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectProfileController',
	+ 'view/(?P<id>[1-9]\d*)/'
	+ => 'PhabricatorProjectViewController',
	'picture/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectEditPictureController',
	'icon/(?P<id>[1-9]\d*)/'
	@@ -86,7 +88,7 @@
	'wiki/' => 'PhabricatorProjectWikiExplainController',
	),
	'/tag/' => array(
	- '(?P<slug>[^/]+)/' => 'PhabricatorProjectProfileController',
	+ '(?P<slug>[^/]+)/' => 'PhabricatorProjectViewController',
	'(?P<slug>[^/]+)/board/' => 'PhabricatorProjectBoardViewController',
	),
	);
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardController.php b/src/applications/project/controller/PhabricatorProjectBoardController.php
	--- a/src/applications/project/controller/PhabricatorProjectBoardController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardController.php
	@@ -13,12 +13,20 @@
	return $this->project;
	}

	- protected function buildApplicationCrumbs() {
	+ public function buildIconNavView() {
	+ $user = $this->getRequest()->getUser();
	$project = $this->getProject();
	- $crumbs = parent::buildApplicationCrumbs();
	- $crumbs->addTextCrumb(
	- $project->getName(),
	- $this->getApplicationURI('view/'.$project->getID().'/'));
	- return $crumbs;
	+ $id = $project->getID();
	+
	+ $nav = new AphrontSideNavFilterView();
	+ $nav->setIconNav(true);
	+ $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
	+ $nav->addIcon("profile/{$id}/", pht('Details'), 'fa-home');
	+ $nav->addIcon("board/{$id}/", pht('Workboard'), 'fa-columns');
	+ $nav->addIcon("members/{$id}/", pht('Members'), 'fa-group');
	+ $nav->addIcon("edit/{$id}/", pht('Edit'), 'fa-pencil');
	+ $nav->selectFilter("board/{$id}/");
	+
	+ return $nav;
	}
	}
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	@@ -15,16 +15,9 @@
	return true;
	}

	- public function willProcessRequest(array $data) {
	- $this->id = idx($data, 'id');
	- $this->slug = idx($data, 'slug');
	- $this->queryKey = idx($data, 'queryKey');
	- $this->filter = (bool)idx($data, 'filter');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	+ public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getUser();
	+ $id = $request->getURIData('id');

	$show_hidden = $request->getBool('hidden');
	$this->showHidden = $show_hidden;
	@@ -32,10 +25,12 @@
	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->needImages(true);
	- if ($this->slug) {
	- $project->withSlugs(array($this->slug));
	+ $id = $request->getURIData('id');
	+ $slug = $request->getURIData('slug');
	+ if ($slug) {
	+ $project->withSlugs(array($slug));
	} else {
	- $project->withIDs(array($this->id));
	+ $project->withIDs(array($id));
	}
	$project = $project->executeOne();
	if (!$project) {
	@@ -111,7 +106,7 @@
	$engine->getQueryResultsPageURI($saved->getQueryKey())));
	}

	- $query_key = $this->queryKey;
	+ $query_key = $request->getURIData('queryKey');
	if (!$query_key) {
	$query_key = 'open';
	}
	@@ -133,7 +128,7 @@
	$custom_query = $saved;
	}

	- if ($this->filter) {
	+ if ($request->getURIData('filter')) {
	$filter_form = id(new AphrontFormView())
	->setUser($viewer);
	$engine->buildSearchForm($filter_form, $saved);
	@@ -303,7 +298,7 @@
	$header_link = phutil_tag(
	'a',
	array(
	- 'href' => $this->getApplicationURI('view/'.$project->getID().'/'),
	+ 'href' => $this->getApplicationURI('profile/'.$project->getID().'/'),
	),
	$project->getName());

	@@ -312,7 +307,7 @@
	->setUser($viewer)
	->setNoBackground(true)
	->setImage($project->getProfileImageURI())
	- ->setImageURL($this->getApplicationURI('view/'.$project->getID().'/'))
	+ ->setImageURL($this->getApplicationURI('profile/'.$project->getID().'/'))
	->addActionLink($sort_menu)
	->addActionLink($filter_menu)
	->addActionLink($manage_menu)
	@@ -322,10 +317,13 @@
	->appendChild($board)
	->addClass('project-board-wrapper');

	+ $nav = $this->buildIconNavView();
	+ $nav->appendChild($header);
	+ $nav->appendChild($board_box);
	+
	return $this->buildApplicationPage(
	array(
	- $header,
	- $board_box,
	+ $nav,
	),
	array(
	'title' => pht('%s Board', $project->getName()),
	diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	--- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	+++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	@@ -47,11 +47,6 @@
	$timeline->setShouldTerminate(true);

	$title = pht('%s', $column->getDisplayName());
	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb(
	- pht('Board'),
	- $this->getApplicationURI('board/'.$project->getID().'/'));
	- $crumbs->addTextCrumb($title);

	$header = $this->buildHeaderView($column);
	$actions = $this->buildActionView($column);
	@@ -61,11 +56,13 @@
	->setHeader($header)
	->addPropertyList($properties);

	+ $nav = $this->buildIconNavView();
	+ $nav->appendChild($box);
	+ $nav->appendChild($timeline);
	+
	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $box,
	- $timeline,
	+ $nav,
	),
	array(
	'title' => $title,
	diff --git a/src/applications/project/controller/PhabricatorProjectColumnEditController.php b/src/applications/project/controller/PhabricatorProjectColumnEditController.php
	--- a/src/applications/project/controller/PhabricatorProjectColumnEditController.php
	+++ b/src/applications/project/controller/PhabricatorProjectColumnEditController.php
	@@ -135,11 +135,9 @@
	if ($is_new) {
	$title = pht('Create Column');
	$submit = pht('Create Column');
	- $crumb_text = pht('Create Column');
	} else {
	$title = pht('Edit %s', $column->getDisplayName());
	$submit = pht('Save Column');
	- $crumb_text = pht('Edit');
	}

	$form->appendChild(
	@@ -147,28 +145,17 @@
	->setValue($submit)
	->addCancelButton($view_uri));

	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb(
	- pht('Board'),
	- $this->getApplicationURI('board/'.$project->getID().'/'));
	-
	- if (!$is_new) {
	- $crumbs->addTextCrumb(
	- $column->getDisplayName(),
	- $view_uri);
	- }
	-
	- $crumbs->addTextCrumb($crumb_text);
	-
	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setValidationException($validation_exception)
	->setForm($form);

	+ $nav = $this->buildIconNavView();
	+ $nav->appendChild($form_box);
	+
	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $form_box,
	+ $nav,
	),
	array(
	'title' => $title,
	diff --git a/src/applications/project/controller/PhabricatorProjectController.php b/src/applications/project/controller/PhabricatorProjectController.php
	--- a/src/applications/project/controller/PhabricatorProjectController.php
	+++ b/src/applications/project/controller/PhabricatorProjectController.php
	@@ -2,23 +2,53 @@

	abstract class PhabricatorProjectController extends PhabricatorController {

	+ public function buildApplicationMenu() {
	+ return $this->buildSideNavView(true)->getMenu();
	+ }
	+
	public function buildSideNavView($for_app = false) {
	$user = $this->getRequest()->getUser();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	+ $id = null;
	if ($for_app) {
	+ $user = $this->getRequest()->getUser();
	+ $id = $this->getRequest()->getURIData('id');
	+ if ($id) {
	+ $nav->addFilter("profile/{$id}/", pht('Details'));
	+ $nav->addFilter("board/{$id}/", pht('Workboard'));
	+ $nav->addFilter("members/{$id}/", pht('Members'));
	+ $nav->addFilter("edit/{$id}/", pht('Edit'));
	+ }
	$nav->addFilter('create', pht('Create Project'));
	}

	- id(new PhabricatorProjectSearchEngine())
	- ->setViewer($user)
	- ->addNavigationItems($nav->getMenu());
	+ if (!$id) {
	+ id(new PhabricatorProjectSearchEngine())
	+ ->setViewer($user)
	+ ->addNavigationItems($nav->getMenu());
	+ }

	$nav->selectFilter(null);

	return $nav;
	}

	+ public function buildIconNavView() {
	+ $user = $this->getRequest()->getUser();
	+ $id = $this->getRequest()->getURIData('id');
	+
	+ $nav = new AphrontSideNavFilterView();
	+ $nav->setIconNav(true);
	+ $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
	+ $nav->addIcon("profile/{$id}/", pht('Details'), 'fa-home');
	+ $nav->addIcon("board/{$id}/", pht('Workboard'), 'fa-columns');
	+ $nav->addIcon("members/{$id}/", pht('Members'), 'fa-group');
	+ $nav->addIcon("edit/{$id}/", pht('Edit'), 'fa-pencil');
	+
	+ return $nav;
	+ }
	+
	}
	diff --git a/src/applications/project/controller/PhabricatorProjectEditDetailsController.php b/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
	--- a/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
	@@ -14,7 +14,8 @@
	$viewer = $request->getUser();

	if ($this->id) {
	- $is_new = false;
	+ $id = $request->getURIData('id');
	+ $is_new = false;

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	@@ -149,7 +150,7 @@

	if ($is_new) {
	$redirect_uri =
	- $this->getApplicationURI('view/'.$project->getID().'/');
	+ $this->getApplicationURI('profile/'.$project->getID().'/');
	} else {
	$redirect_uri =
	$this->getApplicationURI('edit/'.$project->getID().'/');
	@@ -300,22 +301,17 @@
	->setValidationException($validation_exception)
	->setForm($form);

	- $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
	- if ($is_new) {
	- $crumbs->addTextCrumb($title);
	+ if (!$is_new) {
	+ $nav = $this->buildIconNavView();
	+ $nav->selectFilter("edit/{$id}/");
	+ $nav->appendChild($form_box);
	} else {
	- $crumbs
	- ->addTextCrumb($project->getName(),
	- $this->getApplicationURI('view/'.$project->getID().'/'))
	- ->addTextCrumb(pht('Edit'),
	- $this->getApplicationURI('edit/'.$project->getID().'/'))
	- ->addTextCrumb(pht('Details'));
	+ $nav = array($form_box);
	}

	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $form_box,
	+ $nav,
	),
	array(
	'title' => $title,
	diff --git a/src/applications/project/controller/PhabricatorProjectEditMainController.php b/src/applications/project/controller/PhabricatorProjectEditMainController.php
	--- a/src/applications/project/controller/PhabricatorProjectEditMainController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditMainController.php
	@@ -18,6 +18,7 @@
	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	+ $id = $request->getURIData('id');

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	@@ -43,13 +44,6 @@
	$actions = $this->buildActionListView($project);
	$properties = $this->buildPropertyListView($project, $actions);

	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb(
	- $project->getName(),
	- $this->getApplicationURI('view/'.$project->getID().'/'));
	- $crumbs->addTextCrumb(pht('Edit'));
	- $crumbs->setActionList($actions);
	-
	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	@@ -59,11 +53,16 @@
	new PhabricatorProjectTransactionQuery());
	$timeline->setShouldTerminate(true);

	+ $nav = $this->buildIconNavView();
	+ $nav->selectFilter("edit/{$id}/");
	+ $nav->appendChild($object_box);
	+ $nav->appendChild($timeline);
	+
	+ $mnav = $this->buildSideNavView();
	+
	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $object_box,
	- $timeline,
	+ $nav,
	),
	array(
	'title' => $project->getName(),
	diff --git a/src/applications/project/controller/PhabricatorProjectEditPictureController.php b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
	--- a/src/applications/project/controller/PhabricatorProjectEditPictureController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
	@@ -12,6 +12,7 @@
	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	+ $id = $request->getURIData('id');

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	@@ -27,7 +28,7 @@
	}

	$edit_uri = $this->getApplicationURI('edit/'.$project->getID().'/');
	- $view_uri = $this->getApplicationURI('view/'.$project->getID().'/');
	+ $view_uri = $this->getApplicationURI('profile/'.$project->getID().'/');

	$supported_formats = PhabricatorFile::getTransformableImageFormats();
	$e_file = true;
	@@ -100,10 +101,6 @@
	}

	$title = pht('Edit Project Picture');
	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb($project->getName(), $view_uri);
	- $crumbs->addTextCrumb(pht('Edit'), $edit_uri);
	- $crumbs->addTextCrumb(pht('Picture'));

	$form = id(new PHUIFormLayoutView())
	->setUser($viewer);
	@@ -260,11 +257,14 @@
	->setHeaderText(pht('Upload New Picture'))
	->setForm($upload_form);

	+ $nav = $this->buildIconNavView();
	+ $nav->selectFilter("edit/{$id}/");
	+ $nav->appendChild($form_box);
	+ $nav->appendChild($upload_box);
	+
	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $form_box,
	- $upload_box,
	+ $nav,
	),
	array(
	'title' => $title,
	diff --git a/src/applications/project/controller/PhabricatorProjectListController.php b/src/applications/project/controller/PhabricatorProjectListController.php
	--- a/src/applications/project/controller/PhabricatorProjectListController.php
	+++ b/src/applications/project/controller/PhabricatorProjectListController.php
	@@ -22,7 +22,7 @@
	return $this->delegateToController($controller);
	}

	- protected function buildApplicationMenu() {
	+ public function buildApplicationMenu() {
	return $this->buildSideNavView(true)->getMenu();
	}

	diff --git a/src/applications/project/controller/PhabricatorProjectMembersEditController.php b/src/applications/project/controller/PhabricatorProjectMembersEditController.php
	--- a/src/applications/project/controller/PhabricatorProjectMembersEditController.php
	+++ b/src/applications/project/controller/PhabricatorProjectMembersEditController.php
	@@ -12,6 +12,7 @@
	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();
	+ $id = $request->getURIData('id');

	$project = id(new PhabricatorProjectQuery())
	->setViewer($user)
	@@ -75,6 +76,7 @@

	$header_name = pht('Edit Members');
	$title = pht('Edit Members');
	+ $view_uri = $this->getApplicationURI('profile/'.$project->getID().'/');

	$form = new AphrontFormView();
	$form
	@@ -86,7 +88,7 @@
	->setDatasource(new PhabricatorPeopleDatasource()))
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->addCancelButton('/project/view/'.$project->getID().'/')
	+ ->addCancelButton($view_uri)
	->setValue(pht('Add Members')));

	$member_list = $this->renderMemberList($project, $handles);
	@@ -95,17 +97,14 @@
	->setHeaderText($title)
	->setForm($form);

	- $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView())
	- ->addTextCrumb(
	- $project->getName(),
	- '/project/view/'.$project->getID().'/')
	- ->addTextCrumb(pht('Edit Members'), $this->getApplicationURI());
	+ $nav = $this->buildIconNavView();
	+ $nav->selectFilter("members/{$id}/");
	+ $nav->appendChild($form_box);
	+ $nav->appendChild($member_list);

	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $form_box,
	- $member_list,
	+ $nav,
	),
	array(
	'title' => $title,
	diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
	--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
	+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
	@@ -3,22 +3,11 @@
	final class PhabricatorProjectProfileController
	extends PhabricatorProjectController {

	- private $id;
	- private $slug;
	-
	public function shouldAllowPublic() {
	return true;
	}

	- public function willProcessRequest(array $data) {
	- // via /project/view/$id/
	- $this->id = idx($data, 'id');
	- // via /tag/$slug/
	- $this->slug = idx($data, 'slug');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	+ public function handleRequest(AphrontRequest $request) {
	$user = $request->getUser();

	$query = id(new PhabricatorProjectQuery())
	@@ -27,16 +16,18 @@
	->needWatchers(true)
	->needImages(true)
	->needSlugs(true);
	- if ($this->slug) {
	- $query->withSlugs(array($this->slug));
	+ $id = $request->getURIData('id');
	+ $slug = $request->getURIData('slug');
	+ if ($slug) {
	+ $query->withSlugs(array($slug));
	} else {
	- $query->withIDs(array($this->id));
	+ $query->withIDs(array($id));
	}
	$project = $query->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}
	- if ($this->slug && $this->slug != $project->getPrimarySlug()) {
	+ if ($slug && $slug != $project->getPrimarySlug()) {
	return id(new AphrontRedirectResponse())
	->setURI('/tag/'.$project->getPrimarySlug().'/');
	}
	@@ -53,7 +44,7 @@
	$project->getPHID(),
	));
	$query->setLimit(50);
	- $query->setViewer($this->getRequest()->getUser());
	+ $query->setViewer($request->getUser());
	$stories = $query->execute();
	$feed = $this->renderStories($stories);

	@@ -61,21 +52,11 @@
	'phabricator-project-layout',
	array($tasks, $feed));

	- $id = $project->getID();
	- $icon = id(new PHUIIconView())
	- ->setIconFont('fa-columns');
	- $board_btn = id(new PHUIButtonView())
	- ->setTag('a')
	- ->setText(pht('Workboard'))
	- ->setHref($this->getApplicationURI("board/{$id}/"))
	- ->setIcon($icon);
	-
	$header = id(new PHUIHeaderView())
	->setHeader($project->getName())
	->setUser($user)
	->setPolicyObject($project)
	- ->setImage($picture)
	- ->addActionLink($board_btn);
	+ ->setImage($picture);

	if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	@@ -86,19 +67,18 @@
	$actions = $this->buildActionListView($project);
	$properties = $this->buildPropertyListView($project, $actions);

	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb($project->getName())
	- ->setActionList($actions);
	-
	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	+ $nav = $this->buildIconNavView();
	+ $nav->selectFilter("profile/{$id}/");
	+ $nav->appendChild($object_box);
	+ $nav->appendChild($content);
	+
	return $this->buildApplicationPage(
	array(
	- $crumbs,
	- $object_box,
	- $content,
	+ $nav,
	),
	array(
	'title' => $project->getName(),
	@@ -218,20 +198,6 @@
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	- $view->addAction(
	- id(new PhabricatorActionView())
	- ->setName(pht('Edit Project'))
	- ->setIcon('fa-pencil')
	- ->setHref($this->getApplicationURI("edit/{$id}/")));
	-
	- $view->addAction(
	- id(new PhabricatorActionView())
	- ->setName(pht('Edit Members'))
	- ->setIcon('fa-users')
	- ->setHref($this->getApplicationURI("members/{$id}/"))
	- ->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit));
	-
	$action = null;
	if (!$project->isUserMember($viewer->getPHID())) {
	$can_join = PhabricatorPolicyFilter::hasCapability(
	diff --git a/src/applications/project/controller/PhabricatorProjectUpdateController.php b/src/applications/project/controller/PhabricatorProjectUpdateController.php
	--- a/src/applications/project/controller/PhabricatorProjectUpdateController.php
	+++ b/src/applications/project/controller/PhabricatorProjectUpdateController.php
	@@ -42,7 +42,7 @@
	return new Aphront404Response();
	}

	- $project_uri = '/project/view/'.$project->getID().'/';
	+ $project_uri = $this->getApplicationURI('profile/'.$project->getID().'/');

	if ($process_action) {

	diff --git a/src/applications/project/controller/PhabricatorProjectViewController.php b/src/applications/project/controller/PhabricatorProjectViewController.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/project/controller/PhabricatorProjectViewController.php
	@@ -0,0 +1,56 @@
	+<?php
	+
	+final class PhabricatorProjectViewController
	+ extends PhabricatorProjectController {
	+
	+ public function shouldAllowPublic() {
	+ return true;
	+ }
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $request = $this->getRequest();
	+ $user = $request->getUser();
	+
	+ $query = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->needMembers(true)
	+ ->needWatchers(true)
	+ ->needImages(true)
	+ ->needSlugs(true);
	+ $id = $request->getURIData('id');
	+ $slug = $request->getURIData('slug');
	+ if ($slug) {
	+ $query->withSlugs(array($slug));
	+ } else {
	+ $query->withIDs(array($id));
	+ }
	+ $project = $query->executeOne();
	+ if (!$project) {
	+ return new Aphront404Response();
	+ }
	+
	+
	+ $columns = id(new PhabricatorProjectColumnQuery())
	+ ->setViewer($user)
	+ ->withProjectPHIDs(array($project->getPHID()))
	+ ->execute();
	+ if ($columns) {
	+ $controller = 'board';
	+ } else {
	+ $controller = 'profile';
	+ }
	+
	+ switch ($controller) {
	+ case 'board':
	+ $controller_object = new PhabricatorProjectBoardViewController();
	+ break;
	+ case 'profile':
	+ default:
	+ $controller_object = new PhabricatorProjectProfileController();
	+ break;
	+ }
	+
	+ return $this->delegateToController($controller_object);
	+ }
	+
	+}
	diff --git a/src/applications/project/controller/PhabricatorProjectWatchController.php b/src/applications/project/controller/PhabricatorProjectWatchController.php
	--- a/src/applications/project/controller/PhabricatorProjectWatchController.php
	+++ b/src/applications/project/controller/PhabricatorProjectWatchController.php
	@@ -25,7 +25,7 @@
	return new Aphront404Response();
	}

	- $project_uri = '/project/view/'.$project->getID().'/';
	+ $project_uri = $this->getApplicationURI('profile/'.$project->getID().'/');

	// You must be a member of a project to
	if (!$project->isUserMember($viewer->getPHID())) {
	diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
	+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	@@ -219,8 +219,15 @@

	foreach ($projects as $key => $project) {
	$id = $project->getID();
	+ $profile_uri = $this->getApplicationURI("profile/{$id}/");
	$workboards_uri = $this->getApplicationURI("board/{$id}/");
	$members_uri = $this->getApplicationURI("members/{$id}/");
	+ $profile_url = phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => $profile_uri,
	+ ),
	+ pht('Profile'));
	$workboards_url = phutil_tag(
	'a',
	array(
	@@ -252,6 +259,7 @@
	->setHref($this->getApplicationURI("view/{$id}/"))
	->setImageURI($project->getProfileImageURI())
	->addAttribute($tag_list)
	+ ->addAttribute($profile_url)
	->addAttribute($workboards_url)
	->addAttribute($members_url);

	diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
	--- a/src/view/layout/AphrontSideNavFilterView.php
	+++ b/src/view/layout/AphrontSideNavFilterView.php
	@@ -27,6 +27,7 @@
	private $crumbs;
	private $classes = array();
	private $menuID;
	+ private $iconNav;

	public function setMenuID($menu_id) {
	$this->menuID = $menu_id;
	@@ -61,6 +62,11 @@
	return $this->crumbs;
	}

	+ public function setIconNav($nav) {
	+ $this->iconNav = $nav;
	+ return $this;
	+ }
	+
	public function setActive($active) {
	$this->active = $active;
	return $this;
	@@ -94,6 +100,20 @@
	$key, $name, $uri, PHUIListItemView::TYPE_LINK);
	}

	+ public function addIcon($key, $name, $icon) {
	+ $href = clone $this->baseURI;
	+ $href->setPath(rtrim($href->getPath().$key, '/').'/');
	+ $href = (string)$href;
	+
	+ $item = id(new PHUIListItemView())
	+ ->setKey($key)
	+ ->setRenderNameAsTooltip($name)
	+ ->setType(PHUIListItemView::TYPE_ICON_NAV)
	+ ->setIcon($icon)
	+ ->setHref($href);
	+ return $this->addMenuItem($item);
	+ }
	+
	public function addButton($key, $name, $uri = null) {
	return $this->addThing(
	$key, $name, $uri, PHUIListItemView::TYPE_BUTTON);
	@@ -109,6 +129,7 @@
	->setName($name)
	->setType($type);

	+
	if (strlen($key)) {
	$item->setKey($key);
	}
	@@ -192,6 +213,9 @@

	$nav_classes = array();
	$nav_classes[] = 'phabricator-nav';
	+ if ($this->iconNav) {
	+ $nav_classes[] = 'phabricator-icon-nav';
	+ }

	$nav_id = null;
	$drag_id = null;
	diff --git a/src/view/phui/PHUIListItemView.php b/src/view/phui/PHUIListItemView.php
	--- a/src/view/phui/PHUIListItemView.php
	+++ b/src/view/phui/PHUIListItemView.php
	@@ -9,6 +9,7 @@
	const TYPE_CUSTOM = 'type-custom';
	const TYPE_DIVIDER = 'type-divider';
	const TYPE_ICON = 'type-icon';
	+ const TYPE_ICON_NAV = 'type-icon-nav';

	const STATUS_WARN = 'phui-list-item-warn';
	const STATUS_FAIL = 'phui-list-item-fail';
	diff --git a/webroot/rsrc/css/aphront/multi-column.css b/webroot/rsrc/css/aphront/multi-column.css
	--- a/webroot/rsrc/css/aphront/multi-column.css
	+++ b/webroot/rsrc/css/aphront/multi-column.css
	@@ -159,25 +159,25 @@
	display: block;
	width: auto;
	}
	- .device-desktop .aphront-multi-column-column-outer {
	+ .device-desktop .dashboard-view .aphront-multi-column-column-outer {
	display: block;
	border: none;
	}
	- .device-desktop .aphront-multi-column-column.mlr {
	+ .device-desktop .dashboard-view .aphront-multi-column-column.mlr {
	margin: 0;
	}
	- .device-desktop .aphront-multi-column-fluid .aphront-multi-column-2-up
	- .aphront-multi-column-column-outer.half {
	+ .device-desktop .dashboard-view .aphront-multi-column-fluid
	+ .aphront-multi-column-2-up .aphront-multi-column-column-outer.half {
	width: auto;
	margin: 0 0 16px;
	}
	- .device-desktop .aphront-multi-column-fluid .aphront-multi-column-2-up
	- .aphront-multi-column-column-outer.thirds {
	+ .device-desktop .dashboard-view .aphront-multi-column-fluid
	+ .aphront-multi-column-2-up .aphront-multi-column-column-outer.thirds {
	width: auto;
	margin: 0 0 16px;
	}
	- .device-desktop .aphront-multi-column-fluid .aphront-multi-column-2-up
	- .aphront-multi-column-column-outer.third {
	+ .device-desktop .dashboard-view .aphront-multi-column-fluid
	+ .aphront-multi-column-2-up .aphront-multi-column-column-outer.third {
	width: auto;
	margin: 0 0 16px;
	}
	diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css
	--- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css
	+++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css
	@@ -43,3 +43,35 @@
	text-decoration: none;
	background-color: {$hovergrey};
	}
	+
	+.device-desktop .phabricator-icon-nav .phabricator-nav-column-background,
	+.device-desktop .phabricator-icon-nav .phabricator-nav-local {
	+ width: 40px;
	+}
	+
	+.device-desktop .phabricator-icon-nav .phabricator-nav-content {
	+ margin-left: 41px;
	+}
	+
	+.phabricator-icon-nav .phabricator-side-menu .phui-list-item-href {
	+ height: 40px;
	+ width: 40px;
	+ padding: 0;
	+}
	+
	+.phabricator-icon-nav .phabricator-side-menu .phui-list-item-icon {
	+ font-size: 20px;
	+ width: 40px;
	+ line-height: 40px;
	+ text-align: center;
	+ vertical-align: bottom;
	+}
	+
	+.phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected {
	+ border: none;
	+}
	+
	+.phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected
	+ .phui-icon-view {
	+ color: {$sky};
	+}
	diff --git a/webroot/rsrc/css/phui/phui-workboard-view.css b/webroot/rsrc/css/phui/phui-workboard-view.css
	--- a/webroot/rsrc/css/phui/phui-workboard-view.css
	+++ b/webroot/rsrc/css/phui/phui-workboard-view.css
	@@ -73,6 +73,15 @@
	margin: 0 3px;
	}

	+.device-desktop .project-board-wrapper .phui-workboard-view-shadow {
	+ left: 53px;
	+}
	+
	+.device-desktop .phui-workboard-view .aphront-multi-column-fixed
	+ .aphront-multi-column-inner {
	+ margin-left: 0;
	+}
	+
	.device-tablet .project-board-wrapper {
	margin-left: 8px;
	margin-right: 8px;

File Metadata

Mime Type: text/plain
Expires: Thu, Aug 28, 8:55 PM (10 h, 26 m ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/7e/ve/3cir335gq3nitqa5
Default Alt Text: D11272.id27165.diff (34 KB)

D11272.id27165.diffNo OneTemporaryActions

D11272.id27165.diffView Options

File Metadata

Event Timeline

D11272.id27165.diff
No OneTemporary
Actions

D11272.id27165.diff
View Options