From 71d9a6be07436b5ab0f4886acf942fe8a911fd5e Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 12 Jun 2014 07:11:00 -0700 Subject: [PATCH] Clean up error state on Dashboards Summary: A more basic error view Test Plan: Made stuff up {F165315} Reviewers: epriestley Reviewed By: epriestley Subscribers: epriestley, Korvin Maniphest Tasks: T5319 Differential Revision: https://secure.phabricator.com/D9495 --- resources/celerity/map.php | 4 ++-- .../PhabricatorDashboardPanelRenderingEngine.php | 13 +++++++++---- .../rsrc/css/application/dashboard/dashboard.css | 8 ++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 6d3c529843..7dd4df9403 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -51,7 +51,7 @@ return array( 'rsrc/css/application/conpherence/widget-pane.css' => 'bf275a6c', 'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4', 'rsrc/css/application/countdown/timer.css' => '86b7b0a0', - 'rsrc/css/application/dashboard/dashboard.css' => 'f593f8c2', + 'rsrc/css/application/dashboard/dashboard.css' => 'f0092e3e', 'rsrc/css/application/diff/inline-comment-summary.css' => '8cfd34e8', 'rsrc/css/application/differential/add-comment.css' => 'c478bcaa', 'rsrc/css/application/differential/changeset-view.css' => 'ff8eacf8', @@ -694,7 +694,7 @@ return array( 'phabricator-core-css' => '40151074', 'phabricator-countdown-css' => '86b7b0a0', 'phabricator-crumbs-view-css' => '7fbf25b8', - 'phabricator-dashboard-css' => 'f593f8c2', + 'phabricator-dashboard-css' => 'f0092e3e', 'phabricator-drag-and-drop-file-upload' => 'ae6abfba', 'phabricator-draggable-list' => '1681c4d4', 'phabricator-fatal-config-template-css' => '25d446d6', diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php index 1e8b3a0c31..91771cb05a 100644 --- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php +++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php @@ -156,19 +156,24 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject { case self::HEADER_MODE_EDIT: $header = id(new PhabricatorActionHeaderView()) ->setHeaderTitle($title) - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED); + ->setHeaderColor(PhabricatorActionHeaderView::HEADER_WHITE); $header = $this->addPanelHeaderActions($header); break; case self::HEADER_MODE_NORMAL: default: $header = id(new PhabricatorActionHeaderView()) ->setHeaderTitle($title) - ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED); + ->setHeaderColor(PhabricatorActionHeaderView::HEADER_WHITE); break; } + $icon = id(new PHUIIconView()) + ->setIconFont('fa-warning red msr'); + $content = id(new PHUIBoxView()) + ->addClass('dashboard-box') + ->appendChild($icon) + ->appendChild($body); return $this->renderPanelDiv( - id(new AphrontErrorView()) - ->appendChild($body), + $content, $header); } diff --git a/webroot/rsrc/css/application/dashboard/dashboard.css b/webroot/rsrc/css/application/dashboard/dashboard.css index 47b2c3280d..11ff9ccbec 100644 --- a/webroot/rsrc/css/application/dashboard/dashboard.css +++ b/webroot/rsrc/css/application/dashboard/dashboard.css @@ -75,3 +75,11 @@ .aphront-multi-column-column .aphront-error-view { margin: 0; } + +.dashboard-panel .dashboard-box { + padding: 12px; + background: #fff; + border-left: 1px solid {$lightblueborder}; + border-right: 1px solid {$lightblueborder}; + border-bottom: 1px solid {$blueborder}; +}