Skip to content

Commit 2da9fca

Browse files
committed
Update project manage page for two column
Summary: Fixes T10545. Converts layout to two column. Test Plan: Review a few project manage pages, see new layout and flag ability. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T10545 Differential Revision: https://secure.phabricator.com/D15450
1 parent 1392872 commit 2da9fca

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

src/applications/project/controller/PhabricatorProjectManageController.php

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@ public function handleRequest(AphrontRequest $request) {
3030
$header->setStatus('fa-ban', 'red', pht('Archived'));
3131
}
3232

33-
$actions = $this->buildActionListView($project);
34-
$properties = $this->buildPropertyListView($project, $actions);
35-
36-
$object_box = id(new PHUIObjectBoxView())
37-
->setHeader($header)
38-
->addPropertyList($properties);
33+
$curtain = $this->buildCurtain($project);
34+
$properties = $this->buildPropertyListView($project);
3935

4036
$timeline = $this->buildTransactionTimeline(
4137
$project,
@@ -47,6 +43,16 @@ public function handleRequest(AphrontRequest $request) {
4743

4844
$crumbs = $this->buildApplicationCrumbs();
4945
$crumbs->addTextCrumb(pht('Manage'));
46+
$crumbs->setBorder(true);
47+
48+
$manage = id(new PHUITwoColumnView())
49+
->setHeader($header)
50+
->setCurtain($curtain)
51+
->addPropertySection(pht('DETAILS'), $properties)
52+
->setMainColumn(
53+
array(
54+
$timeline,
55+
));
5056

5157
return $this->newPage()
5258
->setNavigation($nav)
@@ -58,42 +64,38 @@ public function handleRequest(AphrontRequest $request) {
5864
))
5965
->appendChild(
6066
array(
61-
$object_box,
62-
$timeline,
67+
$manage,
6368
));
6469
}
6570

66-
private function buildActionListView(PhabricatorProject $project) {
67-
$request = $this->getRequest();
68-
$viewer = $request->getUser();
71+
private function buildCurtain(PhabricatorProject $project) {
72+
$viewer = $this->getViewer();
6973

7074
$id = $project->getID();
71-
72-
$view = id(new PhabricatorActionListView())
73-
->setUser($viewer);
74-
7575
$can_edit = PhabricatorPolicyFilter::hasCapability(
7676
$viewer,
7777
$project,
7878
PhabricatorPolicyCapability::CAN_EDIT);
7979

80-
$view->addAction(
80+
$curtain = $this->newCurtainView($project);
81+
82+
$curtain->addAction(
8183
id(new PhabricatorActionView())
8284
->setName(pht('Edit Details'))
8385
->setIcon('fa-pencil')
8486
->setHref($this->getApplicationURI("edit/{$id}/"))
8587
->setDisabled(!$can_edit)
8688
->setWorkflow(!$can_edit));
8789

88-
$view->addAction(
90+
$curtain->addAction(
8991
id(new PhabricatorActionView())
9092
->setName(pht('Edit Menu'))
9193
->setIcon('fa-th-list')
9294
->setHref($this->getApplicationURI("{$id}/panel/configure/"))
9395
->setDisabled(!$can_edit)
9496
->setWorkflow(!$can_edit));
9597

96-
$view->addAction(
98+
$curtain->addAction(
9799
id(new PhabricatorActionView())
98100
->setName(pht('Edit Picture'))
99101
->setIcon('fa-picture-o')
@@ -102,15 +104,15 @@ private function buildActionListView(PhabricatorProject $project) {
102104
->setWorkflow(!$can_edit));
103105

104106
if ($project->isArchived()) {
105-
$view->addAction(
107+
$curtain->addAction(
106108
id(new PhabricatorActionView())
107109
->setName(pht('Activate Project'))
108110
->setIcon('fa-check')
109111
->setHref($this->getApplicationURI("archive/{$id}/"))
110112
->setDisabled(!$can_edit)
111113
->setWorkflow(true));
112114
} else {
113-
$view->addAction(
115+
$curtain->addAction(
114116
id(new PhabricatorActionView())
115117
->setName(pht('Archive Project'))
116118
->setIcon('fa-ban')
@@ -119,18 +121,15 @@ private function buildActionListView(PhabricatorProject $project) {
119121
->setWorkflow(true));
120122
}
121123

122-
return $view;
124+
return $curtain;
123125
}
124126

125127
private function buildPropertyListView(
126-
PhabricatorProject $project,
127-
PhabricatorActionListView $actions) {
128-
$request = $this->getRequest();
129-
$viewer = $request->getUser();
128+
PhabricatorProject $project) {
129+
$viewer = $this->getViewer();
130130

131131
$view = id(new PHUIPropertyListView())
132-
->setUser($viewer)
133-
->setActionList($actions);
132+
->setUser($viewer);
134133

135134
$view->addProperty(
136135
pht('Looks Like'),

src/applications/project/controller/PhabricatorProjectProfileController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public function handleRequest(AphrontRequest $request) {
9191

9292
$home = id(new PHUITwoColumnView())
9393
->setHeader($header)
94-
->setFluid(true)
9594
->addClass('project-view-home')
9695
->setMainColumn(
9796
array(

0 commit comments

Comments
 (0)