Page MenuHomePhorge
Files F2870775

D25368.1736819314.diff
No OneTemporary
Actions

D25368.1736819314.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,7 +9,7 @@
'names' => array(
'conpherence.pkg.css' => '76ed87e3',
'conpherence.pkg.js' => '020aebcf',
- 'core.pkg.css' => '67a5ecf3',
+ 'core.pkg.css' => '1a5169fe',
'core.pkg.js' => '2eeda9e0',
'dark-console.pkg.js' => '187792c2',
'differential.pkg.css' => '525f9a1d',
@@ -167,7 +167,7 @@
'rsrc/css/phui/phui-invisible-character-view.css' => 'c694c4a4',
'rsrc/css/phui/phui-left-right.css' => '68513c34',
'rsrc/css/phui/phui-lightbox.css' => '4ebf22da',
- 'rsrc/css/phui/phui-list.css' => '0c04affd',
+ 'rsrc/css/phui/phui-list.css' => 'ccf73664',
'rsrc/css/phui/phui-object-box.css' => 'fdffed5c',
'rsrc/css/phui/phui-pager.css' => 'd022c7ad',
'rsrc/css/phui/phui-pinboard-view.css' => '1f08f5d8',
@@ -864,7 +864,7 @@
'phui-invisible-character-view-css' => 'c694c4a4',
'phui-left-right-css' => '68513c34',
'phui-lightbox-css' => '4ebf22da',
- 'phui-list-view-css' => '0c04affd',
+ 'phui-list-view-css' => 'ccf73664',
'phui-object-box-css' => 'fdffed5c',
'phui-oi-big-ui-css' => 'fa74cc35',
'phui-oi-color-css' => 'b517bfa0',
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
@@ -273,6 +273,11 @@
->addClass('dashboard-box')
->addSigil('dashboard-panel');
+ // Allow to style Archived Panels differently.
+ if ($panel && $panel->getIsArchived()) {
+ $box->addClass('dashboard-panel-disabled');
+ }
+
if ($this->getMovable()) {
$box->addSigil('panel-movable');
}
@@ -302,6 +307,16 @@
$header = id(new PHUIHeaderView())
->setHeader($header_text);
$header = $this->addPanelHeaderActions($header);
+
+ // If the Panel is Archived, show in edit mode as such.
+ if ($panel && $panel->getIsArchived()) {
+ $header->setSubheader(
+ id(new PHUITagView())
+ ->setType(PHUITagView::TYPE_SHADE)
+ ->setColor(PHUITagView::COLOR_RED)
+ ->setIcon('fa-ban')
+ ->setName(pht('Archived')));
+ }
break;
case self::HEADER_MODE_NORMAL:
default:
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
--- a/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
@@ -71,6 +71,13 @@
foreach ($column->getPanelRefs() as $panel_ref) {
$panel_phid = $panel_ref->getPanelPHID();
+ $panel = idx($panels, $panel_phid);
+
+ // Do not render Archived panels in view mode.
+ if ($panel && $panel->getIsArchived() && !$is_editable) {
+ continue;
+ }
+
$panel_engine = id(new PhabricatorDashboardPanelRenderingEngine())
->setViewer($viewer)
->setEnableAsyncRendering(true)
@@ -83,7 +90,6 @@
->setMovable(true)
->setPanelHandle($handles[$panel_phid]);
- $panel = idx($panels, $panel_phid);
if ($panel) {
$panel_engine->setPanel($panel);
}
diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
--- a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
@@ -19,6 +19,13 @@
return $this;
}
+ /**
+ * Whether to get only the Archived (`true`), only the not
+ * Archived (`false`) or all (`null`). Default to `null` (no filter).
+ *
+ * @param null|bool $archived
+ * @return self
+ */
public function withArchived($archived) {
$this->archived = $archived;
return $this;
diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css
--- a/webroot/rsrc/css/phui/phui-list.css
+++ b/webroot/rsrc/css/phui/phui-list.css
@@ -287,6 +287,10 @@
border-bottom: 1px solid {$thinblueborder};
}
+.dashboard-panel-disabled {
+ color: {$lightgreytext};
+}
+
/* - Info Stack ------------------------------------------------------------ */
.phui-info-view + .phui-list-view {

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 14, 01:48 (3 d, 21 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1113678
Default Alt Text
D25368.1736819314.diff (4 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0