From 93e28da76eb2f9bdebb734e624545dc0a1b890ee Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 19 May 2017 17:54:53 +0000 Subject: [PATCH] Add more "disabled" UI to PHUIObjectItemView Summary: Brings more UI tweaks to disabled objects, like projects/people. Also fixes a missing icon in projects. Test Plan: Application search with people and projects that have disabled results. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T12732 Differential Revision: https://secure.phabricator.com/D17962 --- resources/celerity/map.php | 6 +++--- .../people/query/PhabricatorPeopleSearchEngine.php | 1 + .../project/view/PhabricatorProjectListView.php | 2 +- .../rsrc/css/phui/object-item/phui-oi-list-view.css | 11 +++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 614824d9c6..9cc404312d 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => 'ff161f2d', 'conpherence.pkg.js' => 'b5b51108', - 'core.pkg.css' => '0ab752b2', + 'core.pkg.css' => 'd6dc3994', 'core.pkg.js' => 'a0c8fb20', 'darkconsole.pkg.js' => '1f9a31bc', 'differential.pkg.css' => '52b014e7', @@ -131,7 +131,7 @@ return array( 'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77', 'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3', 'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6', - 'rsrc/css/phui/object-item/phui-oi-list-view.css' => '7c8ec27a', + 'rsrc/css/phui/object-item/phui-oi-list-view.css' => '412bef1a', 'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea', 'rsrc/css/phui/phui-action-list.css' => 'c01858f4', 'rsrc/css/phui/phui-action-panel.css' => '91c7b835', @@ -869,7 +869,7 @@ return array( 'phui-oi-color-css' => 'cd2b9b77', 'phui-oi-drag-ui-css' => '08f4ccc3', 'phui-oi-flush-ui-css' => '9d9685d6', - 'phui-oi-list-view-css' => '7c8ec27a', + 'phui-oi-list-view-css' => '412bef1a', 'phui-oi-simple-ui-css' => 'a8beebea', 'phui-pager-css' => '77d8a794', 'phui-pinboard-view-css' => '2495140e', diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php index e800a8ee1a..fa363c4428 100644 --- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php +++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php @@ -265,6 +265,7 @@ final class PhabricatorPeopleSearchEngine if ($user->getIsDisabled()) { $item->addIcon('fa-ban', pht('Disabled')); + $item->setDisabled(true); } if (!$is_approval) { diff --git a/src/applications/project/view/PhabricatorProjectListView.php b/src/applications/project/view/PhabricatorProjectListView.php index d1d0792855..7496a401bb 100644 --- a/src/applications/project/view/PhabricatorProjectListView.php +++ b/src/applications/project/view/PhabricatorProjectListView.php @@ -68,7 +68,7 @@ final class PhabricatorProjectListView extends AphrontView { )); if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ARCHIVED) { - $item->addIcon('delete-grey', pht('Archived')); + $item->addIcon('fa-ban', pht('Archived')); $item->setDisabled(true); } diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css index 2f29001f9a..26b0781e8d 100644 --- a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css +++ b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css @@ -390,6 +390,17 @@ ul.phui-oi-icons { text-decoration: line-through; } +.phui-oi.phui-oi-disabled .phui-oi-image { + opacity: .8; + -webkit-filter: grayscale(100%); + filter: grayscale(100%); +} + +.phui-oi.phui-oi-disabled .phui-oi-attribute, +.phui-oi.phui-oi-disabled .phui-oi-attribute .phui-icon-view { + color: {$lightgreytext}; +} + /* - Effects -------------------------------------------------------------------