Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14357257
D11659.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D11659.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
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'a3a54ca1',
+ 'core.pkg.css' => '8edbf4c0',
'core.pkg.js' => '23d653bb',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '380f07e5',
@@ -52,7 +52,7 @@
'rsrc/css/application/conpherence/widget-pane.css' => '3d575438',
'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
'rsrc/css/application/countdown/timer.css' => '86b7b0a0',
- 'rsrc/css/application/dashboard/dashboard.css' => 'ec324e2a',
+ 'rsrc/css/application/dashboard/dashboard.css' => 'c0062064',
'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
'rsrc/css/application/differential/changeset-view.css' => 'b2b71e76',
@@ -138,7 +138,7 @@
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-list.css' => '53deb25c',
'rsrc/css/phui/phui-object-box.css' => 'b8b7fd78',
- 'rsrc/css/phui/phui-object-item-list-view.css' => 'da095b41',
+ 'rsrc/css/phui/phui-object-item-list-view.css' => '86e05b7c',
'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269',
'rsrc/css/phui/phui-property-list-view.css' => '51480060',
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
@@ -717,7 +717,7 @@
'phabricator-content-source-view-css' => '4b8b05d4',
'phabricator-core-css' => 'd7f6ec35',
'phabricator-countdown-css' => '86b7b0a0',
- 'phabricator-dashboard-css' => 'ec324e2a',
+ 'phabricator-dashboard-css' => 'c0062064',
'phabricator-drag-and-drop-file-upload' => '8c49f386',
'phabricator-draggable-list' => 'a16ec1c6',
'phabricator-fatal-config-template-css' => '25d446d6',
@@ -792,7 +792,7 @@
'phui-info-panel-css' => '27ea50a1',
'phui-list-view-css' => '53deb25c',
'phui-object-box-css' => 'b8b7fd78',
- 'phui-object-item-list-view-css' => 'da095b41',
+ 'phui-object-item-list-view-css' => '86e05b7c',
'phui-pinboard-view-css' => '3dd4a269',
'phui-property-list-view-css' => '51480060',
'phui-remarkup-preview-css' => '19ad512b',
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -778,6 +778,7 @@
$user = $this->getRequest()->getUser();
$view = id(new DifferentialRevisionListView())
+ ->setHeader(pht('Open Revisions Affecting These Files'))
->setRevisions($revisions)
->setUser($user);
@@ -785,9 +786,7 @@
$handles = $this->loadViewerHandles($phids);
$view->setHandles($handles);
- return id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Open Revisions Affecting These Files'))
- ->appendChild($view);
+ return $view;
}
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -261,7 +261,8 @@
$viewer = $this->requireViewer();
$template = id(new DifferentialRevisionListView())
- ->setUser($viewer);
+ ->setUser($viewer)
+ ->setNoBox($this->isPanelContext());
$views = array();
if ($query->getQueryKey() == 'active') {
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -10,6 +10,7 @@
private $highlightAge;
private $header;
private $noDataString;
+ private $noBox;
public function setNoDataString($no_data_string) {
$this->noDataString = $no_data_string;
@@ -32,6 +33,11 @@
return $this;
}
+ public function setNoBox($box) {
+ $this->noBox = $box;
+ return $this;
+ }
+
public function getRequiredHandlePHIDs() {
$phids = array();
foreach ($this->revisions as $revision) {
@@ -179,9 +185,18 @@
$list->addItem($item);
}
- $list->setHeader($this->header);
$list->setNoDataString($this->noDataString);
+
+ if ($this->header && !$this->noBox) {
+ $list->setFlush(true);
+ $list = id(new PHUIObjectBoxView())
+ ->setHeaderText($this->header)
+ ->appendChild($list);
+ } else {
+ $list->setHeader($this->header);
+ }
+
return $list;
}
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
@@ -208,6 +208,7 @@
}
$view = id(new DifferentialRevisionListView())
+ ->setHeader(pht('Pending Differential Revisions'))
->setRevisions($revisions)
->setUser($user);
@@ -215,9 +216,7 @@
$handles = $this->loadViewerHandles($phids);
$view->setHandles($handles);
- return id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Pending Differential Revisions'))
- ->appendChild($view);
+ return $view;
}
}
diff --git a/webroot/rsrc/css/application/dashboard/dashboard.css b/webroot/rsrc/css/application/dashboard/dashboard.css
--- a/webroot/rsrc/css/application/dashboard/dashboard.css
+++ b/webroot/rsrc/css/application/dashboard/dashboard.css
@@ -70,6 +70,10 @@
margin: 0;
}
+.dashboard-panel .phui-object-item-empty .phui-error-view {
+ margin: 0;
+}
+
.dashboard-panel .dashboard-box {
padding: 12px;
background: #fff;
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -69,6 +69,10 @@
margin: 0 0 4px 0;
}
+.phui-object-box .phui-object-list-flush .phui-object-item {
+ margin: 0;
+}
+
.phui-object-item-name {
font-weight: bold;
padding: 8px 8px 0;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Dec 21, 3:30 AM (17 h, 53 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6912668
Default Alt Text
D11659.diff (6 KB)
Attached To
Mode
D11659: Have DifferentialRevisionListView return ObjectBoxView
Attached
Detach File
Event Timeline
Log In to Comment