Page MenuHomePhabricator
Files F13955581

D15604.diff
No OneTemporary
Actions

D15604.diff
View Options

diff --git a/src/applications/people/controller/PhabricatorPeopleApproveController.php b/src/applications/people/controller/PhabricatorPeopleApproveController.php
--- a/src/applications/people/controller/PhabricatorPeopleApproveController.php
+++ b/src/applications/people/controller/PhabricatorPeopleApproveController.php
@@ -53,8 +53,7 @@
return id(new AphrontRedirectResponse())->setURI($done_uri);
}
- $dialog = id(new AphrontDialogView())
- ->setUser($admin)
+ return $this->newDialog()
->setTitle(pht('Confirm Approval'))
->appendChild(
pht(
@@ -62,7 +61,5 @@
phutil_tag('strong', array(), $user->getUsername())))
->addCancelButton($done_uri)
->addSubmitButton(pht('Approve Account'));
-
- return id(new AphrontDialogResponse())->setDialog($dialog);
}
}
diff --git a/src/applications/people/controller/PhabricatorPeopleCreateController.php b/src/applications/people/controller/PhabricatorPeopleCreateController.php
--- a/src/applications/people/controller/PhabricatorPeopleCreateController.php
+++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php
@@ -90,19 +90,25 @@
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($title);
+ $crumbs->setBorder(true);
+
+ $header = id(new PHUIHeaderView())
+ ->setHeader($title)
+ ->setHeaderIcon('fa-user');
$box = id(new PHUIObjectBoxView())
- ->setHeaderText($title)
+ ->setHeaderText(pht('User'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($form);
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $box,
- ),
- array(
- 'title' => $title,
- ));
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setFooter($box);
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->appendChild($view);
}
}
diff --git a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php
--- a/src/applications/people/controller/PhabricatorPeopleInviteSendController.php
+++ b/src/applications/people/controller/PhabricatorPeopleInviteSendController.php
@@ -125,8 +125,10 @@
} else {
$crumbs->addTextCrumb(pht('Invite Users'));
}
+ $crumbs->setBorder(true);
$confirm_box = null;
+ $info_view = null;
if ($is_confirm) {
$handles = array();
@@ -157,14 +159,15 @@
->setValue(pht('Send Invitations')));
}
+ $info_view = id(new PHUIInfoView())
+ ->setErrors($confirm_errors)
+ ->setSeverity($severity);
+
$confirm_box = id(new PHUIObjectBoxView())
- ->setInfoView(
- id(new PHUIInfoView())
- ->setErrors($confirm_errors)
- ->setSeverity($severity))
->setHeaderText(pht('Confirm Invites'))
->setTable($invite_table)
- ->appendChild($confirm_form);
+ ->appendChild($confirm_form)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
}
$form = id(new AphrontFormView())
@@ -197,23 +200,32 @@
: pht('Continue'))
->addCancelButton($this->getApplicationURI('invite/')));
+ $header = id(new PHUIHeaderView())
+ ->setHeader($title)
+ ->setHeaderIcon('fa-group');
+
$box = id(new PHUIObjectBoxView())
->setHeaderText(
$is_confirm
? pht('Revise Invites')
: pht('Invite Users'))
->setFormErrors($errors)
- ->setForm($form);
+ ->setForm($form)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
- return $this->buildApplicationPage(
- array(
- $crumbs,
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setFooter(array(
+ $info_view,
$confirm_box,
$box,
- ),
- array(
- 'title' => $title,
));
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->appendChild($view);
+
}
}
diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php
--- a/src/applications/people/controller/PhabricatorPeopleLdapController.php
+++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php
@@ -42,7 +42,6 @@
$this->getApplicationURI('/ldap/'));
$nav = $this->buildSideNavView();
- $nav->setCrumbs($crumbs);
$nav->selectFilter('ldap');
$nav->appendChild($content);
@@ -56,11 +55,10 @@
$nav->appendChild($this->processSearchRequest($request));
}
- return $this->buildApplicationPage(
- $nav,
- array(
- 'title' => pht('Import Ldap Users'),
- ));
+ return $this->newPage()
+ ->setTitle(pht('Import Ldap Users'))
+ ->setCrumbs($crumbs)
+ ->setNavigation($nav);
}
private function processImportRequest($request) {
diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php
--- a/src/applications/people/controller/PhabricatorPeopleNewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleNewController.php
@@ -208,22 +208,28 @@
$title = pht('Create New User');
- $form_box = id(new PHUIObjectBoxView())
- ->setHeaderText($title)
+ $box = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('User'))
->setFormErrors($errors)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($form);
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($title);
+ $crumbs->setBorder(true);
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $form_box,
- ),
- array(
- 'title' => $title,
- ));
+ $header = id(new PHUIHeaderView())
+ ->setHeader($title)
+ ->setHeaderIcon('fa-user');
+
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setFooter($box);
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->appendChild($view);
}
}
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -75,24 +75,33 @@
}
$form_box = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Edit Profile'))
+ ->setHeaderText(pht('Profile'))
->setValidationException($validation_exception)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($form);
- if ($note) {
- $form_box->setInfoView($note);
- }
-
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb(pht('Edit Profile'));
+ $crumbs->setBorder(true);
$nav = $this->getProfileMenu();
$nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+ $header = id(new PHUIHeaderView())
+ ->setHeader(pht('Edit Profile: %s', $user->getFullName()))
+ ->setHeaderIcon('fa-pencil');
+
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setFooter(array(
+ $note,
+ $form_box,
+ ));
+
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
->setNavigation($nav)
- ->appendChild($form_box);
+ ->appendChild($view);
}
}
diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
@@ -228,6 +228,7 @@
$form_box = id(new PHUIObjectBoxView())
->setHeaderText($title)
->setFormErrors($errors)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($form);
$upload_form = id(new AphrontFormView())
@@ -247,22 +248,31 @@
$upload_box = id(new PHUIObjectBoxView())
->setHeaderText(pht('Upload New Picture'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($upload_form);
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb(pht('Edit Profile Picture'));
+ $crumbs->setBorder(true);
$nav = $this->getProfileMenu();
$nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+ $header = id(new PHUIHeaderView())
+ ->setHeader(pht('Edit Profile Picture'))
+ ->setHeaderIcon('fa-camera');
+
+ $view = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setFooter(array(
+ $form_box,
+ $upload_box,
+ ));
+
return $this->newPage()
->setTitle($title)
->setCrumbs($crumbs)
->setNavigation($nav)
- ->appendChild(
- array(
- $form_box,
- $upload_box,
- ));
+ ->appendChild($view);
}
}

File Metadata

Mime Type
text/plain
Expires
Oct 15 2024, 2:05 AM (5 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6710898
Default Alt Text
D15604.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility