mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-18 19:40:55 +01:00
[Redesign] Clean up AphrontDialog
Summary: Ref T8099, Cleans up UI issues, adds `appendList` and renders lists and paragraphs with Remarkup UI. Test Plan: Test Policy Dialogs, other various dialogs. Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: epriestley, Korvin Maniphest Tasks: T8099 Differential Revision: https://secure.phabricator.com/D13463
This commit is contained in:
parent
10dd27cac9
commit
626c7bc906
7 changed files with 42 additions and 32 deletions
|
@ -7,7 +7,7 @@
|
||||||
*/
|
*/
|
||||||
return array(
|
return array(
|
||||||
'names' => array(
|
'names' => array(
|
||||||
'core.pkg.css' => 'a24d5624',
|
'core.pkg.css' => '49de1b2f',
|
||||||
'core.pkg.js' => 'a590b451',
|
'core.pkg.js' => 'a590b451',
|
||||||
'darkconsole.pkg.js' => 'e7393ebb',
|
'darkconsole.pkg.js' => 'e7393ebb',
|
||||||
'differential.pkg.css' => '1b36e899',
|
'differential.pkg.css' => '1b36e899',
|
||||||
|
@ -18,7 +18,7 @@ return array(
|
||||||
'maniphest.pkg.js' => '2f4f52c2',
|
'maniphest.pkg.js' => '2f4f52c2',
|
||||||
'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
|
'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
|
||||||
'rsrc/css/aphront/dark-console.css' => '6378ef3d',
|
'rsrc/css/aphront/dark-console.css' => '6378ef3d',
|
||||||
'rsrc/css/aphront/dialog-view.css' => '8ea1b9cc',
|
'rsrc/css/aphront/dialog-view.css' => 'fe58b18d',
|
||||||
'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
|
'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
|
||||||
'rsrc/css/aphront/list-filter-view.css' => 'aa5ffcb9',
|
'rsrc/css/aphront/list-filter-view.css' => 'aa5ffcb9',
|
||||||
'rsrc/css/aphront/multi-column.css' => 'fd18389d',
|
'rsrc/css/aphront/multi-column.css' => 'fd18389d',
|
||||||
|
@ -485,7 +485,7 @@ return array(
|
||||||
'almanac-css' => 'dbb9b3af',
|
'almanac-css' => 'dbb9b3af',
|
||||||
'aphront-bars' => '231ac33c',
|
'aphront-bars' => '231ac33c',
|
||||||
'aphront-dark-console-css' => '6378ef3d',
|
'aphront-dark-console-css' => '6378ef3d',
|
||||||
'aphront-dialog-view-css' => '8ea1b9cc',
|
'aphront-dialog-view-css' => 'fe58b18d',
|
||||||
'aphront-list-filter-view-css' => 'aa5ffcb9',
|
'aphront-list-filter-view-css' => 'aa5ffcb9',
|
||||||
'aphront-multi-column-view-css' => 'fd18389d',
|
'aphront-multi-column-view-css' => 'fd18389d',
|
||||||
'aphront-panel-view-css' => '8427b78d',
|
'aphront-panel-view-css' => '8427b78d',
|
||||||
|
|
|
@ -173,13 +173,11 @@ class AphrontDefaultApplicationConfiguration
|
||||||
$ex->getRejection()),
|
$ex->getRejection()),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$list = null;
|
||||||
if ($ex->getCapabilityName()) {
|
if ($ex->getCapabilityName()) {
|
||||||
$list = $ex->getMoreInfo();
|
$list = $ex->getMoreInfo();
|
||||||
foreach ($list as $key => $item) {
|
foreach ($list as $key => $item) {
|
||||||
$list[$key] = phutil_tag('li', array(), $item);
|
$list[$key] = $item;
|
||||||
}
|
|
||||||
if ($list) {
|
|
||||||
$list = phutil_tag('ul', array(), $list);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$content[] = phutil_tag(
|
$content[] = phutil_tag(
|
||||||
|
@ -189,7 +187,6 @@ class AphrontDefaultApplicationConfiguration
|
||||||
),
|
),
|
||||||
pht('Users with the "%s" capability:', $ex->getCapabilityName()));
|
pht('Users with the "%s" capability:', $ex->getCapabilityName()));
|
||||||
|
|
||||||
$content[] = $list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$dialog = id(new AphrontDialogView())
|
$dialog = id(new AphrontDialogView())
|
||||||
|
@ -198,6 +195,10 @@ class AphrontDefaultApplicationConfiguration
|
||||||
->setUser($user)
|
->setUser($user)
|
||||||
->appendChild($content);
|
->appendChild($content);
|
||||||
|
|
||||||
|
if ($list) {
|
||||||
|
$dialog->appendList($list);
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->getRequest()->isAjax()) {
|
if ($this->getRequest()->isAjax()) {
|
||||||
$dialog->addCancelButton('/', pht('Close'));
|
$dialog->addCancelButton('/', pht('Close'));
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -47,13 +47,6 @@ final class PhabricatorPolicyExplainController
|
||||||
$auto_info);
|
$auto_info);
|
||||||
$auto_info = array_filter($auto_info);
|
$auto_info = array_filter($auto_info);
|
||||||
|
|
||||||
foreach ($auto_info as $key => $info) {
|
|
||||||
$auto_info[$key] = phutil_tag('li', array(), $info);
|
|
||||||
}
|
|
||||||
if ($auto_info) {
|
|
||||||
$auto_info = phutil_tag('ul', array(), $auto_info);
|
|
||||||
}
|
|
||||||
|
|
||||||
$capability_name = $capability;
|
$capability_name = $capability;
|
||||||
$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
|
$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
|
||||||
if ($capobj) {
|
if ($capobj) {
|
||||||
|
@ -78,9 +71,12 @@ final class PhabricatorPolicyExplainController
|
||||||
$dialog
|
$dialog
|
||||||
->setTitle(pht('Policy Details: %s', $object_name))
|
->setTitle(pht('Policy Details: %s', $object_name))
|
||||||
->appendParagraph($intro)
|
->appendParagraph($intro)
|
||||||
->appendChild($auto_info)
|
|
||||||
->addCancelButton($object_uri, pht('Done'));
|
->addCancelButton($object_uri, pht('Done'));
|
||||||
|
|
||||||
|
if ($auto_info) {
|
||||||
|
$dialog->appendList($auto_info);
|
||||||
|
}
|
||||||
|
|
||||||
$this->appendStrengthInformation($dialog, $object, $policy, $capability);
|
$this->appendStrengthInformation($dialog, $object, $policy, $capability);
|
||||||
|
|
||||||
return $dialog;
|
return $dialog;
|
||||||
|
|
|
@ -66,13 +66,12 @@ final class PhabricatorApplicationTransactionNoEffectResponse
|
||||||
|
|
||||||
$list = array();
|
$list = array();
|
||||||
foreach ($xactions as $xaction) {
|
foreach ($xactions as $xaction) {
|
||||||
$list[] = phutil_tag(
|
$list[] = $xaction->getNoEffectDescription();
|
||||||
'li',
|
|
||||||
array(),
|
|
||||||
$xaction->getNoEffectDescription());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$dialog->appendChild(phutil_tag('ul', array(), $list));
|
if ($list) {
|
||||||
|
$dialog->appendList($list);
|
||||||
|
}
|
||||||
$dialog->appendChild($tail);
|
$dialog->appendChild($tail);
|
||||||
|
|
||||||
if ($continue) {
|
if ($continue) {
|
||||||
|
|
|
@ -34,13 +34,10 @@ final class PhabricatorApplicationTransactionValidationResponse
|
||||||
|
|
||||||
$list = array();
|
$list = array();
|
||||||
foreach ($ex->getErrors() as $error) {
|
foreach ($ex->getErrors() as $error) {
|
||||||
$list[] = phutil_tag(
|
$list[] = $error->getMessage();
|
||||||
'li',
|
|
||||||
array(),
|
|
||||||
$error->getMessage());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$dialog->appendChild(phutil_tag('ul', array(), $list));
|
$dialog->appendList($list);
|
||||||
$dialog->addCancelButton($this->cancelURI);
|
$dialog->addCancelButton($this->cancelURI);
|
||||||
|
|
||||||
return $this->getProxy()->setDialog($dialog);
|
return $this->getProxy()->setDialog($dialog);
|
||||||
|
|
|
@ -140,6 +140,25 @@ final class AphrontDialogView extends AphrontView {
|
||||||
$paragraph));
|
$paragraph));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function appendList(array $items) {
|
||||||
|
$listitems = array();
|
||||||
|
foreach ($items as $item) {
|
||||||
|
$listitems[] = phutil_tag(
|
||||||
|
'li',
|
||||||
|
array(
|
||||||
|
'class' => 'remarkup-list-item',
|
||||||
|
),
|
||||||
|
$item);
|
||||||
|
}
|
||||||
|
return $this->appendChild(
|
||||||
|
phutil_tag(
|
||||||
|
'ul',
|
||||||
|
array(
|
||||||
|
'class' => 'remarkup-list',
|
||||||
|
),
|
||||||
|
$listitems));
|
||||||
|
}
|
||||||
|
|
||||||
public function appendForm(AphrontFormView $form) {
|
public function appendForm(AphrontFormView $form) {
|
||||||
return $this->appendChild($form->buildLayoutView());
|
return $this->appendChild($form->buildLayoutView());
|
||||||
}
|
}
|
||||||
|
@ -332,7 +351,7 @@ final class AphrontDialogView extends AphrontView {
|
||||||
$header),
|
$header),
|
||||||
phutil_tag('div',
|
phutil_tag('div',
|
||||||
array(
|
array(
|
||||||
'class' => 'aphront-dialog-body grouped',
|
'class' => 'aphront-dialog-body phabricator-remarkup grouped',
|
||||||
),
|
),
|
||||||
$children),
|
$children),
|
||||||
$tail,
|
$tail,
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
margin: 32px auto 16px;
|
margin: 32px auto 16px;
|
||||||
border: 1px solid {$lightblueborder};
|
border: 1px solid {$lightblueborder};
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.device-phone .aphront-dialog-view {
|
.device-phone .aphront-dialog-view {
|
||||||
|
@ -20,9 +21,6 @@
|
||||||
|
|
||||||
.aphront-dialog-head {
|
.aphront-dialog-head {
|
||||||
padding: 12px 12px 0 12px;
|
padding: 12px 12px 0 12px;
|
||||||
background: #fff;
|
|
||||||
border-top-left-radius: 3px;
|
|
||||||
border-top-right-radius: 3px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.aphront-dialog-flush .aphront-dialog-body {
|
.aphront-dialog-flush .aphront-dialog-body {
|
||||||
|
@ -48,13 +46,13 @@
|
||||||
background: {$lightgreybackground};
|
background: {$lightgreybackground};
|
||||||
padding: 8px 16px;
|
padding: 8px 16px;
|
||||||
border-top: 1px solid {$thinblueborder};
|
border-top: 1px solid {$thinblueborder};
|
||||||
|
border-bottom-left-radius: 3px;
|
||||||
|
border-bottom-right-radius: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.aphront-dialog-foot {
|
.aphront-dialog-foot {
|
||||||
padding: 6px 0;
|
padding: 6px 0;
|
||||||
float: left;
|
float: left;
|
||||||
border-bottom-left-radius: 3px;
|
|
||||||
border-bottom-right-radius: 3px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.aphront-dialog-tail button,
|
.aphront-dialog-tail button,
|
||||||
|
|
Loading…
Reference in a new issue