Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13355920
D12001.id28899.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D12001.id28899.diff
View Options
diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
@@ -45,10 +45,9 @@
->setCommits($commits)
->setDiffusionRequest($drequest);
- $panel = id(new AphrontPanelView())
- ->setNoBackground(true)
- ->appendChild($view)
- ->appendChild($pager);
+ $panel = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Branches'))
+ ->appendChild($view);
$content = $panel;
}
@@ -62,6 +61,7 @@
array(
$crumbs,
$content,
+ $pager,
),
array(
'title' => array(
diff --git a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
@@ -57,9 +57,9 @@
$browse_table->setPaths($results->getPaths());
$browse_table->setUser($request->getUser());
- $browse_panel = new AphrontPanelView();
+ $browse_panel = new PHUIObjectBoxView();
+ $browse_panel->setHeaderText($drequest->getPath(), '/');
$browse_panel->appendChild($browse_table);
- $browse_panel->setNoBackground();
$content[] = $browse_panel;
}
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -899,9 +899,11 @@
$caption = null;
if (count($merges) > $limit) {
$merges = array_slice($merges, 0, $limit);
- $caption =
- "This commit merges more than {$limit} changes. Only the first ".
- "{$limit} are shown.";
+ $caption = new PHUIInfoView();
+ $caption->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
+ $caption->appendChild(
+ pht('This commit merges more than %d changes. Only the first '.
+ '%d are shown.', $limit));
}
$history_table = new DiffusionHistoryTableView();
@@ -914,11 +916,12 @@
$handles = $this->loadViewerHandles($phids);
$history_table->setHandles($handles);
- $panel = new AphrontPanelView();
- $panel->setHeader(pht('Merged Changes'));
- $panel->setCaption($caption);
+ $panel = new PHUIObjectBoxView();
+ $panel->setHeaderText(pht('Merged Changes'));
$panel->appendChild($history_table);
- $panel->setNoBackground();
+ if ($caption) {
+ $panel->setErrorView($caption);
+ }
return $panel;
}
diff --git a/src/applications/diffusion/controller/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php
--- a/src/applications/diffusion/controller/DiffusionExternalController.php
+++ b/src/applications/diffusion/controller/DiffusionExternalController.php
@@ -124,10 +124,14 @@
'wide',
));
- $content = new AphrontPanelView();
- $content->setHeader(pht('Multiple Matching Commits'));
- $content->setCaption(
- pht('This external reference matches multiple known commits.'));
+ $caption = id(new PHUIInfoView())
+ ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+ ->appendChild(
+ pht('This external reference matches multiple known commits.'));
+
+ $content = new PHUIObjectBoxView();
+ $content->setHeaderText(pht('Multiple Matching Commits'));
+ $content->setErrorView($caption);
$content->appendChild($table);
}
diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
--- a/src/applications/diffusion/controller/DiffusionHistoryController.php
+++ b/src/applications/diffusion/controller/DiffusionHistoryController.php
@@ -57,10 +57,9 @@
$history_table->setIsHead($offset == 0);
}
- $history_panel = new AphrontPanelView();
+ $history_panel = new PHUIObjectBoxView();
+ $history_panel->setHeaderText(pht('History'));
$history_panel->appendChild($history_table);
- $history_panel->appendChild($pager);
- $history_panel->setNoBackground();
$content[] = $history_panel;
@@ -88,6 +87,7 @@
$crumbs,
$object_box,
$content,
+ $pager,
),
array(
'title' => array(
diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php
--- a/src/applications/diffusion/controller/DiffusionLintController.php
+++ b/src/applications/diffusion/controller/DiffusionLintController.php
@@ -104,7 +104,6 @@
$content = array();
- $link = null;
if (!$this->diffusionRequest) {
$form = id(new AphrontFormView())
->setUser($user)
@@ -122,9 +121,8 @@
$content[] = id(new AphrontListFilterView())->appendChild($form);
}
- $content[] = id(new AphrontPanelView())
- ->setNoBackground(true)
- ->setCaption($link)
+ $content[] = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Lint'))
->appendChild($table);
$title = array('Lint');
diff --git a/src/applications/diffusion/controller/DiffusionLintDetailsController.php b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
--- a/src/applications/diffusion/controller/DiffusionLintDetailsController.php
+++ b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
@@ -72,10 +72,9 @@
->setHasMorePages(count($messages) >= $limit)
->setURI($request->getRequestURI(), 'offset');
- $content[] = id(new AphrontPanelView())
- ->setNoBackground(true)
- ->appendChild($table)
- ->appendChild($pager);
+ $content[] = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Lint Details'))
+ ->appendChild($table);
$crumbs = $this->buildCrumbs(
array(
@@ -88,6 +87,7 @@
array(
$crumbs,
$content,
+ $pager,
),
array(
'title' =>
diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
--- a/src/applications/diffusion/controller/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/DiffusionSymbolController.php
@@ -137,14 +137,12 @@
$table->setNoDataString(
pht('No matching symbol could be found in any indexed project.'));
- $panel = new AphrontPanelView();
- $panel->setHeader(pht('Similar Symbols'));
+ $panel = new PHUIObjectBoxView();
+ $panel->setHeaderText(pht('Similar Symbols'));
$panel->appendChild($table);
return $this->buildApplicationPage(
- array(
- $panel,
- ),
+ $panel,
array(
'title' => pht('Find Symbol'),
));
diff --git a/src/applications/diffusion/controller/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
--- a/src/applications/diffusion/controller/DiffusionTagListController.php
+++ b/src/applications/diffusion/controller/DiffusionTagListController.php
@@ -66,10 +66,9 @@
$handles = $this->loadViewerHandles($phids);
$view->setHandles($handles);
- $panel = id(new AphrontPanelView())
- ->setNoBackground(true)
- ->appendChild($view)
- ->appendChild($pager);
+ $panel = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Tags'))
+ ->appendChild($view);
$content = $panel;
}
@@ -84,6 +83,7 @@
array(
$crumbs,
$content,
+ $pager,
),
array(
'title' => array(
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Jun 25, 1:41 PM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277336
Default Alt Text
D12001.id28899.diff (7 KB)
Attached To
Mode
D12001: Remove AphrontPanelView from Diffusion
Attached
Detach File
Event Timeline
Log In to Comment