Page MenuHomePhabricator
Files F15381536

D15503.diff
No OneTemporary
Actions

D15503.diff
View Options

diff --git a/src/applications/spaces/controller/PhabricatorSpacesEditController.php b/src/applications/spaces/controller/PhabricatorSpacesEditController.php
--- a/src/applications/spaces/controller/PhabricatorSpacesEditController.php
+++ b/src/applications/spaces/controller/PhabricatorSpacesEditController.php
@@ -162,7 +162,8 @@
->addCancelButton($cancel_uri));
$box = id(new PHUIObjectBoxView())
- ->setHeaderText($header_text)
+ ->setHeaderText(pht('Space'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setValidationException($validation_exception)
->appendChild($form);
@@ -173,14 +174,21 @@
$cancel_uri);
}
$crumbs->addTextCrumb($title);
-
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $box,
- ),
- array(
- 'title' => $title,
- ));
+ $crumbs->setBorder(true);
+
+ $header = id(new PHUIHeaderView())
+ ->setHeader($header_text)
+ ->setHeaderIcon('fa-pencil');
+
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setFooter(array(
+ $box,
+ ));
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->appendChild($view);
}
}
diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
--- a/src/applications/spaces/controller/PhabricatorSpacesViewController.php
+++ b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
@@ -18,9 +18,9 @@
return new Aphront404Response();
}
- $action_list = $this->buildActionListView($space);
+ $curtain = $this->buildCurtain($space);
$property_list = $this->buildPropertyListView($space);
- $property_list->setActionList($action_list);
+ $title = array($space->getMonogram(), $space->getNamespaceName());
$xactions = id(new PhabricatorSpacesNamespaceTransactionQuery())
->setViewer($viewer)
@@ -35,7 +35,8 @@
$header = id(new PHUIHeaderView())
->setUser($viewer)
->setHeader($space->getNamespaceName())
- ->setPolicyObject($space);
+ ->setPolicyObject($space)
+ ->setHeaderIcon('fa-th-large');
if ($space->getIsArchived()) {
$header->setStatus('fa-ban', 'red', pht('Archived'));
@@ -44,21 +45,27 @@
}
$box = id(new PHUIObjectBoxView())
- ->setHeader($header)
+ ->setHeaderText(pht('DETAILS'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->addPropertyList($property_list);
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($space->getMonogram());
+ $crumbs->setBorder(true);
+
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setMainColumn(array(
+ $box,
+ $timeline,
+ ))
+ ->setCurtain($curtain);
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->appendChild($view);
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $box,
- $timeline,
- ),
- array(
- 'title' => array($space->getMonogram(), $space->getNamespaceName()),
- ));
}
private function buildPropertyListView(PhabricatorSpacesNamespace $space) {
@@ -93,18 +100,17 @@
return $list;
}
- private function buildActionListView(PhabricatorSpacesNamespace $space) {
+ private function buildCurtain(PhabricatorSpacesNamespace $space) {
$viewer = $this->getRequest()->getUser();
- $list = id(new PhabricatorActionListView())
- ->setUser($viewer);
+ $curtain = $this->newCurtainView($space);
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
$space,
PhabricatorPolicyCapability::CAN_EDIT);
- $list->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Edit Space'))
->setIcon('fa-pencil')
@@ -115,7 +121,7 @@
$id = $space->getID();
if ($space->getIsArchived()) {
- $list->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Activate Space'))
->setIcon('fa-check')
@@ -123,7 +129,7 @@
->setDisabled(!$can_edit)
->setWorkflow(true));
} else {
- $list->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Archive Space'))
->setIcon('fa-ban')
@@ -132,7 +138,7 @@
->setWorkflow(true));
}
- return $list;
+ return $curtain;
}
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 8:09 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7687310
Default Alt Text
D15503.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility