Page MenuHomePhabricator
Files F13964204

D16811.id40485.diff
No OneTemporary
Actions

D16811.id40485.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
@@ -132,6 +132,7 @@
'rsrc/css/phui/phui-button.css' => '4a5fbe3d',
'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
'rsrc/css/phui/phui-cms.css' => 'be43c8a8',
+ 'rsrc/css/phui/phui-comment-form.css' => '53e8b8a4',
'rsrc/css/phui/phui-crumbs-view.css' => '195ac419',
'rsrc/css/phui/phui-curtain-view.css' => '947bf1a4',
'rsrc/css/phui/phui-document-pro.css' => 'ca1fed81',
@@ -854,6 +855,7 @@
'phui-calendar-month-css' => '8e10e92c',
'phui-chart-css' => '6bf6f78e',
'phui-cms-css' => 'be43c8a8',
+ 'phui-comment-form-css' => '53e8b8a4',
'phui-crumbs-view-css' => '195ac419',
'phui-curtain-view-css' => '947bf1a4',
'phui-document-summary-view-css' => '9ca48bdf',
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -150,7 +150,6 @@
->setQueryParam('next', (string)$this->getRequestURI());
return id(new PHUIObjectBoxView())
->setFlush(true)
- ->setHeaderText(pht('Add Comment'))
->appendChild(
javelin_tag(
'a',
@@ -183,9 +182,25 @@
));
}
+ require_celerity_resource('phui-comment-form-css');
+ $image_uri = $user->getProfileImageURI();
+ $image = phutil_tag(
+ 'div',
+ array(
+ 'style' => 'background-image: url('.$image_uri.')',
+ 'class' => 'phui-comment-image',
+ ));
+ $wedge = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-timeline-wedge',
+ ),
+ '');
$comment_box = id(new PHUIObjectBoxView())
->setFlush(true)
- ->setHeaderText($this->headerText)
+ ->addClass('phui-comment-form-view')
+ ->appendChild($image)
+ ->appendChild($wedge)
->appendChild($comment);
return array($comment_box, $preview);
@@ -225,6 +240,13 @@
->addHiddenInput('__draft__', $draft_key)
->addHiddenInput($version_key, $version_value);
+ $form->appendChild(
+ id(new PhabricatorRemarkupControl())
+ ->setID($this->getCommentID())
+ ->setName('comment')
+ ->setUser($this->getUser())
+ ->setValue($draft_comment));
+
$comment_actions = $this->getCommentActions();
if ($comment_actions) {
$action_map = array();
@@ -289,7 +311,6 @@
$form->appendChild(
id(new AphrontFormSelectControl())
- ->setLabel(pht('Actions'))
->setID($action_id)
->setOptions($options));
@@ -320,13 +341,6 @@
$form
->appendChild(
- id(new PhabricatorRemarkupControl())
- ->setID($this->getCommentID())
- ->setName('comment')
- ->setLabel(pht('Comment'))
- ->setUser($this->getUser())
- ->setValue($draft_comment))
- ->appendChild(
id(new AphrontFormSubmitControl())
->setValue($this->getSubmitButtonName()));
diff --git a/webroot/rsrc/css/phui/phui-comment-form.css b/webroot/rsrc/css/phui/phui-comment-form.css
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/css/phui/phui-comment-form.css
@@ -0,0 +1,66 @@
+/**
+ * @provides phui-comment-form-css
+ */
+
+.phui-comment-form-view {
+ background-color: #F8F9FC;
+ margin-left: 62px !important;
+ position: relative;
+}
+
+.phui-comment-form-view .phui-form-view {
+ padding: 0 0 4px 0;
+}
+
+.phui-comment-form-view .phui-comment-image {
+ background-repeat: no-repeat;
+ position: absolute;
+ border-radius: 3px;
+ background-size: 100%;
+ display: block;
+}
+
+.device-desktop .phui-comment-form-view .phui-comment-image {
+ width: 50px;
+ height: 50px;
+ top: 0px;
+ left: -62px;
+}
+
+.phui-comment-form-view .phui-timeline-wedge {
+ top: 26px;
+}
+
+.phui-comment-form-view .aphront-form-input {
+ margin: 0;
+ width: auto;
+}
+
+.phui-comment-form-view .remarkup-assist-bar {
+ height: 32px;
+ border-color: {$lightblueborder};
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ padding: 0 4px;
+ background: #fff;
+}
+
+.phui-comment-form-view .remarkup-assist-button {
+ margin-top: 2px;
+ padding: 4px 5px;
+ border-radius: 3px;
+}
+
+.phui-comment-form-view .remarkup-assist-separator {
+ height: 18px;
+ margin: 7px 6px;
+}
+
+.phui-comment-form-view .aphront-form-input .remarkup-assist-textarea {
+ border-color: {$lightblueborder};
+ border-top: 1px solid {$thinblueborder};
+ padding: 8px;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
+ height: 10em;
+}

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 16, 7:55 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6718927
Default Alt Text
D16811.id40485.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility