revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-19 18:28:39 +01:00
Code Issues Releases Wiki Activity

Move PHUIErrorView to PHUIInfoView

Browse source 
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
This commit is contained in:
Chad Little 2015-03-01 14:45:56 -08:00
parent 5b104e291a
commit c038c643f4
82 changed files with 263 additions and 257 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
resources/celerity/map.php
View file

@ -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',

2
resources/celerity/packages.php
View file

@ -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',

8
src/__phutil_library_map__.php
View file

@ -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',

2
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
View file

@ -205,7 +205,7 @@ class AphrontDefaultApplicationConfiguration
}
if ($ex instanceof AphrontUsageException) {
$error = new PHUIErrorView();
$error = new PHUIInfoView();
$error->setTitle($ex->getTitle());
$error->appendChild($ex->getMessage());

4
src/applications/almanac/controller/AlmanacController.php
View file

@ -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),

2
src/applications/auth/controller/PhabricatorAuthController.php
View file

@ -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);

8
src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
View file

@ -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(

4
src/applications/auth/controller/PhabricatorAuthRegisterController.php
View file

@ -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(

2
src/applications/auth/controller/PhabricatorEmailLoginController.php
View file

@ -128,7 +128,7 @@ EOBODY;
$error_view = null;
if ($errors) {
$error_view = new PHUIErrorView();
$error_view = new PHUIInfoView();
$error_view->setErrors($errors);
}

4
src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
View file

@ -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(

6
src/applications/auth/controller/config/PhabricatorAuthListController.php
View file

@ -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);

2
src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
View file

@ -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);

2
src/applications/auth/provider/PhabricatorPasswordAuthProvider.php
View file

@ -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())

2
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
View file

@ -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);
}

16
src/applications/calendar/controller/PhabricatorCalendarViewController.php
View file

@ -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.',

10
src/applications/config/controller/PhabricatorConfigEditController.php
View file

@ -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));
}

4
src/applications/config/controller/PhabricatorConfigIssueListController.php
View file

@ -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);

4
src/applications/config/controller/PhabricatorConfigIssueViewController.php
View file

@ -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(

2
src/applications/conpherence/controller/ConpherenceUpdateController.php
View file

@ -165,7 +165,7 @@ final class ConpherenceUpdateController
}
if ($errors) {
$error_view = id(new PHUIErrorView())
$error_view = id(new PHUIInfoView())
->setErrors($errors);
}

4
src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
View file

@ -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 {

4
src/applications/dashboard/controller/PhabricatorDashboardManageController.php
View file

@ -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)));
}

4
src/applications/dashboard/controller/PhabricatorDashboardViewController.php
View file

@ -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.',

4
src/applications/differential/controller/DifferentialDiffViewController.php
View file

@ -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('<optgroup label="%s">', pht('Create New Revision'));

2
src/applications/differential/controller/DifferentialRevisionLandController.php
View file

@ -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);
}

12
src/applications/differential/controller/DifferentialRevisionViewController.php
View file

@ -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 <strong>%s</strong>',
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);
}

2
src/applications/differential/view/DifferentialAddCommentView.php
View file

@ -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;
}

8
src/applications/diffusion/controller/DiffusionBrowseFileController.php
View file

@ -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'.",

10
src/applications/diffusion/controller/DiffusionCommitController.php
View file

@ -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.'));

4
src/applications/diffusion/controller/DiffusionController.php
View file

@ -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);
}

4
src/applications/diffusion/controller/DiffusionExternalController.php
View file

@ -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(),

2
src/applications/diffusion/controller/DiffusionMirrorEditController.php
View file

@ -84,7 +84,7 @@ final class DiffusionMirrorEditController
$form_errors = null;
if ($errors) {
$form_errors = id(new PHUIErrorView())
$form_errors = id(new PHUIInfoView())
->setErrors($errors);
}

4
src/applications/diffusion/controller/DiffusionRepositoryController.php
View file

@ -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));
}

4
src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
View file

@ -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.'));
}

10
src/applications/diffusion/view/DiffusionEmptyResultView.php
View file

@ -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));

4
src/applications/diviner/controller/DivinerAtomController.php
View file

@ -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);

4
src/applications/fact/controller/PhabricatorFactHomeController.php
View file

@ -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',

4
src/applications/feed/builder/PhabricatorFeedBuilder.php
View file

@ -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);
}

2
src/applications/harbormaster/controller/HarbormasterPlanRunController.php
View file

@ -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');

2
src/applications/harbormaster/controller/HarbormasterStepAddController.php
View file

@ -50,7 +50,7 @@ final class HarbormasterStepAddController extends HarbormasterController {
}
if ($errors) {
$errors = id(new PHUIErrorView())
$errors = id(new PHUIInfoView())
->setErrors($errors);
}

12
src/applications/herald/controller/HeraldTranscriptController.php
View file

@ -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);
}

4
src/applications/home/controller/PhabricatorHomeMainController.php
View file

@ -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',

14
src/applications/legalpad/controller/LegalpadDocumentSignController.php
View file

@ -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);
}

4
src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
View file

@ -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(

4
src/applications/maniphest/controller/ManiphestReportController.php
View file

@ -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();

4
src/applications/maniphest/controller/ManiphestTaskEditController.php
View file

@ -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,

2
src/applications/meta/controller/PhabricatorApplicationEditEmailController.php
View file

@ -247,7 +247,7 @@ final class PhabricatorApplicationEditEmailController
}
if ($errors) {
$errors = id(new PHUIErrorView())
$errors = id(new PHUIInfoView())
->setErrors($errors);
}

2
src/applications/notification/controller/PhabricatorNotificationStatusController.php
View file

@ -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 '.

4
src/applications/oauthserver/controller/PhabricatorOAuthServerController.php
View file

@ -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;

2
src/applications/passphrase/controller/PassphraseCredentialEditController.php
View file

@ -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())

8
src/applications/people/controller/PhabricatorPeopleInviteSendController.php
View file

@ -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'))

4
src/applications/people/controller/PhabricatorPeopleLdapController.php
View file

@ -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'),

2
src/applications/people/controller/PhabricatorPeopleRenameController.php
View file

@ -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()

4
src/applications/phame/controller/PhameController.php
View file

@ -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);
}

4
src/applications/phame/controller/post/PhamePostNewController.php
View file

@ -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.'));

8
src/applications/phame/controller/post/PhamePostViewController.php
View file

@ -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 '.

4
src/applications/phortune/controller/PhortuneCartViewController.php
View file

@ -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;

2
src/applications/phortune/controller/PhortunePaymentMethodCreateController.php
View file

@ -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);

4
src/applications/phragment/controller/PhragmentController.php
View file

@ -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 '.

2
src/applications/phragment/controller/PhragmentCreateController.php
View file

@ -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'));
}

2
src/applications/phragment/controller/PhragmentUpdateController.php
View file

@ -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'));
}

24
src/applications/phriction/controller/PhrictionDocumentController.php
View file

@ -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(

4
src/applications/phriction/controller/PhrictionEditController.php
View file

@ -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(
'<p>Showing a saved draft of your edits, you can %s.</p>',

2
src/applications/policy/controller/PhabricatorPolicyEditController.php
View file

@ -138,7 +138,7 @@ final class PhabricatorPolicyEditController
));
if ($errors) {
$errors = id(new PHUIErrorView())
$errors = id(new PHUIInfoView())
->setErrors($errors);
}

4
src/applications/ponder/controller/PonderQuestionViewController.php
View file

@ -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 '.

4
src/applications/releeph/controller/request/ReleephRequestEditController.php
View file

@ -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);
}

2
src/applications/search/controller/PhabricatorApplicationSearchController.php
View file

@ -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);
}

4
src/applications/settings/panel/PhabricatorConduitCertificateSettingsPanel.php
View file

@ -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',

2
src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
View file

@ -228,7 +228,7 @@ final class PhabricatorEmailAddressesSettingsPanel
}
if ($errors) {
$errors = id(new PHUIErrorView())
$errors = id(new PHUIInfoView())
->setErrors($errors);
}

30
src/applications/uiexample/examples/PHUIErrorExample.php → src/applications/uiexample/examples/PHUIInfoExample.php
View file

@ -1,14 +1,14 @@
<?php
final class PHUIErrorExample extends PhabricatorUIExample {
final class PHUIInfoExample extends PhabricatorUIExample {
public function getName() {
return 'Errors';
return 'Info View';
}
public function getDescription() {
return hsprintf(
'Use <tt>PHUIErrorView</tt> to render errors, warnings and notices.');
'Use <tt>PHUIInfoView</tt> 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.');

2
src/view/AphrontDialogView.php
View file

@ -292,7 +292,7 @@ final class AphrontDialogView extends AphrontView {
if ($errors) {
$children = array(
id(new PHUIErrorView())->setErrors($errors),
id(new PHUIInfoView())->setErrors($errors),
$children,
);
}

16
src/view/form/PHUIErrorView.php → src/view/form/PHUIInfoView.php
View file

@ -1,6 +1,6 @@
<?php
final class PHUIErrorView extends AphrontView {
final class PHUIInfoView extends AphrontView {
const SEVERITY_ERROR = 'error';
const SEVERITY_WARNING = 'warning';
@ -41,7 +41,7 @@ final class PHUIErrorView extends AphrontView {
final public function render() {
require_celerity_resource('phui-error-view-css');
require_celerity_resource('phui-info-view-css');
$errors = $this->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);
}

10
src/view/phui/PHUIObjectBoxView.php
View file

@ -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);
}
}

4
src/view/phui/PHUIObjectItemListView.php
View file

@ -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',

4
src/view/phui/PHUIPinboardView.php
View file

@ -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();
}

2
src/view/phui/calendar/PHUICalendarMonthView.php
View file

@ -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;
}

4
webroot/rsrc/css/application/dashboard/dashboard.css
View file

@ -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;
}

2
webroot/rsrc/css/application/phame/phame.css
View file

@ -25,7 +25,7 @@
max-width: 600px;
}
.phame-post-list .phui-error-view {
.phame-post-list .phui-info-view {
margin: 0;
}

2
webroot/rsrc/css/application/profile/profile-view.css
View file

@ -48,7 +48,7 @@
max-width: 640px;
}
.phabricator-project-feed .phui-error-view {
.phabricator-project-feed .phui-info-view {
margin: 12px 0;
}

2
webroot/rsrc/css/phui/phui-document.css
View file

@ -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};
}

80
webroot/rsrc/css/phui/phui-error-view.css
View file

@ -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;
}

2
webroot/rsrc/css/phui/phui-object-box.css
View file

@ -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};

8
webroot/rsrc/css/phui/phui-object-item-list-view.css
View file

@ -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;