From c038c643f498daeea14f5ee0d0281e032dba71e8 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sun, 1 Mar 2015 14:45:56 -0800 Subject: [PATCH] Move PHUIErrorView to PHUIInfoView Summary: Since this element isn't strictly about errors, re-label as info view instead. Test Plan: Grepped for all callsites, tested UIExamples and a few other random pages. Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: hach-que, Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11867 --- resources/celerity/map.php | 32 ++++---- resources/celerity/packages.php | 2 +- src/__phutil_library_map__.php | 8 +- ...AphrontDefaultApplicationConfiguration.php | 2 +- .../almanac/controller/AlmanacController.php | 4 +- .../controller/PhabricatorAuthController.php | 2 +- ...bricatorAuthNeedsMultiFactorController.php | 8 +- .../PhabricatorAuthRegisterController.php | 4 +- .../PhabricatorEmailLoginController.php | 2 +- .../PhabricatorMustVerifyEmailController.php | 4 +- .../config/PhabricatorAuthListController.php | 6 +- .../provider/PhabricatorLDAPAuthProvider.php | 2 +- .../PhabricatorPasswordAuthProvider.php | 2 +- ...PhabricatorCalendarEventEditController.php | 2 +- .../PhabricatorCalendarViewController.php | 16 ++-- .../PhabricatorConfigEditController.php | 10 +-- .../PhabricatorConfigIssueListController.php | 4 +- .../PhabricatorConfigIssueViewController.php | 4 +- .../ConpherenceUpdateController.php | 2 +- .../PhabricatorWorkerTaskDetailController.php | 4 +- .../PhabricatorDashboardManageController.php | 4 +- .../PhabricatorDashboardViewController.php | 4 +- .../DifferentialDiffViewController.php | 4 +- .../DifferentialRevisionLandController.php | 2 +- .../DifferentialRevisionViewController.php | 12 +-- .../view/DifferentialAddCommentView.php | 2 +- .../DiffusionBrowseFileController.php | 8 +- .../controller/DiffusionCommitController.php | 10 +-- .../controller/DiffusionController.php | 4 +- .../DiffusionExternalController.php | 4 +- .../DiffusionMirrorEditController.php | 2 +- .../DiffusionRepositoryController.php | 4 +- .../DiffusionSetPasswordSettingsPanel.php | 4 +- .../view/DiffusionEmptyResultView.php | 10 +-- .../controller/DivinerAtomController.php | 4 +- .../PhabricatorFactHomeController.php | 4 +- .../feed/builder/PhabricatorFeedBuilder.php | 4 +- .../HarbormasterPlanRunController.php | 2 +- .../HarbormasterStepAddController.php | 2 +- .../controller/HeraldTranscriptController.php | 12 +-- .../PhabricatorHomeMainController.php | 4 +- .../LegalpadDocumentSignController.php | 14 ++-- .../LegalpadDocumentSignatureSearchEngine.php | 4 +- .../controller/ManiphestReportController.php | 4 +- .../ManiphestTaskEditController.php | 4 +- ...bricatorApplicationEditEmailController.php | 2 +- ...habricatorNotificationStatusController.php | 2 +- .../PhabricatorOAuthServerController.php | 4 +- .../PassphraseCredentialEditController.php | 2 +- .../PhabricatorPeopleInviteSendController.php | 8 +- .../PhabricatorPeopleLdapController.php | 4 +- .../PhabricatorPeopleRenameController.php | 2 +- .../phame/controller/PhameController.php | 4 +- .../post/PhamePostNewController.php | 4 +- .../post/PhamePostViewController.php | 8 +- .../controller/PhortuneCartViewController.php | 4 +- .../PhortunePaymentMethodCreateController.php | 2 +- .../controller/PhragmentController.php | 4 +- .../controller/PhragmentCreateController.php | 2 +- .../controller/PhragmentUpdateController.php | 2 +- .../PhrictionDocumentController.php | 24 +++--- .../controller/PhrictionEditController.php | 4 +- .../PhabricatorPolicyEditController.php | 2 +- .../PonderQuestionViewController.php | 4 +- .../request/ReleephRequestEditController.php | 4 +- ...PhabricatorApplicationSearchController.php | 2 +- ...ricatorConduitCertificateSettingsPanel.php | 4 +- ...PhabricatorEmailAddressesSettingsPanel.php | 2 +- ...UIErrorExample.php => PHUIInfoExample.php} | 30 ++++--- src/view/AphrontDialogView.php | 2 +- .../{PHUIErrorView.php => PHUIInfoView.php} | 16 ++-- src/view/phui/PHUIObjectBoxView.php | 10 +-- src/view/phui/PHUIObjectItemListView.php | 4 +- src/view/phui/PHUIPinboardView.php | 4 +- .../phui/calendar/PHUICalendarMonthView.php | 2 +- .../css/application/dashboard/dashboard.css | 4 +- webroot/rsrc/css/application/phame/phame.css | 2 +- .../css/application/profile/profile-view.css | 2 +- webroot/rsrc/css/phui/phui-document.css | 2 +- webroot/rsrc/css/phui/phui-error-view.css | 80 +++++++++---------- webroot/rsrc/css/phui/phui-object-box.css | 2 +- .../css/phui/phui-object-item-list-view.css | 8 +- 82 files changed, 263 insertions(+), 257 deletions(-) rename src/applications/uiexample/examples/{PHUIErrorExample.php => PHUIInfoExample.php} (66%) rename src/view/form/{PHUIErrorView.php => PHUIInfoView.php} (84%) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 4e0ddb9f91..8005c24268 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '382f51c7', + 'core.pkg.css' => '2e669d0e', 'core.pkg.js' => '23d653bb', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '4c3242f8', @@ -53,7 +53,7 @@ return array( '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' => 'c0062064', + 'rsrc/css/application/dashboard/dashboard.css' => '17937d22', 'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c', 'rsrc/css/application/differential/add-comment.css' => 'c478bcaa', 'rsrc/css/application/differential/changeset-view.css' => 'a7781046', @@ -80,7 +80,7 @@ return array( 'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b', 'rsrc/css/application/paste/paste.css' => 'eb997ddd', 'rsrc/css/application/people/people-profile.css' => '25970776', - 'rsrc/css/application/phame/phame.css' => 'db5682e3', + 'rsrc/css/application/phame/phame.css' => '88bd4705', 'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee', 'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49', 'rsrc/css/application/pholio/pholio.css' => '95174bdd', @@ -95,7 +95,7 @@ return array( 'rsrc/css/application/ponder/feed.css' => 'e62615b6', 'rsrc/css/application/ponder/post.css' => 'ebab8a70', 'rsrc/css/application/ponder/vote.css' => '8ed6ed8b', - 'rsrc/css/application/profile/profile-view.css' => 'd8cb982b', + 'rsrc/css/application/profile/profile-view.css' => '1a20dcbf', 'rsrc/css/application/projects/project-icon.css' => 'c2ecb7f1', 'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733', 'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5', @@ -127,8 +127,8 @@ return array( 'rsrc/css/phui/phui-box.css' => '7b3a2eed', 'rsrc/css/phui/phui-button.css' => '21cb97f9', 'rsrc/css/phui/phui-crumbs-view.css' => '594d719e', - 'rsrc/css/phui/phui-document.css' => '8240b0b1', - 'rsrc/css/phui/phui-error-view.css' => '41518665', + 'rsrc/css/phui/phui-document.css' => '620b1eec', + 'rsrc/css/phui/phui-error-view.css' => 'ffc48131', 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', 'rsrc/css/phui/phui-fontkit.css' => '4394f216', 'rsrc/css/phui/phui-form-view.css' => '8b78a986', @@ -138,8 +138,8 @@ return array( 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', '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' => '12cfa14f', + 'rsrc/css/phui/phui-object-box.css' => 'd68ce5dc', + 'rsrc/css/phui/phui-object-item-list-view.css' => '9db65899', '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', @@ -719,7 +719,7 @@ return array( 'phabricator-content-source-view-css' => '4b8b05d4', 'phabricator-core-css' => 'c8c5ecd2', 'phabricator-countdown-css' => '86b7b0a0', - 'phabricator-dashboard-css' => 'c0062064', + 'phabricator-dashboard-css' => '17937d22', 'phabricator-drag-and-drop-file-upload' => '8c49f386', 'phabricator-draggable-list' => 'a16ec1c6', 'phabricator-fatal-config-template-css' => '8e6c6fcd', @@ -739,7 +739,7 @@ return array( 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '72da38cc', - 'phabricator-profile-css' => 'd8cb982b', + 'phabricator-profile-css' => '1a20dcbf', 'phabricator-remarkup-css' => '2dbff225', 'phabricator-search-results-css' => 'f240504c', 'phabricator-shaped-request' => '7cbe244b', @@ -763,7 +763,7 @@ return array( 'phabricator-uiexample-reactor-sendclass' => '1def2711', 'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee', 'phabricator-zindex-css' => '8239495e', - 'phame-css' => 'db5682e3', + 'phame-css' => '88bd4705', 'pholio-css' => '95174bdd', 'pholio-edit-css' => '3ad9d1ee', 'pholio-inline-comments-css' => '8e545e49', @@ -781,8 +781,7 @@ return array( 'phui-calendar-list-css' => 'c1d0ca59', 'phui-calendar-month-css' => 'a92e47d2', 'phui-crumbs-view-css' => '594d719e', - 'phui-document-view-css' => '8240b0b1', - 'phui-error-view-css' => '41518665', + 'phui-document-view-css' => '620b1eec', 'phui-feed-story-css' => 'c9f3a0b5', 'phui-font-icon-base-css' => '3dad2ae3', 'phui-fontkit-css' => '4394f216', @@ -792,9 +791,10 @@ return array( 'phui-icon-view-css' => 'd35aa857', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', + 'phui-info-view-css' => 'ffc48131', 'phui-list-view-css' => '53deb25c', - 'phui-object-box-css' => 'b8b7fd78', - 'phui-object-item-list-view-css' => '12cfa14f', + 'phui-object-box-css' => 'd68ce5dc', + 'phui-object-item-list-view-css' => '9db65899', 'phui-pinboard-view-css' => '3dd4a269', 'phui-property-list-view-css' => '51480060', 'phui-remarkup-preview-css' => '19ad512b', @@ -2027,7 +2027,7 @@ return array( 'phabricator-transaction-view-css', 'aphront-tooltip-css', 'phabricator-flag-css', - 'phui-error-view-css', + 'phui-info-view-css', 'sprite-gradient-css', 'sprite-menu-css', 'phabricator-main-menu-view', diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php index 359098499b..cc9768196e 100644 --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -94,7 +94,7 @@ return array( 'phabricator-transaction-view-css', 'aphront-tooltip-css', 'phabricator-flag-css', - 'phui-error-view-css', + 'phui-info-view-css', 'sprite-gradient-css', 'sprite-menu-css', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 7e6e23abdc..9dea0dcf3a 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1139,8 +1139,6 @@ phutil_register_library_map(array( 'PHUICrumbsView' => 'view/phui/PHUICrumbsView.php', 'PHUIDocumentExample' => 'applications/uiexample/examples/PHUIDocumentExample.php', 'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php', - 'PHUIErrorExample' => 'applications/uiexample/examples/PHUIErrorExample.php', - 'PHUIErrorView' => 'view/form/PHUIErrorView.php', 'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php', 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', 'PHUIFormDividerControl' => 'view/form/control/PHUIFormDividerControl.php', @@ -1155,8 +1153,10 @@ phutil_register_library_map(array( 'PHUIIconView' => 'view/phui/PHUIIconView.php', 'PHUIImageMaskExample' => 'applications/uiexample/examples/PHUIImageMaskExample.php', 'PHUIImageMaskView' => 'view/phui/PHUIImageMaskView.php', + 'PHUIInfoExample' => 'applications/uiexample/examples/PHUIInfoExample.php', 'PHUIInfoPanelExample' => 'applications/uiexample/examples/PHUIInfoPanelExample.php', 'PHUIInfoPanelView' => 'view/phui/PHUIInfoPanelView.php', + 'PHUIInfoView' => 'view/form/PHUIInfoView.php', 'PHUIListExample' => 'applications/uiexample/examples/PHUIListExample.php', 'PHUIListItemView' => 'view/phui/PHUIListItemView.php', 'PHUIListView' => 'view/phui/PHUIListView.php', @@ -4366,8 +4366,6 @@ phutil_register_library_map(array( 'PHUICrumbsView' => 'AphrontView', 'PHUIDocumentExample' => 'PhabricatorUIExample', 'PHUIDocumentView' => 'AphrontTagView', - 'PHUIErrorExample' => 'PhabricatorUIExample', - 'PHUIErrorView' => 'AphrontView', 'PHUIFeedStoryExample' => 'PhabricatorUIExample', 'PHUIFeedStoryView' => 'AphrontView', 'PHUIFormDividerControl' => 'AphrontFormControl', @@ -4382,8 +4380,10 @@ phutil_register_library_map(array( 'PHUIIconView' => 'AphrontTagView', 'PHUIImageMaskExample' => 'PhabricatorUIExample', 'PHUIImageMaskView' => 'AphrontTagView', + 'PHUIInfoExample' => 'PhabricatorUIExample', 'PHUIInfoPanelExample' => 'PhabricatorUIExample', 'PHUIInfoPanelView' => 'AphrontView', + 'PHUIInfoView' => 'AphrontView', 'PHUIListExample' => 'PhabricatorUIExample', 'PHUIListItemView' => 'AphrontTagView', 'PHUIListView' => 'AphrontTagView', diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 8d18837d5c..c9c15f2f11 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -205,7 +205,7 @@ class AphrontDefaultApplicationConfiguration } if ($ex instanceof AphrontUsageException) { - $error = new PHUIErrorView(); + $error = new PHUIInfoView(); $error->setTitle($ex->getTitle()); $error->appendChild($ex->getMessage()); diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php index 4bf82a1580..826bd2793c 100644 --- a/src/applications/almanac/controller/AlmanacController.php +++ b/src/applications/almanac/controller/AlmanacController.php @@ -188,8 +188,8 @@ abstract class AlmanacController ), pht('Learn More')); - $error_view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $error_view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors( array( array($message, ' ', $doc_link), diff --git a/src/applications/auth/controller/PhabricatorAuthController.php b/src/applications/auth/controller/PhabricatorAuthController.php index 09a2cb63c5..ece2d01dc4 100644 --- a/src/applications/auth/controller/PhabricatorAuthController.php +++ b/src/applications/auth/controller/PhabricatorAuthController.php @@ -15,7 +15,7 @@ abstract class PhabricatorAuthController extends PhabricatorController { } protected function renderErrorPage($title, array $messages) { - $view = new PHUIErrorView(); + $view = new PHUIInfoView(); $view->setTitle($title); $view->setErrors($messages); diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php index 6647330ca4..57516ac6b6 100644 --- a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php +++ b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php @@ -29,9 +29,9 @@ final class PhabricatorAuthNeedsMultiFactorController $viewer->updateMultiFactorEnrollment(); if (!$viewer->getIsEnrolledInMultiFactor()) { - $help = id(new PHUIErrorView()) + $help = id(new PHUIInfoView()) ->setTitle(pht('Add Multi-Factor Authentication To Your Account')) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors( array( pht( @@ -53,9 +53,9 @@ final class PhabricatorAuthNeedsMultiFactorController 'account.'), )); } else { - $help = id(new PHUIErrorView()) + $help = id(new PHUIInfoView()) ->setTitle(pht('Multi-Factor Authentication Configured')) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setErrors( array( pht( diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php index 35ebe1d3b3..6c40375227 100644 --- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php +++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php @@ -505,8 +505,8 @@ final class PhabricatorAuthRegisterController $welcome_view = null; if ($is_setup) { - $welcome_view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $welcome_view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setTitle(pht('Welcome to Phabricator')) ->appendChild( pht( diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php index 7ddd618f73..d21ec5a1bb 100644 --- a/src/applications/auth/controller/PhabricatorEmailLoginController.php +++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php @@ -128,7 +128,7 @@ EOBODY; $error_view = null; if ($errors) { - $error_view = new PHUIErrorView(); + $error_view = new PHUIInfoView(); $error_view->setErrors($errors); } diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php index 0b610bc8e9..e64096e4be 100644 --- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php +++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php @@ -28,8 +28,8 @@ final class PhabricatorMustVerifyEmailController $sent = null; if ($request->isFormPost()) { $email->sendVerificationEmail($user); - $sent = new PHUIErrorView(); - $sent->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $sent = new PHUIInfoView(); + $sent->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $sent->setTitle(pht('Email Sent')); $sent->appendChild( pht( diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php index 76a296fdae..52be9e4d88 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthListController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php @@ -131,17 +131,17 @@ final class PhabricatorAuthListController } if (!$domains_value && !$approval_value) { - $severity = PHUIErrorView::SEVERITY_WARNING; + $severity = PHUIInfoView::SEVERITY_WARNING; $issues[] = pht( 'You can safely ignore this warning if the install itself has '. 'access controls (for example, it is deployed on a VPN) or if all of '. 'the configured providers have access controls (for example, they are '. 'all private LDAP or OAuth servers).'); } else { - $severity = PHUIErrorView::SEVERITY_NOTICE; + $severity = PHUIInfoView::SEVERITY_NOTICE; } - $warning = id(new PHUIErrorView()) + $warning = id(new PHUIInfoView()) ->setSeverity($severity) ->setErrors($issues); diff --git a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php index e90301571e..111d62601b 100644 --- a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php @@ -121,7 +121,7 @@ final class PhabricatorLDAPAuthProvider extends PhabricatorAuthProvider { ->setError($e_pass)); if ($errors) { - $errors = id(new PHUIErrorView())->setErrors($errors); + $errors = id(new PHUIInfoView())->setErrors($errors); } $dialog->appendChild($errors); diff --git a/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php b/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php index c329a97b38..6307446c88 100644 --- a/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php @@ -217,7 +217,7 @@ final class PhabricatorPasswordAuthProvider extends PhabricatorAuthProvider { } if ($errors) { - $errors = id(new PHUIErrorView())->setErrors($errors); + $errors = id(new PHUIInfoView())->setErrors($errors); } $form = id(new PHUIFormLayoutView()) diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php index d6f70b6a72..b087f2bb25 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php @@ -103,7 +103,7 @@ final class PhabricatorCalendarEventEditController $error_view = null; if ($errors) { - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setTitle(pht('Status can not be set!')) ->setErrors($errors); } diff --git a/src/applications/calendar/controller/PhabricatorCalendarViewController.php b/src/applications/calendar/controller/PhabricatorCalendarViewController.php index 625b9a393e..d45749b1e2 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarViewController.php @@ -83,22 +83,22 @@ final class PhabricatorCalendarViewController $view = null; if ($request->getExists('created')) { - $view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild(pht('Successfully created your status.')); } else if ($request->getExists('updated')) { - $view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild(pht('Successfully updated your status.')); } else if ($request->getExists('deleted')) { - $view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild(pht('Successfully deleted your status.')); } else if (!$request->getUser()->isLoggedIn()) { $login_uri = id(new PhutilURI('/auth/start/')) ->setQueryParam('next', '/calendar/'); - $view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild( pht( 'You are not logged in. %s to see your calendar events.', diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php index 12ee0be40a..0d98baeea6 100644 --- a/src/applications/config/controller/PhabricatorConfigEditController.php +++ b/src/applications/config/controller/PhabricatorConfigEditController.php @@ -108,23 +108,23 @@ final class PhabricatorConfigEditController $error_view = null; if ($errors) { - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setErrors($errors); } else if ($option->getHidden()) { $msg = pht( 'This configuration is hidden and can not be edited or viewed from '. 'the web interface.'); - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setTitle(pht('Configuration Hidden')) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->appendChild(phutil_tag('p', array(), $msg)); } else if ($option->getLocked()) { $msg = $option->getLockedMessage(); - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setTitle(pht('Configuration Locked')) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild(phutil_tag('p', array(), $msg)); } diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php index 7a63a22a1a..ab6c17d885 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueListController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php @@ -49,11 +49,11 @@ final class PhabricatorConfigIssueListController } if (empty($setup_issues)) { - $setup_issues[] = id(new PHUIErrorView()) + $setup_issues[] = id(new PHUIInfoView()) ->setTitle(pht('No Issues')) ->appendChild( pht('Your install has no current setup issues to resolve.')) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE); } $nav->appendChild($setup_issues); diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php index 6ee28bc833..a2beb8ae76 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php @@ -18,8 +18,8 @@ final class PhabricatorConfigIssueViewController PhabricatorSetupCheck::getUnignoredIssueKeys($issues)); if (empty($issues[$this->issueKey])) { - $content = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $content = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setTitle(pht('Issue Resolved')) ->appendChild(pht('This setup issue has been resolved. ')) ->appendChild( diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php index 9ab4cd68d9..89bf39a877 100644 --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -165,7 +165,7 @@ final class ConpherenceUpdateController } if ($errors) { - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php index 8f88c7f29b..c7254de181 100644 --- a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php +++ b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php @@ -24,13 +24,13 @@ final class PhabricatorWorkerTaskDetailController if (!$task) { $title = pht('Task Does Not Exist'); - $error_view = new PHUIErrorView(); + $error_view = new PHUIInfoView(); $error_view->setTitle(pht('No Such Task')); $error_view->appendChild(phutil_tag( 'p', array(), pht('This task may have recently been garbage collected.'))); - $error_view->setSeverity(PHUIErrorView::SEVERITY_NODATA); + $error_view->setSeverity(PHUIInfoView::SEVERITY_NODATA); $content = $error_view; } else { diff --git a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php index 904be4b898..c7986f78f5 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php @@ -56,8 +56,8 @@ final class PhabricatorDashboardManageController 'make changes, make a copy first.'); $box->setErrorView( - id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setErrors(array($no_edit))); } diff --git a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php index 5dc9949c78..c2353eeef8 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php @@ -67,8 +67,8 @@ final class PhabricatorDashboardViewController $id = $this->id; $manage_uri = $this->getApplicationURI("manage/{$id}/"); - return id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + return id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild( pht('This dashboard has no panels '. 'yet. Use %s to add panels.', diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php index c8145104d1..a241e03a02 100644 --- a/src/applications/differential/controller/DifferentialDiffViewController.php +++ b/src/applications/differential/controller/DifferentialDiffViewController.php @@ -29,8 +29,8 @@ final class DifferentialDiffViewController extends DifferentialController { ->setURI('/D'.$diff->getRevisionID().'?id='.$diff->getID()); } - $error_view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $error_view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE); // TODO: implement optgroup support in AphrontFormSelectControl? $select = array(); $select[] = hsprintf('', pht('Create New Revision')); diff --git a/src/applications/differential/controller/DifferentialRevisionLandController.php b/src/applications/differential/controller/DifferentialRevisionLandController.php index aafadcfb11..1c8ed0e9d3 100644 --- a/src/applications/differential/controller/DifferentialRevisionLandController.php +++ b/src/applications/differential/controller/DifferentialRevisionLandController.php @@ -52,7 +52,7 @@ final class DifferentialRevisionLandController extends DifferentialController { } else { $text = phutil_tag('pre', array(), $ex->getMessage()); } - $text = id(new PHUIErrorView()) + $text = id(new PHUIInfoView()) ->appendChild($text); } diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 0f06f3e20e..d8c6b7b383 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -137,9 +137,9 @@ final class DifferentialRevisionViewController extends DifferentialController { $large = $request->getStr('large'); if (count($changesets) > $limit && !$large) { $count = count($changesets); - $warning = new PHUIErrorView(); + $warning = new PHUIInfoView(); $warning->setTitle('Very Large Diff'); - $warning->setSeverity(PHUIErrorView::SEVERITY_WARNING); + $warning->setSeverity(PHUIInfoView::SEVERITY_WARNING); $warning->appendChild(hsprintf( '%s %s', pht( @@ -258,8 +258,8 @@ final class DifferentialRevisionViewController extends DifferentialController { $warning_handle_map, $handles); if ($revision_warnings) { - $revision_warnings = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $revision_warnings = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors($revision_warnings); $revision_detail_box->setErrorView($revision_warnings); } @@ -386,8 +386,8 @@ final class DifferentialRevisionViewController extends DifferentialController { $review_warnings = array_mergev($review_warnings); if ($review_warnings) { - $review_warnings_panel = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $review_warnings_panel = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors($review_warnings); $comment_form->setErrorView($review_warnings_panel); } diff --git a/src/applications/differential/view/DifferentialAddCommentView.php b/src/applications/differential/view/DifferentialAddCommentView.php index 19de41fabc..e11cc9539e 100644 --- a/src/applications/differential/view/DifferentialAddCommentView.php +++ b/src/applications/differential/view/DifferentialAddCommentView.php @@ -10,7 +10,7 @@ final class DifferentialAddCommentView extends AphrontView { private $ccs = array(); private $errorView; - public function setErrorView(PHUIErrorView $error_view) { + public function setErrorView(PHUIInfoView $error_view) { $this->errorView = $error_view; return $this; } diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index bba7832952..1772b2646b 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -118,8 +118,8 @@ final class DiffusionBrowseFileController extends DiffusionBrowseController { $follow = $request->getStr('follow'); if ($follow) { - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_WARNING); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_WARNING); $notice->setTitle(pht('Unable to Continue')); switch ($follow) { case 'first': @@ -138,8 +138,8 @@ final class DiffusionBrowseFileController extends DiffusionBrowseController { $renamed = $request->getStr('renamed'); if ($renamed) { - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $notice->setTitle(pht('File Renamed')); $notice->appendChild( pht("File history passes through a rename from '%s' to '%s'.", diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php index c0718a9ce5..01a96a6456 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -52,7 +52,7 @@ final class DiffusionCommitController extends DiffusionController { return new Aphront404Response(); } - $error = id(new PHUIErrorView()) + $error = id(new PHUIInfoView()) ->setTitle(pht('Commit Still Parsing')) ->appendChild( pht( @@ -79,9 +79,9 @@ final class DiffusionCommitController extends DiffusionController { if ($is_foreign) { $subpath = $commit_data->getCommitDetail('svn-subpath'); - $error_panel = new PHUIErrorView(); + $error_panel = new PHUIInfoView(); $error_panel->setTitle(pht('Commit Not Tracked')); - $error_panel->setSeverity(PHUIErrorView::SEVERITY_WARNING); + $error_panel->setSeverity(PHUIInfoView::SEVERITY_WARNING); $error_panel->appendChild( pht("This Diffusion repository is configured to track only one ". "subdirectory of the entire Subversion repository, and this commit ". @@ -251,8 +251,8 @@ final class DiffusionCommitController extends DiffusionController { ->setTag('a') ->setIcon($icon); - $warning_view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $warning_view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setTitle('Very Large Commit') ->appendChild( pht('This commit is very large. Load each file individually.')); diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php index f3d84b6790..0b3e97a097 100644 --- a/src/applications/diffusion/controller/DiffusionController.php +++ b/src/applications/diffusion/controller/DiffusionController.php @@ -243,8 +243,8 @@ abstract class DiffusionController extends PhabricatorController { } protected function renderStatusMessage($title, $body) { - return id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + return id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setTitle($title) ->appendChild($body); } diff --git a/src/applications/diffusion/controller/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php index 8dd9dd366c..fdffd91da4 100644 --- a/src/applications/diffusion/controller/DiffusionExternalController.php +++ b/src/applications/diffusion/controller/DiffusionExternalController.php @@ -69,9 +69,9 @@ final class DiffusionExternalController extends DiffusionController { } $desc .= $id; - $content = id(new PHUIErrorView()) + $content = id(new PHUIInfoView()) ->setTitle(pht('Unknown External')) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->appendChild(phutil_tag( 'p', array(), diff --git a/src/applications/diffusion/controller/DiffusionMirrorEditController.php b/src/applications/diffusion/controller/DiffusionMirrorEditController.php index 07bc174821..4d5e9f139f 100644 --- a/src/applications/diffusion/controller/DiffusionMirrorEditController.php +++ b/src/applications/diffusion/controller/DiffusionMirrorEditController.php @@ -84,7 +84,7 @@ final class DiffusionMirrorEditController $form_errors = null; if ($errors) { - $form_errors = id(new PHUIErrorView()) + $form_errors = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php index 873895d329..4bd8ba1dc9 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -68,9 +68,9 @@ final class DiffusionRepositoryController extends DiffusionController { if ($page_has_content) { $content[] = $this->buildNormalContent($drequest); } else { - $content[] = id(new PHUIErrorView()) + $content[] = id(new PHUIInfoView()) ->setTitle($empty_title) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors(array($empty_message)); } diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php index 2202029106..9271056c7b 100644 --- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php +++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php @@ -258,8 +258,8 @@ final class DiffusionSetPasswordSettingsPanel extends PhabricatorSettingsPanel { $saved = null; if ($request->getBool('saved')) { - $saved = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $saved = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setTitle(pht('Password Updated')) ->appendChild(pht('Your VCS password has been updated.')); } diff --git a/src/applications/diffusion/view/DiffusionEmptyResultView.php b/src/applications/diffusion/view/DiffusionEmptyResultView.php index 4066c03fe1..798fc7cf07 100644 --- a/src/applications/diffusion/view/DiffusionEmptyResultView.php +++ b/src/applications/diffusion/view/DiffusionEmptyResultView.php @@ -33,12 +33,12 @@ final class DiffusionEmptyResultView extends DiffusionView { // TODO: Under git, this error message should be more specific. It // may exist on some other branch. $body = pht('This path does not exist anywhere.'); - $severity = PHUIErrorView::SEVERITY_ERROR; + $severity = PHUIInfoView::SEVERITY_ERROR; break; case DiffusionBrowseResultSet::REASON_IS_EMPTY: $title = pht('Empty Directory'); $body = pht("This path was an empty directory at %s.\n", $commit); - $severity = PHUIErrorView::SEVERITY_NOTICE; + $severity = PHUIInfoView::SEVERITY_NOTICE; break; case DiffusionBrowseResultSet::REASON_IS_DELETED: $deleted = $this->browseResultSet->getDeletedAtCommit(); @@ -60,7 +60,7 @@ final class DiffusionEmptyResultView extends DiffusionView { self::linkCommit($drequest->getRepository(), $deleted), $browse, "r{$callsign}{$existed}"); - $severity = PHUIErrorView::SEVERITY_WARNING; + $severity = PHUIInfoView::SEVERITY_WARNING; break; case DiffusionBrowseResultSet::REASON_IS_UNTRACKED_PARENT: $subdir = $drequest->getRepository()->getDetail('svn-subpath'); @@ -70,13 +70,13 @@ final class DiffusionEmptyResultView extends DiffusionView { "of the entire repository ('%s'), ". "but you aren't looking at something in that subdirectory, so no ". "information is available.", $subdir); - $severity = PHUIErrorView::SEVERITY_WARNING; + $severity = PHUIInfoView::SEVERITY_WARNING; break; default: throw new Exception("Unknown failure reason: $reason"); } - $error_view = new PHUIErrorView(); + $error_view = new PHUIInfoView(); $error_view->setSeverity($severity); $error_view->setTitle($title); $error_view->appendChild(phutil_tag('p', array(), $body)); diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php index 49471d28dc..798c524367 100644 --- a/src/applications/diviner/controller/DivinerAtomController.php +++ b/src/applications/diviner/controller/DivinerAtomController.php @@ -92,10 +92,10 @@ final class DivinerAtomController extends DivinerController { $warnings = $atom->getWarnings(); if ($warnings) { - $warnings = id(new PHUIErrorView()) + $warnings = id(new PHUIInfoView()) ->setErrors($warnings) ->setTitle(pht('Documentation Warnings')) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING); + ->setSeverity(PHUIInfoView::SEVERITY_WARNING); } $methods = $this->composeMethods($symbol); diff --git a/src/applications/fact/controller/PhabricatorFactHomeController.php b/src/applications/fact/controller/PhabricatorFactHomeController.php index 6f4be4b94d..deeadce62d 100644 --- a/src/applications/fact/controller/PhabricatorFactHomeController.php +++ b/src/applications/fact/controller/PhabricatorFactHomeController.php @@ -97,8 +97,8 @@ final class PhabricatorFactHomeController extends PhabricatorFactController { } if (!$options) { - return id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + return id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setTitle(pht('No Chartable Facts')) ->appendChild(phutil_tag( 'p', diff --git a/src/applications/feed/builder/PhabricatorFeedBuilder.php b/src/applications/feed/builder/PhabricatorFeedBuilder.php index 80c7a12460..6f78b0dcfa 100644 --- a/src/applications/feed/builder/PhabricatorFeedBuilder.php +++ b/src/applications/feed/builder/PhabricatorFeedBuilder.php @@ -88,8 +88,8 @@ final class PhabricatorFeedBuilder { $nodatastring = $this->noDataString; } - $view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + $view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild($nodatastring); $null_view->appendChild($view); } diff --git a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php index 0997464284..cb6a90d626 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php @@ -63,7 +63,7 @@ final class HarbormasterPlanRunController extends HarbormasterController { } if ($errors) { - $errors = id(new PHUIErrorView())->setErrors($errors); + $errors = id(new PHUIInfoView())->setErrors($errors); } $title = pht('Run Build Plan Manually'); diff --git a/src/applications/harbormaster/controller/HarbormasterStepAddController.php b/src/applications/harbormaster/controller/HarbormasterStepAddController.php index 2bdbd2f790..9b5817e074 100644 --- a/src/applications/harbormaster/controller/HarbormasterStepAddController.php +++ b/src/applications/harbormaster/controller/HarbormasterStepAddController.php @@ -50,7 +50,7 @@ final class HarbormasterStepAddController extends HarbormasterController { } if ($errors) { - $errors = id(new PHUIErrorView()) + $errors = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php index 7d5aa7b6ec..d1094437dd 100644 --- a/src/applications/herald/controller/HeraldTranscriptController.php +++ b/src/applications/herald/controller/HeraldTranscriptController.php @@ -42,8 +42,8 @@ final class HeraldTranscriptController extends HeraldController { $object_xscript = $xscript->getObjectTranscript(); if (!$object_xscript) { - $notice = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $notice = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setTitle(pht('Old Transcript')) ->appendChild(phutil_tag( 'p', @@ -75,8 +75,8 @@ final class HeraldTranscriptController extends HeraldController { $this->handles = $handles; if ($xscript->getDryRun()) { - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $notice->setTitle(pht('Dry Run')); $notice->appendChild(pht('This was a dry run to test Herald '. 'rules, no actions were executed.')); @@ -319,8 +319,8 @@ final class HeraldTranscriptController extends HeraldController { } else { return $panel; } - $panel = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $panel = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setTitle($title) ->appendChild($body); } diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php index cb323afc44..6b78f2415c 100644 --- a/src/applications/home/controller/PhabricatorHomeMainController.php +++ b/src/applications/home/controller/PhabricatorHomeMainController.php @@ -327,8 +327,8 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController { } private function renderMiniPanel($title, $body) { - $panel = new PHUIErrorView(); - $panel->setSeverity(PHUIErrorView::SEVERITY_NODATA); + $panel = new PHUIInfoView(); + $panel->setSeverity(PHUIInfoView::SEVERITY_NODATA); $panel->appendChild( phutil_tag( 'p', diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php index 8663d7feba..b79af05bca 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php @@ -66,8 +66,8 @@ final class LegalpadDocumentSignController extends LegalpadController { // If they aren't logged in, we can't be as sure, so don't show // anything. if ($viewer->isLoggedIn()) { - $signed_status = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $signed_status = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors( array( pht('You have not signed this document yet.'), @@ -96,8 +96,8 @@ final class LegalpadDocumentSignController extends LegalpadController { phabricator_datetime($signed_at, $viewer)); } - $signed_status = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $signed_status = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setErrors(array($signed_text)); } @@ -125,8 +125,8 @@ final class LegalpadDocumentSignController extends LegalpadController { $login_text = pht( 'This document requires a corporate signatory. You must log in to '. 'accept this document on behalf of a company you represent.'); - $signed_status = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + $signed_status = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setErrors(array($login_text)); } @@ -266,7 +266,7 @@ final class LegalpadDocumentSignController extends LegalpadController { if (!$has_signed) { $error_view = null; if ($errors) { - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php index 9f77866560..5f79d4de0f 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php +++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php @@ -293,8 +293,8 @@ final class LegalpadDocumentSignatureSearchEngine ->appendChild($table); if (!$this->document) { - $policy_notice = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $policy_notice = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setErrors( array( pht( diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index ca81331efe..a3115a1e10 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -262,9 +262,9 @@ final class ManiphestReportController extends ManiphestController { } if ($caption) { - $caption = id(new PHUIErrorView()) + $caption = id(new PHUIInfoView()) ->appendChild($caption) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE); } $panel = new PHUIObjectBoxView(); diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php index 08d5ab9ba4..1912b94810 100644 --- a/src/applications/maniphest/controller/ManiphestTaskEditController.php +++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php @@ -522,7 +522,7 @@ final class ManiphestTaskEditController extends ManiphestController { $error_view = null; if ($errors) { - $error_view = new PHUIErrorView(); + $error_view = new PHUIInfoView(); $error_view->setErrors($errors); } @@ -692,7 +692,7 @@ final class ManiphestTaskEditController extends ManiphestController { $field_list->appendFieldsToForm($form); - require_celerity_resource('phui-error-view-css'); + require_celerity_resource('phui-info-view-css'); Javelin::initBehavior('project-create', array( 'tokenizerID' => $project_tokenizer_id, diff --git a/src/applications/meta/controller/PhabricatorApplicationEditEmailController.php b/src/applications/meta/controller/PhabricatorApplicationEditEmailController.php index d18d28098e..a8c7061fa9 100644 --- a/src/applications/meta/controller/PhabricatorApplicationEditEmailController.php +++ b/src/applications/meta/controller/PhabricatorApplicationEditEmailController.php @@ -247,7 +247,7 @@ final class PhabricatorApplicationEditEmailController } if ($errors) { - $errors = id(new PHUIErrorView()) + $errors = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/notification/controller/PhabricatorNotificationStatusController.php b/src/applications/notification/controller/PhabricatorNotificationStatusController.php index 5254890a2d..398586e59e 100644 --- a/src/applications/notification/controller/PhabricatorNotificationStatusController.php +++ b/src/applications/notification/controller/PhabricatorNotificationStatusController.php @@ -8,7 +8,7 @@ final class PhabricatorNotificationStatusController $status = PhabricatorNotificationClient::getServerStatus(); $status = $this->renderServerStatus($status); } catch (Exception $ex) { - $status = new PHUIErrorView(); + $status = new PHUIInfoView(); $status->setTitle('Notification Server Issue'); $status->appendChild(hsprintf( 'Unable to determine server status. This probably means the server '. diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerController.php index a7de3ef258..1c0dc588ba 100644 --- a/src/applications/oauthserver/controller/PhabricatorOAuthServerController.php +++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerController.php @@ -55,8 +55,8 @@ abstract class PhabricatorOAuthServerController } protected function buildErrorView($error_message) { - $error = new PHUIErrorView(); - $error->setSeverity(PHUIErrorView::SEVERITY_ERROR); + $error = new PHUIInfoView(); + $error->setSeverity(PHUIInfoView::SEVERITY_ERROR); $error->setTitle($error_message); return $error; diff --git a/src/applications/passphrase/controller/PassphraseCredentialEditController.php b/src/applications/passphrase/controller/PassphraseCredentialEditController.php index a589106eff..9732808aa9 100644 --- a/src/applications/passphrase/controller/PassphraseCredentialEditController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialEditController.php @@ -322,7 +322,7 @@ final class PassphraseCredentialEditController extends PassphraseController { if ($request->isAjax()) { if ($errors) { - $errors = id(new PHUIErrorView())->setErrors($errors); + $errors = id(new PHUIInfoView())->setErrors($errors); } $dialog = id(new AphrontDialogView()) diff --git a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php index 7543e96fbc..d9e7f6366c 100644 --- a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php +++ b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php @@ -16,7 +16,7 @@ final class PhabricatorPeopleInviteSendController $message = $request->getStr('message'); $emails = $request->getStr('emails'); - $severity = PHUIErrorView::SEVERITY_ERROR; + $severity = PHUIInfoView::SEVERITY_ERROR; if ($request->isFormPost()) { // NOTE: We aren't using spaces as a delimiter here because email // addresses with names often include spaces. @@ -61,13 +61,13 @@ final class PhabricatorPeopleInviteSendController $confirm_errors[] = pht( 'All of the addresses appear to be valid invite recipients. '. 'Confirm the actions below to continue.'); - $severity = PHUIErrorView::SEVERITY_NOTICE; + $severity = PHUIInfoView::SEVERITY_NOTICE; } else { $confirm_errors[] = pht( 'Some of the addresses you entered do not appear to be '. 'valid recipients. Review the table below. You can revise '. 'the address list, or ignore these errors and continue.'); - $severity = PHUIErrorView::SEVERITY_WARNING; + $severity = PHUIInfoView::SEVERITY_WARNING; } if ($any_valid && $request->getBool('confirm')) { @@ -159,7 +159,7 @@ final class PhabricatorPeopleInviteSendController $confirm_box = id(new PHUIObjectBoxView()) ->setErrorView( - id(new PHUIErrorView()) + id(new PHUIInfoView()) ->setErrors($confirm_errors) ->setSeverity($severity)) ->setHeaderText(pht('Confirm Invites')) diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php index 0f51e8f388..80e4703ba3 100644 --- a/src/applications/people/controller/PhabricatorPeopleLdapController.php +++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php @@ -69,8 +69,8 @@ final class PhabricatorPeopleLdapController $emails = $request->getArr('email'); $names = $request->getArr('name'); - $notice_view = new PHUIErrorView(); - $notice_view->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice_view = new PHUIInfoView(); + $notice_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $notice_view->setTitle(pht('Import Successful')); $notice_view->setErrors(array( pht('Successfully imported users from LDAP'), diff --git a/src/applications/people/controller/PhabricatorPeopleRenameController.php b/src/applications/people/controller/PhabricatorPeopleRenameController.php index c112a7d0a7..5fec0cf073 100644 --- a/src/applications/people/controller/PhabricatorPeopleRenameController.php +++ b/src/applications/people/controller/PhabricatorPeopleRenameController.php @@ -101,7 +101,7 @@ final class PhabricatorPeopleRenameController ->setError($e_username)); if ($errors) { - $errors = id(new PHUIErrorView())->setErrors($errors); + $errors = id(new PHUIInfoView())->setErrors($errors); } return $this->newDialog() diff --git a/src/applications/phame/controller/PhameController.php b/src/applications/phame/controller/PhameController.php index 0f6ef6d704..542801b189 100644 --- a/src/applications/phame/controller/PhameController.php +++ b/src/applications/phame/controller/PhameController.php @@ -95,8 +95,8 @@ abstract class PhameController extends PhabricatorController { } if (empty($stories)) { - return id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + return id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild($nodata); } diff --git a/src/applications/phame/controller/post/PhamePostNewController.php b/src/applications/phame/controller/post/PhamePostNewController.php index bc63ba0c5c..fd1ae47e89 100644 --- a/src/applications/phame/controller/post/PhamePostNewController.php +++ b/src/applications/phame/controller/post/PhamePostNewController.php @@ -70,8 +70,8 @@ final class PhamePostNewController extends PhameController { $nav->appendChild($crumbs); if (!$blogs) { - $notification = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + $notification = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild( pht('You do not have permission to join any blogs. Create a blog '. 'first, then you can post to it.')); diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php index 92cf7a05c0..7f5a798b71 100644 --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -49,8 +49,8 @@ final class PhamePostViewController extends PhameController { if ($post->isDraft()) { $object_box->appendChild( - id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setTitle(pht('Draft Post')) ->appendChild( pht('Only you can see this draft until you publish it. '. @@ -59,8 +59,8 @@ final class PhamePostViewController extends PhameController { if (!$post->getBlog()) { $object_box->appendChild( - id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_WARNING) + id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_WARNING) ->setTitle(pht('Not On A Blog')) ->appendChild( pht('This post is not associated with a blog (the blog may have '. diff --git a/src/applications/phortune/controller/PhortuneCartViewController.php b/src/applications/phortune/controller/PhortuneCartViewController.php index e11d539fb4..e5557ca8fd 100644 --- a/src/applications/phortune/controller/PhortuneCartViewController.php +++ b/src/applications/phortune/controller/PhortuneCartViewController.php @@ -86,8 +86,8 @@ final class PhortuneCartViewController } break; case PhortuneCart::STATUS_PURCHASED: - $error_view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $error_view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild(pht('This purchase has been completed.')); break; diff --git a/src/applications/phortune/controller/PhortunePaymentMethodCreateController.php b/src/applications/phortune/controller/PhortunePaymentMethodCreateController.php index 3fbf9c5649..df28a1c2a7 100644 --- a/src/applications/phortune/controller/PhortunePaymentMethodCreateController.php +++ b/src/applications/phortune/controller/PhortunePaymentMethodCreateController.php @@ -125,7 +125,7 @@ final class PhortunePaymentMethodCreateController $dialog = id(new AphrontDialogView()) ->setUser($viewer) ->setTitle(pht('Error Adding Payment Method')) - ->appendChild(id(new PHUIErrorView())->setErrors($errors)) + ->appendChild(id(new PHUIInfoView())->setErrors($errors)) ->addCancelButton($request->getRequestURI()); return id(new AphrontDialogResponse())->setDialog($dialog); diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php index 2a47c3a1b1..00ca5aa566 100644 --- a/src/applications/phragment/controller/PhragmentController.php +++ b/src/applications/phragment/controller/PhragmentController.php @@ -204,9 +204,9 @@ abstract class PhragmentController extends PhabricatorController { public function renderConfigurationWarningIfRequired() { $alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain'); if ($alt === null) { - return id(new PHUIErrorView()) + return id(new PHUIInfoView()) ->setTitle(pht('security.alternate-file-domain must be configured!')) - ->setSeverity(PHUIErrorView::SEVERITY_ERROR) + ->setSeverity(PHUIInfoView::SEVERITY_ERROR) ->appendChild(phutil_tag('p', array(), pht( 'Because Phragment generates files (such as ZIP archives and '. 'patches) as they are requested, it requires that you configure '. diff --git a/src/applications/phragment/controller/PhragmentCreateController.php b/src/applications/phragment/controller/PhragmentCreateController.php index 605b2f9c5e..5c9aee5207 100644 --- a/src/applications/phragment/controller/PhragmentCreateController.php +++ b/src/applications/phragment/controller/PhragmentCreateController.php @@ -64,7 +64,7 @@ final class PhragmentCreateController extends PhragmentController { return id(new AphrontRedirectResponse()) ->setURI('/phragment/browse/'.trim($parent_path.'/'.$v_name, '/')); } else { - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setErrors($errors) ->setTitle(pht('Errors while creating fragment')); } diff --git a/src/applications/phragment/controller/PhragmentUpdateController.php b/src/applications/phragment/controller/PhragmentUpdateController.php index ea51ad3fb9..1b8d10e91f 100644 --- a/src/applications/phragment/controller/PhragmentUpdateController.php +++ b/src/applications/phragment/controller/PhragmentUpdateController.php @@ -43,7 +43,7 @@ final class PhragmentUpdateController extends PhragmentController { return id(new AphrontRedirectResponse()) ->setURI('/phragment/browse/'.$fragment->getPath()); } else { - $error_view = id(new PHUIErrorView()) + $error_view = id(new PHUIInfoView()) ->setErrors($errors) ->setTitle(pht('Errors while updating fragment')); } diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php index b09c8ef321..7da91be5a3 100644 --- a/src/applications/phriction/controller/PhrictionDocumentController.php +++ b/src/applications/phriction/controller/PhrictionDocumentController.php @@ -42,8 +42,8 @@ final class PhrictionDocumentController $create_uri = '/phriction/edit/?slug='.$slug; - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_NODATA); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_NODATA); $notice->setTitle(pht('No content here!')); $notice->appendChild( pht( @@ -67,8 +67,8 @@ final class PhrictionDocumentController if ($content->getID() != $document->getContentID()) { $vdate = phabricator_datetime($content->getDateCreated(), $user); - $version_note = new PHUIErrorView(); - $version_note->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $version_note = new PHUIInfoView(); + $version_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $version_note->appendChild( pht('You are viewing an older version of this document, as it '. 'appeared on %s.', $vdate)); @@ -88,16 +88,16 @@ final class PhrictionDocumentController $core_content = $content->renderContent($user); } else if ($current_status == PhrictionChangeType::CHANGE_DELETE) { - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $notice->setTitle(pht('Document Deleted')); $notice->appendChild( pht('This document has been deleted. You can edit it to put new '. 'content here, or use history to revert to an earlier version.')); $core_content = $notice->render(); } else if ($current_status == PhrictionChangeType::CHANGE_STUB) { - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $notice->setTitle(pht('Empty Document')); $notice->appendChild( pht('This document is empty. You can edit it to put some proper '. @@ -119,8 +119,8 @@ final class PhrictionDocumentController $slug_uri = PhrictionDocument::getSlugURI($new_doc->getSlug()); } - $notice = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE); if ($slug_uri) { $notice->appendChild( @@ -164,8 +164,8 @@ final class PhrictionDocumentController $slug_uri = PhrictionDocument::getSlugURI($from_doc->getSlug()); } - $move_notice = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $move_notice = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE); if ($slug_uri) { $move_notice->appendChild( diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php index 9a9e0678e8..d09afb9746 100644 --- a/src/applications/phriction/controller/PhrictionEditController.php +++ b/src/applications/phriction/controller/PhrictionEditController.php @@ -94,8 +94,8 @@ final class PhrictionEditController ), pht('discard this draft')); - $draft_note = new PHUIErrorView(); - $draft_note->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $draft_note = new PHUIInfoView(); + $draft_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $draft_note->setTitle('Recovered Draft'); $draft_note->appendChild(hsprintf( '

Showing a saved draft of your edits, you can %s.

', diff --git a/src/applications/policy/controller/PhabricatorPolicyEditController.php b/src/applications/policy/controller/PhabricatorPolicyEditController.php index 240770ec14..3347712ac8 100644 --- a/src/applications/policy/controller/PhabricatorPolicyEditController.php +++ b/src/applications/policy/controller/PhabricatorPolicyEditController.php @@ -138,7 +138,7 @@ final class PhabricatorPolicyEditController )); if ($errors) { - $errors = id(new PHUIErrorView()) + $errors = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php index f81ecfadc4..342242372a 100644 --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -30,8 +30,8 @@ final class PonderQuestionViewController extends PonderController { $authors = mpull($question->getAnswers(), null, 'getAuthorPHID'); if (isset($authors[$user->getPHID()])) { - $answer_add_panel = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + $answer_add_panel = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild( pht( 'You have already answered this question. You can not answer '. diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php index 41bf8cd650..3c5a80bd99 100644 --- a/src/applications/releeph/controller/request/ReleephRequestEditController.php +++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php @@ -210,8 +210,8 @@ final class ReleephRequestEditController extends ReleephBranchController { $age_string, $handles[$pull->getRequestUserPHID()]->renderLink()), ); - $notice_view = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $notice_view = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->setErrors($notice_messages); } diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php index 759ff9cc30..ce31d19922 100644 --- a/src/applications/search/controller/PhabricatorApplicationSearchController.php +++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php @@ -165,7 +165,7 @@ final class PhabricatorApplicationSearchController $errors = $engine->getErrors(); if ($errors) { $run_query = false; - $errors = id(new PHUIErrorView()) + $errors = id(new PHUIInfoView()) ->setTitle(pht('Query Errors')) ->setErrors($errors); } diff --git a/src/applications/settings/panel/PhabricatorConduitCertificateSettingsPanel.php b/src/applications/settings/panel/PhabricatorConduitCertificateSettingsPanel.php index d72df74deb..5ffc536fad 100644 --- a/src/applications/settings/panel/PhabricatorConduitCertificateSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorConduitCertificateSettingsPanel.php @@ -61,8 +61,8 @@ final class PhabricatorConduitCertificateSettingsPanel } if ($request->getStr('regenerated')) { - $notice = new PHUIErrorView(); - $notice->setSeverity(PHUIErrorView::SEVERITY_NOTICE); + $notice = new PHUIInfoView(); + $notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE); $notice->setTitle(pht('Certificate Regenerated')); $notice->appendChild(phutil_tag( 'p', diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php index 845295d0ca..7ad59d4d37 100644 --- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php @@ -228,7 +228,7 @@ final class PhabricatorEmailAddressesSettingsPanel } if ($errors) { - $errors = id(new PHUIErrorView()) + $errors = id(new PHUIInfoView()) ->setErrors($errors); } diff --git a/src/applications/uiexample/examples/PHUIErrorExample.php b/src/applications/uiexample/examples/PHUIInfoExample.php similarity index 66% rename from src/applications/uiexample/examples/PHUIErrorExample.php rename to src/applications/uiexample/examples/PHUIInfoExample.php index 58e307fbde..d956bb3bd4 100644 --- a/src/applications/uiexample/examples/PHUIErrorExample.php +++ b/src/applications/uiexample/examples/PHUIInfoExample.php @@ -1,14 +1,14 @@ PHUIErrorView to render errors, warnings and notices.'); + 'Use PHUIInfoView to render errors, warnings and notices.'); } public function renderExample() { @@ -16,11 +16,11 @@ final class PHUIErrorExample extends PhabricatorUIExample { $user = $request->getUser(); $sevs = array( - PHUIErrorView::SEVERITY_ERROR => 'Error', - PHUIErrorView::SEVERITY_WARNING => 'Warning', - PHUIErrorView::SEVERITY_NOTICE => 'Notice', - PHUIErrorView::SEVERITY_NODATA => 'No Data', - PHUIErrorView::SEVERITY_SUCCESS => 'Success', + PHUIInfoView::SEVERITY_ERROR => 'Error', + PHUIInfoView::SEVERITY_WARNING => 'Warning', + PHUIInfoView::SEVERITY_NODATA => 'No Data', + PHUIInfoView::SEVERITY_NOTICE => 'Notice', + PHUIInfoView::SEVERITY_SUCCESS => 'Success', ); $button = id(new PHUIButtonView()) @@ -31,22 +31,26 @@ final class PHUIErrorExample extends PhabricatorUIExample { $views = array(); // Only Title foreach ($sevs as $sev => $title) { - $view = new PHUIErrorView(); + $view = new PHUIInfoView(); $view->setSeverity($sev); $view->setTitle($title); $views[] = $view; } + $views[] = phutil_tag('br', array(), null); + // Only Body foreach ($sevs as $sev => $title) { - $view = new PHUIErrorView(); + $view = new PHUIInfoView(); $view->setSeverity($sev); $view->appendChild('Several issues were encountered.'); $view->addButton($button); $views[] = $view; } + $views[] = phutil_tag('br', array(), null); + // Only Errors foreach ($sevs as $sev => $title) { - $view = new PHUIErrorView(); + $view = new PHUIInfoView(); $view->setSeverity($sev); $view->setErrors( array( @@ -56,9 +60,11 @@ final class PHUIErrorExample extends PhabricatorUIExample { )); $views[] = $view; } + $views[] = phutil_tag('br', array(), null); + // All foreach ($sevs as $sev => $title) { - $view = new PHUIErrorView(); + $view = new PHUIInfoView(); $view->setSeverity($sev); $view->setTitle($title); $view->appendChild('Several issues were encountered.'); diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php index 1b61d81dac..3d79197bd8 100644 --- a/src/view/AphrontDialogView.php +++ b/src/view/AphrontDialogView.php @@ -292,7 +292,7 @@ final class AphrontDialogView extends AphrontView { if ($errors) { $children = array( - id(new PHUIErrorView())->setErrors($errors), + id(new PHUIInfoView())->setErrors($errors), $children, ); } diff --git a/src/view/form/PHUIErrorView.php b/src/view/form/PHUIInfoView.php similarity index 84% rename from src/view/form/PHUIErrorView.php rename to src/view/form/PHUIInfoView.php index bb6771e050..0fcba6b57e 100644 --- a/src/view/form/PHUIErrorView.php +++ b/src/view/form/PHUIInfoView.php @@ -1,6 +1,6 @@ errors; if ($errors) { @@ -55,7 +55,7 @@ final class PHUIErrorView extends AphrontView { $list = phutil_tag( 'ul', array( - 'class' => 'phui-error-view-list', + 'class' => 'phui-info-view-list', ), $list); } else { @@ -67,7 +67,7 @@ final class PHUIErrorView extends AphrontView { $title = phutil_tag( 'h1', array( - 'class' => 'phui-error-view-head', + 'class' => 'phui-info-view-head', ), $title); } else { @@ -77,8 +77,8 @@ final class PHUIErrorView extends AphrontView { $this->severity = nonempty($this->severity, self::SEVERITY_ERROR); $classes = array(); - $classes[] = 'phui-error-view'; - $classes[] = 'phui-error-severity-'.$this->severity; + $classes[] = 'phui-info-view'; + $classes[] = 'phui-info-severity-'.$this->severity; $classes[] = 'grouped'; $classes = implode(' ', $classes); @@ -92,7 +92,7 @@ final class PHUIErrorView extends AphrontView { $body = phutil_tag( 'div', array( - 'class' => 'phui-error-view-body', + 'class' => 'phui-info-view-body', ), $children); } @@ -102,7 +102,7 @@ final class PHUIErrorView extends AphrontView { $buttons = phutil_tag( 'div', array( - 'class' => 'phui-error-view-actions', + 'class' => 'phui-info-view-actions', ), $this->buttons); } diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php index c5f1d0fcb1..270a0441a1 100644 --- a/src/view/phui/PHUIObjectBoxView.php +++ b/src/view/phui/PHUIObjectBoxView.php @@ -93,7 +93,7 @@ final class PHUIObjectBoxView extends AphrontView { public function setFormErrors(array $errors, $title = null) { if ($errors) { - $this->formErrors = id(new PHUIErrorView()) + $this->formErrors = id(new PHUIInfoView()) ->setTitle($title) ->setErrors($errors); } @@ -105,15 +105,15 @@ final class PHUIObjectBoxView extends AphrontView { $text = pht('Changes saved.'); } if ($saved) { - $save = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NOTICE) + $save = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) ->appendChild($text); $this->formSaved = $save; } return $this; } - public function setErrorView(PHUIErrorView $view) { + public function setErrorView(PHUIInfoView $view) { $this->errorView = $view; return $this; } @@ -192,7 +192,7 @@ final class PHUIObjectBoxView extends AphrontView { $messages[] = $error->getMessage(); } if ($messages) { - $exception_errors = id(new PHUIErrorView()) + $exception_errors = id(new PHUIInfoView()) ->setErrors($messages); } } diff --git a/src/view/phui/PHUIObjectItemListView.php b/src/view/phui/PHUIObjectItemListView.php index 9e3872ff11..108a2d6500 100644 --- a/src/view/phui/PHUIObjectItemListView.php +++ b/src/view/phui/PHUIObjectItemListView.php @@ -108,8 +108,8 @@ final class PHUIObjectItemListView extends AphrontTagView { $items = null; } else { $string = nonempty($this->noDataString, pht('No data.')); - $string = id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + $string = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild($string); $items = phutil_tag( 'li', diff --git a/src/view/phui/PHUIPinboardView.php b/src/view/phui/PHUIPinboardView.php index 21cceb6abb..6b95c53a5d 100644 --- a/src/view/phui/PHUIPinboardView.php +++ b/src/view/phui/PHUIPinboardView.php @@ -20,8 +20,8 @@ final class PHUIPinboardView extends AphrontView { if (!$this->items) { $string = nonempty($this->noDataString, pht('No data.')); - return id(new PHUIErrorView()) - ->setSeverity(PHUIErrorView::SEVERITY_NODATA) + return id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild($string) ->render(); } diff --git a/src/view/phui/calendar/PHUICalendarMonthView.php b/src/view/phui/calendar/PHUICalendarMonthView.php index cb8bd94746..71ed6e67dc 100644 --- a/src/view/phui/calendar/PHUICalendarMonthView.php +++ b/src/view/phui/calendar/PHUICalendarMonthView.php @@ -29,7 +29,7 @@ final class PHUICalendarMonthView extends AphrontView { return $this; } - public function setErrorView(PHUIErrorView $error) { + public function setErrorView(PHUIInfoView $error) { $this->error = $error; return $this; } diff --git a/webroot/rsrc/css/application/dashboard/dashboard.css b/webroot/rsrc/css/application/dashboard/dashboard.css index 5d389fa2f8..1738e49e28 100644 --- a/webroot/rsrc/css/application/dashboard/dashboard.css +++ b/webroot/rsrc/css/application/dashboard/dashboard.css @@ -66,11 +66,11 @@ .aphront-multi-column-fluid .aphront-multi-column-column-outer -.aphront-multi-column-column .phui-error-view { +.aphront-multi-column-column .phui-info-view { margin: 0; } -.dashboard-panel .phui-object-item-empty .phui-error-view { +.dashboard-panel .phui-object-item-empty .phui-info-view { margin: 0; } diff --git a/webroot/rsrc/css/application/phame/phame.css b/webroot/rsrc/css/application/phame/phame.css index 1b1be0b2df..be5c2606ee 100644 --- a/webroot/rsrc/css/application/phame/phame.css +++ b/webroot/rsrc/css/application/phame/phame.css @@ -25,7 +25,7 @@ max-width: 600px; } -.phame-post-list .phui-error-view { +.phame-post-list .phui-info-view { margin: 0; } diff --git a/webroot/rsrc/css/application/profile/profile-view.css b/webroot/rsrc/css/application/profile/profile-view.css index 210cf11fb0..85002c126e 100644 --- a/webroot/rsrc/css/application/profile/profile-view.css +++ b/webroot/rsrc/css/application/profile/profile-view.css @@ -48,7 +48,7 @@ max-width: 640px; } -.phabricator-project-feed .phui-error-view { +.phabricator-project-feed .phui-info-view { margin: 12px 0; } diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css index 2f3eab313d..a7918e299e 100644 --- a/webroot/rsrc/css/phui/phui-document.css +++ b/webroot/rsrc/css/phui/phui-document.css @@ -148,6 +148,6 @@ border-bottom: 1px solid {$thinblueborder}; } -.phui-document-view .phui-error-severity-nodata { +.phui-document-view .phui-info-severity-nodata { background-color: {$lightgreybackground}; } diff --git a/webroot/rsrc/css/phui/phui-error-view.css b/webroot/rsrc/css/phui/phui-error-view.css index cf4e436b98..15b542f29f 100644 --- a/webroot/rsrc/css/phui/phui-error-view.css +++ b/webroot/rsrc/css/phui/phui-error-view.css @@ -1,151 +1,151 @@ /** - * @provides phui-error-view-css + * @provides phui-info-view-css */ -.phui-error-view { +.phui-info-view { border-style: solid; border-left-width: 4px; } -.phui-error-view { +.phui-info-view { margin: 16px; padding: 12px; } -.device-phone .phui-error-view { +.device-phone .phui-info-view { margin: 8px; } -.phui-error-view .phui-form-view { +.phui-info-view .phui-form-view { padding: 0; } -.phui-error-view-body { +.phui-info-view-body { line-height: 1.45em; } -.phui-error-view-actions { +.phui-info-view-actions { margin-top: -3px; margin-bottom: -4px; float: right; } -.phui-error-view-head + .phui-error-view-body { +.phui-info-view-head + .phui-info-view-body { padding-top: 4px; } -.aphront-panel-plain .phui-error-view { +.aphront-panel-plain .phui-info-view { margin-left: 0; margin-right: 0; } -h1.phui-error-view-head { +h1.phui-info-view-head { font-weight: bold; font-size: 15px; } -.phui-error-view-list { +.phui-info-view-list { margin: 0 0 0 16px; list-style: disc; line-height: 1.5em; } -.phui-error-view .phui-error-view-actions .button:hover { +.phui-info-view .phui-info-view-actions .button:hover { background: #fff; box-shadow: none; } -.phui-error-severity-error, -.phui-error-severity-error .button { +.phui-info-severity-error, +.phui-info-severity-error .button { border-color: {$red}; background: {$lightred}; } -.phui-error-severity-error .button { +.phui-info-severity-error .button { color: {$red}; } -.phui-error-severity-warning, -.phui-error-severity-warning .button { +.phui-info-severity-warning, +.phui-info-severity-warning .button { border-color: {$yellow}; background: {$lightyellow}; } -.phui-error-severity-warning .button { +.phui-info-severity-warning .button { color: #bc7837; } -.phui-error-severity-notice, -.phui-error-severity-notice .button { +.phui-info-severity-notice, +.phui-info-severity-notice .button { border-color: {$blue}; background: {$lightblue}; } -.phui-error-severity-notice .button { +.phui-info-severity-notice .button { color: {$blue}; } -.phui-error-severity-nodata, -.phui-error-severity-nodata .button { +.phui-info-severity-nodata, +.phui-info-severity-nodata .button { border-color: {$lightgreyborder}; background: #fff; } -.phui-error-severity-nodata .button { +.phui-info-severity-nodata .button { color: {$greytext}; } -.phui-error-severity-success, -.phui-error-severity-success .button { +.phui-info-severity-success, +.phui-info-severity-success .button { border-color: {$green}; background: {$lightgreen}; } -.phui-error-severity-success .button { +.phui-info-severity-success .button { color: {$green}; } -.legalpad .phui-error-view { +.legalpad .phui-info-view { margin: 0; border-width: 0 0 1px 0; border-bottom: 1px solid {$lightblueborder}; } -.aphront-dialog-body .phui-error-view { +.aphront-dialog-body .phui-info-view { margin: -16px -16px 16px -16px; border-width: 0 0 1px 0; border-bottom: 1px solid {$lightblueborder}; } -.aphront-dialog-body .phui-error-view .phui-error-view-list { +.aphront-dialog-body .phui-info-view .phui-info-view-list { margin: 0 0 0 16px; list-style: disc; } -.phui-object-box .phui-error-severity-error, -.aphront-dialog-body .phui-error-severity-error { +.phui-object-box .phui-info-severity-error, +.aphront-dialog-body .phui-info-severity-error { color: {$red}; } -.phui-object-box .phui-error-severity-warning, -.aphront-dialog-body .phui-error-severity-warning { +.phui-object-box .phui-info-severity-warning, +.aphront-dialog-body .phui-info-severity-warning { color: #bc7837; } -.phui-object-box .phui-error-severity-notice, -.aphront-dialog-body .phui-error-severity-notice { +.phui-object-box .phui-info-severity-notice, +.aphront-dialog-body .phui-info-severity-notice { color: {$blue}; } -.phui-object-box .phui-error-severity-success, -.aphront-dialog-body .phui-error-severity-success { +.phui-object-box .phui-info-severity-success, +.aphront-dialog-body .phui-info-severity-success { color: {$green}; } -.phui-crumbs-view + .phui-error-view { +.phui-crumbs-view + .phui-info-view { margin-top: 0; } -.phui-crumbs-view.phui-crumbs-border + .phui-error-view { +.phui-crumbs-view.phui-crumbs-border + .phui-info-view { margin-top: 16px; } diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css index f9c7a90490..03b5cc8961 100644 --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -21,7 +21,7 @@ div.phui-object-box.phui-object-box-flush { padding: 8px 0; } -.phui-object-box .phui-header-shell + .phui-error-view { +.phui-object-box .phui-header-shell + .phui-info-view { margin: 0; border-width: 0; border-bottom: 1px solid {$lightblueborder}; diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css index 361b42a819..e07d25f9d3 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -24,11 +24,11 @@ ul.phui-object-item-list-view { margin: 0; } -.phui-object-item-list-view .phui-error-view { +.phui-object-item-list-view .phui-info-view { margin: 0; } -.phui-object-box .phui-object-item-list-view .phui-error-view { +.phui-object-box .phui-object-item-list-view .phui-info-view { margin: 4px 0; color: {$greytext}; border: none; @@ -636,7 +636,7 @@ ul.phui-object-item-icons { padding: 0; } -.phui-object-list-states .phui-error-view { +.phui-object-list-states .phui-info-view { margin: 0; border: none; } @@ -675,7 +675,7 @@ ul.phui-object-item-icons { -webkit-font-smoothing: antialiased; } -.dashboard-panel .phui-object-item-empty .phui-error-view { +.dashboard-panel .phui-object-item-empty .phui-info-view { border: none; border-bottom: 1px solid {$thinblueborder}; margin: 0;