Page MenuHomePhabricator
Files F15398140

D13463.diff
No OneTemporary
Actions

D13463.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'a24d5624',
+ 'core.pkg.css' => '49de1b2f',
'core.pkg.js' => 'a590b451',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '1b36e899',
@@ -18,7 +18,7 @@
'maniphest.pkg.js' => '2f4f52c2',
'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
'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/list-filter-view.css' => 'aa5ffcb9',
'rsrc/css/aphront/multi-column.css' => 'fd18389d',
@@ -485,7 +485,7 @@
'almanac-css' => 'dbb9b3af',
'aphront-bars' => '231ac33c',
'aphront-dark-console-css' => '6378ef3d',
- 'aphront-dialog-view-css' => '8ea1b9cc',
+ 'aphront-dialog-view-css' => 'fe58b18d',
'aphront-list-filter-view-css' => 'aa5ffcb9',
'aphront-multi-column-view-css' => 'fd18389d',
'aphront-panel-view-css' => '8427b78d',
diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
@@ -173,13 +173,11 @@
$ex->getRejection()),
);
+ $list = null;
if ($ex->getCapabilityName()) {
$list = $ex->getMoreInfo();
foreach ($list as $key => $item) {
- $list[$key] = phutil_tag('li', array(), $item);
- }
- if ($list) {
- $list = phutil_tag('ul', array(), $list);
+ $list[$key] = $item;
}
$content[] = phutil_tag(
@@ -189,7 +187,6 @@
),
pht('Users with the "%s" capability:', $ex->getCapabilityName()));
- $content[] = $list;
}
$dialog = id(new AphrontDialogView())
@@ -198,6 +195,10 @@
->setUser($user)
->appendChild($content);
+ if ($list) {
+ $dialog->appendList($list);
+ }
+
if ($this->getRequest()->isAjax()) {
$dialog->addCancelButton('/', pht('Close'));
} else {
diff --git a/src/applications/policy/controller/PhabricatorPolicyExplainController.php b/src/applications/policy/controller/PhabricatorPolicyExplainController.php
--- a/src/applications/policy/controller/PhabricatorPolicyExplainController.php
+++ b/src/applications/policy/controller/PhabricatorPolicyExplainController.php
@@ -47,13 +47,6 @@
$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;
$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
if ($capobj) {
@@ -78,9 +71,12 @@
$dialog
->setTitle(pht('Policy Details: %s', $object_name))
->appendParagraph($intro)
- ->appendChild($auto_info)
->addCancelButton($object_uri, pht('Done'));
+ if ($auto_info) {
+ $dialog->appendList($auto_info);
+ }
+
$this->appendStrengthInformation($dialog, $object, $policy, $capability);
return $dialog;
diff --git a/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php b/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php
--- a/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php
+++ b/src/applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php
@@ -66,13 +66,12 @@
$list = array();
foreach ($xactions as $xaction) {
- $list[] = phutil_tag(
- 'li',
- array(),
- $xaction->getNoEffectDescription());
+ $list[] = $xaction->getNoEffectDescription();
}
- $dialog->appendChild(phutil_tag('ul', array(), $list));
+ if ($list) {
+ $dialog->appendList($list);
+ }
$dialog->appendChild($tail);
if ($continue) {
diff --git a/src/applications/transactions/response/PhabricatorApplicationTransactionValidationResponse.php b/src/applications/transactions/response/PhabricatorApplicationTransactionValidationResponse.php
--- a/src/applications/transactions/response/PhabricatorApplicationTransactionValidationResponse.php
+++ b/src/applications/transactions/response/PhabricatorApplicationTransactionValidationResponse.php
@@ -34,13 +34,10 @@
$list = array();
foreach ($ex->getErrors() as $error) {
- $list[] = phutil_tag(
- 'li',
- array(),
- $error->getMessage());
+ $list[] = $error->getMessage();
}
- $dialog->appendChild(phutil_tag('ul', array(), $list));
+ $dialog->appendList($list);
$dialog->addCancelButton($this->cancelURI);
return $this->getProxy()->setDialog($dialog);
diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php
--- a/src/view/AphrontDialogView.php
+++ b/src/view/AphrontDialogView.php
@@ -140,6 +140,25 @@
$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) {
return $this->appendChild($form->buildLayoutView());
}
@@ -332,7 +351,7 @@
$header),
phutil_tag('div',
array(
- 'class' => 'aphront-dialog-body grouped',
+ 'class' => 'aphront-dialog-body phabricator-remarkup grouped',
),
$children),
$tail,
diff --git a/webroot/rsrc/css/aphront/dialog-view.css b/webroot/rsrc/css/aphront/dialog-view.css
--- a/webroot/rsrc/css/aphront/dialog-view.css
+++ b/webroot/rsrc/css/aphront/dialog-view.css
@@ -7,6 +7,7 @@
margin: 32px auto 16px;
border: 1px solid {$lightblueborder};
border-radius: 3px;
+ background-color: #fff;
}
.device-phone .aphront-dialog-view {
@@ -20,9 +21,6 @@
.aphront-dialog-head {
padding: 12px 12px 0 12px;
- background: #fff;
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
}
.aphront-dialog-flush .aphront-dialog-body {
@@ -48,13 +46,13 @@
background: {$lightgreybackground};
padding: 8px 16px;
border-top: 1px solid {$thinblueborder};
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.aphront-dialog-foot {
padding: 6px 0;
float: left;
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
}
.aphront-dialog-tail button,

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 11:25 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7383529
Default Alt Text
D13463.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility