Page MenuHomePhabricator

D20925.diff
No OneTemporary

D20925.diff

diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php
--- a/src/applications/config/controller/PhabricatorConfigAllController.php
+++ b/src/applications/config/controller/PhabricatorConfigAllController.php
@@ -64,13 +64,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($view);
+ ->setFooter($view);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigApplicationController.php b/src/applications/config/controller/PhabricatorConfigApplicationController.php
--- a/src/applications/config/controller/PhabricatorConfigApplicationController.php
+++ b/src/applications/config/controller/PhabricatorConfigApplicationController.php
@@ -18,9 +18,7 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($apps_list);
+ ->setFooter($apps_list);
$crumbs = $this->buildApplicationCrumbs()
->addTextCrumb($title)
@@ -29,6 +27,7 @@
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigCacheController.php b/src/applications/config/controller/PhabricatorConfigCacheController.php
--- a/src/applications/config/controller/PhabricatorConfigCacheController.php
+++ b/src/applications/config/controller/PhabricatorConfigCacheController.php
@@ -33,13 +33,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($page);
+ ->setFooter($page);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php b/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php
@@ -26,13 +26,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($status);
+ ->setFooter($status);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php b/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php
@@ -28,13 +28,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($status);
+ ->setFooter($status);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php b/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php
@@ -32,16 +32,16 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn(array(
- $repo_status,
- $repo_errors,
- ));
+ ->setFooter(
+ array(
+ $repo_status,
+ $repo_errors,
+ ));
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigClusterSearchController.php b/src/applications/config/controller/PhabricatorConfigClusterSearchController.php
--- a/src/applications/config/controller/PhabricatorConfigClusterSearchController.php
+++ b/src/applications/config/controller/PhabricatorConfigClusterSearchController.php
@@ -26,13 +26,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($search_status);
+ ->setFooter($search_status);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigController.php b/src/applications/config/controller/PhabricatorConfigController.php
--- a/src/applications/config/controller/PhabricatorConfigController.php
+++ b/src/applications/config/controller/PhabricatorConfigController.php
@@ -7,8 +7,6 @@
}
public function buildSideNavView($filter = null, $for_app = false) {
-
-
$guide_href = new PhutilURI('/guides/');
$nav = new AphrontSideNavFilterView();
$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
--- a/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
+++ b/src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
@@ -167,13 +167,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($view);
+ ->setFooter($view);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
--- a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
+++ b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
@@ -142,13 +142,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($body);
+ ->setFooter($body);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php
--- a/src/applications/config/controller/PhabricatorConfigEditController.php
+++ b/src/applications/config/controller/PhabricatorConfigEditController.php
@@ -237,9 +237,8 @@
$view = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn(array(
+ ->setFooter(
+ array(
$error_view,
$form_box,
$status_items,
@@ -250,6 +249,7 @@
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($view);
}
diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php
--- a/src/applications/config/controller/PhabricatorConfigGroupController.php
+++ b/src/applications/config/controller/PhabricatorConfigGroupController.php
@@ -36,13 +36,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($view);
+ ->setFooter($view);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigHistoryController.php b/src/applications/config/controller/PhabricatorConfigHistoryController.php
--- a/src/applications/config/controller/PhabricatorConfigHistoryController.php
+++ b/src/applications/config/controller/PhabricatorConfigHistoryController.php
@@ -36,13 +36,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($timeline);
+ ->setFooter($timeline);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -59,13 +59,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($issue_list);
+ ->setFooter($issue_list);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
@@ -47,13 +47,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($content);
+ ->setFooter($content);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php
--- a/src/applications/config/controller/PhabricatorConfigListController.php
+++ b/src/applications/config/controller/PhabricatorConfigListController.php
@@ -22,13 +22,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($core_list);
+ ->setFooter($core_list);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigModuleController.php b/src/applications/config/controller/PhabricatorConfigModuleController.php
--- a/src/applications/config/controller/PhabricatorConfigModuleController.php
+++ b/src/applications/config/controller/PhabricatorConfigModuleController.php
@@ -28,13 +28,12 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($view);
+ ->setFooter($view);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
}
diff --git a/src/applications/config/controller/PhabricatorConfigVersionController.php b/src/applications/config/controller/PhabricatorConfigVersionController.php
--- a/src/applications/config/controller/PhabricatorConfigVersionController.php
+++ b/src/applications/config/controller/PhabricatorConfigVersionController.php
@@ -23,15 +23,13 @@
$content = id(new PHUITwoColumnView())
->setHeader($header)
- ->setNavigation($nav)
- ->setFixed(true)
- ->setMainColumn($view);
+ ->setFooter($view);
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
+ ->setNavigation($nav)
->appendChild($content);
-
}
public function renderModuleStatus($viewer) {

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 7:46 AM (20 h, 32 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6785369
Default Alt Text
D20925.diff (12 KB)

Event Timeline