Page MenuHomePhabricator

D15455.id.diff
No OneTemporary

D15455.id.diff

diff --git a/src/view/phui/PHUITwoColumnView.php b/src/view/phui/PHUITwoColumnView.php
--- a/src/view/phui/PHUITwoColumnView.php
+++ b/src/view/phui/PHUITwoColumnView.php
@@ -8,9 +8,8 @@
private $fluid;
private $header;
private $subheader;
+ private $footer;
private $propertySection = array();
- private $actionList;
- private $propertyList;
private $curtain;
const DISPLAY_LEFT = 'phui-side-column-left';
@@ -36,18 +35,13 @@
return $this;
}
- public function addPropertySection($title, $section) {
- $this->propertySection[] = array($title, $section);
+ public function setFooter($footer) {
+ $this->footer = $footer;
return $this;
}
- public function setActionList(PhabricatorActionListView $list) {
- $this->actionList = $list;
- return $this;
- }
-
- public function setPropertyList(PHUIPropertyListView $list) {
- $this->propertyList = $list;
+ public function addPropertySection($title, $section) {
+ $this->propertySection[] = array($title, $section);
return $this;
}
@@ -101,6 +95,8 @@
$main = $this->buildMainColumn();
$side = $this->buildSideColumn();
+ $footer = $this->buildFooter();
+
$order = array($side, $main);
$inner = phutil_tag_div('phui-two-column-row grouped', $order);
@@ -111,11 +107,6 @@
$curtain = $this->getCurtain();
if ($curtain) {
$action_list = $curtain->getActionList();
- } else {
- $action_list = $this->actionList;
- }
-
- if ($action_list) {
$this->header->setActionList($action_list);
}
@@ -138,6 +129,7 @@
$header,
$subheader,
$table,
+ $footer,
));
}
@@ -169,20 +161,6 @@
}
private function buildSideColumn() {
- $property_list = $this->propertyList;
- $action_list = $this->actionList;
-
- $properties = null;
- if ($property_list || $action_list) {
- if ($property_list) {
- $property_list->setStacked(true);
- }
-
- $properties = id(new PHUIObjectBoxView())
- ->appendChild($action_list)
- ->appendChild($property_list)
- ->addClass('phui-two-column-properties');
- }
$curtain = $this->getCurtain();
@@ -192,9 +170,23 @@
'class' => 'phui-side-column',
),
array(
- $properties,
$curtain,
$this->sideColumn,
));
}
+
+ private function buildFooter() {
+
+ $footer = $this->footer;
+
+ return phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-two-column-content phui-two-column-footer',
+ ),
+ array(
+ $footer,
+ ));
+
+ }
}

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 27, 9:24 PM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6719514
Default Alt Text
D15455.id.diff (2 KB)

Event Timeline