Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14076616
D17754.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D17754.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,12 +9,12 @@
'names' => array(
'conpherence.pkg.css' => 'ff161f2d',
'conpherence.pkg.js' => 'b5b51108',
- 'core.pkg.css' => '959330a2',
+ 'core.pkg.css' => 'd23d18e6',
'core.pkg.js' => '47a69358',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => '90b30783',
'differential.pkg.js' => 'ddfeb49b',
- 'diffusion.pkg.css' => '30dd8a58',
+ 'diffusion.pkg.css' => 'b93d9b8c',
'diffusion.pkg.js' => '84c8f8fd',
'favicon.ico' => '30672e08',
'maniphest.pkg.css' => '4845691a',
@@ -71,7 +71,7 @@
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
- 'rsrc/css/application/diffusion/diffusion-icons.css' => '60c21c3b',
+ 'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
'rsrc/css/application/diffusion/diffusion-readme.css' => '297373eb',
'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
@@ -164,7 +164,7 @@
'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
'rsrc/css/phui/phui-lightbox.css' => '0a035e40',
'rsrc/css/phui/phui-list.css' => '12eb8ce6',
- 'rsrc/css/phui/phui-object-box.css' => '8b289e3d',
+ 'rsrc/css/phui/phui-object-box.css' => '9cff003c',
'rsrc/css/phui/phui-pager.css' => '77d8a794',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
'rsrc/css/phui/phui-property-list-view.css' => '2dc7993f',
@@ -578,7 +578,7 @@
'differential-revision-history-css' => '0e8eb855',
'differential-revision-list-css' => 'f3c47d33',
'differential-table-of-contents-css' => 'ae4b7a55',
- 'diffusion-icons-css' => '60c21c3b',
+ 'diffusion-icons-css' => 'a6a1e2ba',
'diffusion-readme-css' => '297373eb',
'diffusion-source-css' => '750add59',
'diviner-shared-css' => '896f1d43',
@@ -872,7 +872,7 @@
'phui-invisible-character-view-css' => '6993d9f0',
'phui-lightbox-css' => '0a035e40',
'phui-list-view-css' => '12eb8ce6',
- 'phui-object-box-css' => '8b289e3d',
+ 'phui-object-box-css' => '9cff003c',
'phui-oi-big-ui-css' => '19f9369b',
'phui-oi-color-css' => 'cd2b9b77',
'phui-oi-drag-ui-css' => 'f12cbc9f',
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
@@ -57,7 +57,8 @@
$content = id(new PHUIObjectBoxView())
->setHeaderText($repository->getName())
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($table);
+ ->setTable($table)
+ ->setPager($pager);
}
$crumbs = $this->buildCrumbs(
@@ -66,8 +67,6 @@
));
$crumbs->setBorder(true);
- $pager_box = $this->renderTablePagerBox($pager);
-
$header = id(new PHUIHeaderView())
->setHeader(pht('Branches'))
->setHeaderIcon('fa-code-fork');
@@ -76,7 +75,6 @@
->setHeader($header)
->setFooter(array(
$content,
- $pager_box,
));
return $this->newPage()
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -370,7 +370,8 @@
$browse_panel = id(new PHUIObjectBoxView())
->setHeader($browse_header)
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($browse_table);
+ ->setTable($browse_table)
+ ->setPager($pager);
$browse_panel->setShowHide(
array(pht('Show Search')),
@@ -395,7 +396,6 @@
'view' => 'browse',
));
- $pager_box = $this->renderTablePagerBox($pager);
$crumbs->setBorder(true);
$view = id(new PHUITwoColumnView())
@@ -411,7 +411,6 @@
array(
$open_revisions,
$readme,
- $pager_box,
));
if ($details) {
@@ -489,14 +488,12 @@
nonempty($drequest->getPath(), '/'));
}
- $box = id(new PHUIObjectBoxView())
+ return id(new PHUIObjectBoxView())
->setHeaderText($header)
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($table);
-
- $pager_box = $this->renderTablePagerBox($pager);
+ ->setTable($table)
+ ->setPager($pager);
- return array($box, $pager_box);
}
private function renderGrepResults(array $results, $pattern) {
@@ -1775,9 +1772,8 @@
}
$header = id(new PHUIHeaderView())
- ->setHeader(pht('Open Revisions'))
- ->setSubheader(
- pht('Recently updated open revisions affecting this file.'));
+ ->setHeader(pht('Recently Open Revisions'))
+ ->setHeaderIcon('fa-gear');
$view = id(new DifferentialRevisionListView())
->setHeader($header)
diff --git a/src/applications/diffusion/controller/DiffusionCompareController.php b/src/applications/diffusion/controller/DiffusionCompareController.php
--- a/src/applications/diffusion/controller/DiffusionCompareController.php
+++ b/src/applications/diffusion/controller/DiffusionCompareController.php
@@ -92,6 +92,7 @@
array(
'view' => 'compare',
));
+ $crumbs->setBorder(true);
$pager = id(new PHUIPagerView())
->readFromRequest($request);
@@ -310,16 +311,11 @@
$header = id(new PHUIHeaderView())
->setHeader(pht('Commits'));
- $object_box = id(new PHUIObjectBoxView())
+ return id(new PHUIObjectBoxView())
->setHeader($header)
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($history_table);
+ ->setTable($history_table)
+ ->setPager($pager);
- $pager_box = $this->renderTablePagerBox($pager);
-
- return array(
- $object_box,
- $pager_box,
- );
}
}
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -317,12 +317,6 @@
->appendChild($body);
}
- protected function renderTablePagerBox(PHUIPagerView $pager) {
- return id(new PHUIBoxView())
- ->addMargin(PHUI::MARGIN_LARGE)
- ->appendChild($pager);
- }
-
protected function renderCommitHashTag(DiffusionRequest $drequest) {
$stable_commit = $drequest->getStableCommit();
$commit = phutil_tag(
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,7 +57,8 @@
$history_panel = id(new PHUIObjectBoxView())
->setHeader($history_header)
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($history_table);
+ ->setTable($history_table)
+ ->setPager($pager);
$header = $this->buildHeader($drequest);
@@ -69,13 +70,10 @@
));
$crumbs->setBorder(true);
- $pager_box = $this->renderTablePagerBox($pager);
-
$view = id(new PHUITwoColumnView())
->setHeader($header)
->setFooter(array(
$history_panel,
- $pager_box,
));
return $this->newPage()
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
@@ -456,7 +456,8 @@
$content[] = id(new PHUIObjectBoxView())
->setHeaderText(pht('Lint Details'))
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($table);
+ ->setTable($table)
+ ->setPager($pager);
$crumbs = $this->buildCrumbs(
array(
@@ -465,7 +466,6 @@
'view' => 'lint',
));
- $pager_box = $this->renderTablePagerBox($pager);
$header = id(new PHUIHeaderView())
->setHeader(pht('Lint: %s', $drequest->getRepository()->getDisplayName()))
->setHeaderIcon('fa-code');
@@ -474,7 +474,6 @@
->setHeader($header)
->setFooter(array(
$content,
- $pager_box,
));
return $this->newPage()
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -354,9 +354,9 @@
}
if ($repository->isSVN()) {
- $label = pht('Checkout');
+ $label = phutil_tag_div('diffusion-clone-label', pht('Checkout'));
} else {
- $label = pht('Clone');
+ $label = phutil_tag_div('diffusion-clone-label', pht('Clone'));
}
$view->addProperty(
@@ -686,15 +686,10 @@
$pager->setURI($browse_uri, 'offset');
if ($pager->willShowPagingControls()) {
- $pager_box = $this->renderTablePagerBox($pager);
- } else {
- $pager_box = null;
+ $browse_panel->setPager($pager);
}
- return array(
- $browse_panel,
- $pager_box,
- );
+ return $browse_panel;
}
private function renderCloneURI(
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
@@ -87,15 +87,13 @@
$box = id(new PHUIObjectBoxView())
->setHeaderText($repository->getDisplayName())
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
- ->setTable($view);
-
- $pager_box = $this->renderTablePagerBox($pager);
+ ->setTable($view)
+ ->setPager($pager);
$view = id(new PHUITwoColumnView())
->setHeader($header)
->setFooter(array(
$box,
- $pager_box,
));
return $this->newPage()
diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php
--- a/src/view/phui/PHUIObjectBoxView.php
+++ b/src/view/phui/PHUIObjectBoxView.php
@@ -18,6 +18,7 @@
private $table;
private $collapsed = false;
private $anchor;
+ private $pager;
private $showAction;
private $hideAction;
@@ -126,6 +127,11 @@
return $this;
}
+ public function setPager(PHUIPagerView $pager) {
+ $this->pager = $pager;
+ return $this;
+ }
+
public function setAnchor(PhabricatorAnchorView $anchor) {
$this->anchor = $anchor;
return $this;
@@ -294,6 +300,10 @@
$lists = null;
}
+ $pager = null;
+ if ($this->pager) {
+ $pager = phutil_tag_div('phui-object-box-pager', $this->pager);
+ }
$content = array(
($this->showHideOpen == false ? $this->anchor : null),
@@ -308,6 +318,7 @@
($this->showHideOpen == true ? $this->anchor : null),
$lists,
$this->table,
+ $pager,
$this->renderChildren(),
);
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-icons.css b/webroot/rsrc/css/application/diffusion/diffusion-icons.css
--- a/webroot/rsrc/css/application/diffusion/diffusion-icons.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-icons.css
@@ -13,6 +13,11 @@
color: {$lightgreytext};
}
+.diffusion-clone-label {
+ height: 30px;
+ line-height: 28px;
+}
+
.diffusion-browse-name {
margin-left: 8px;
}
diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css
--- a/webroot/rsrc/css/phui/phui-object-box.css
+++ b/webroot/rsrc/css/phui/phui-object-box.css
@@ -146,3 +146,15 @@
padding: 4px 8px;
background-color: {$lightgreybackground};
}
+
+/* - Pager at the bottom ---------------------------------------------------- */
+
+.phui-object-box-pager {
+ background-color: {$bluebackground};
+ border-top: 1px solid {$lightblueborder};
+}
+
+.phui-object-box-pager a.button {
+ margin-top: 8px;
+ margin-bottom: 8px;
+}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 22, 6:52 PM (18 h, 17 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6775593
Default Alt Text
D17754.diff (12 KB)
Attached To
Mode
D17754: Attach Diffusion Pagers to their ObjectBoxView
Attached
Detach File
Event Timeline
Log In to Comment