Page MenuHomePhabricator
Files F13815702

D9630.diff
No OneTemporary
Actions

D9630.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
@@ -80,7 +80,7 @@
'rsrc/css/application/people/people-profile.css' => 'ba7b2762',
'rsrc/css/application/phame/phame.css' => '19ecc703',
'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
- 'rsrc/css/application/pholio/pholio-inline-comments.css' => '95004a57',
+ 'rsrc/css/application/pholio/pholio-inline-comments.css' => '286e6be7',
'rsrc/css/application/pholio/pholio.css' => 'd0502625',
'rsrc/css/application/phortune/phortune-credit-card-form.css' => 'b25b4beb',
'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad',
@@ -754,7 +754,7 @@
'phame-css' => '19ecc703',
'pholio-css' => 'd0502625',
'pholio-edit-css' => '3ad9d1ee',
- 'pholio-inline-comments-css' => '95004a57',
+ 'pholio-inline-comments-css' => '286e6be7',
'phortune-credit-card-form' => '2290aeef',
'phortune-credit-card-form-css' => 'b25b4beb',
'phrequent-css' => 'ffc185ad',
diff --git a/src/applications/pholio/controller/PholioInlineController.php b/src/applications/pholio/controller/PholioInlineController.php
--- a/src/applications/pholio/controller/PholioInlineController.php
+++ b/src/applications/pholio/controller/PholioInlineController.php
@@ -14,6 +14,7 @@
if ($this->id) {
$inline = id(new PholioTransactionComment())->load($this->id);
+
if (!$inline) {
return new Aphront404Response();
}
@@ -58,23 +59,55 @@
$mock_uri = '/';
if ($mode == 'view') {
+ require_celerity_resource('pholio-inline-comments-css');
+ $image = id(new PholioImageQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($inline->getImageID()))
+ ->executeOne();
$handles = $this->loadViewerHandles(array($inline->getAuthorPHID()));
$author_handle = $handles[$inline->getAuthorPHID()];
- return $this->newDialog()
- ->setTitle(pht('Inline Comment'))
- ->appendParagraph(
- phutil_tag(
- 'em',
- array(),
- pht('%s comments:', $author_handle->getName())))
- ->appendParagraph(
- PhabricatorMarkupEngine::renderOneObject(
+ $file = $image->getFile();
+ if (!$file->isViewableImage()) {
+ throw new Exception('File is not viewable.');
+ }
+
+ $image_uri = $file->getBestURI();
+
+ $thumb = id(new PHUIImageMaskView())
+ ->addClass('mrl')
+ ->setImage($image_uri)
+ ->setDisplayHeight(200)
+ ->setDisplayWidth(498)
+ ->withMask(true)
+ ->centerViewOnPoint(
+ $inline->getX(), $inline->getY(),
+ $inline->getHeight(), $inline->getWidth());
+
+ $comment_head = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'pholio-inline-comment-head',
+ ),
+ $author_handle->renderLink());
+
+ $comment_body = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'pholio-inline-comment-body',
+ ),
+ PhabricatorMarkupEngine::renderOneObject(
id(new PhabricatorMarkupOneOff())
->setContent($inline->getContent()),
'default',
- $viewer))
+ $viewer));
+
+ return $this->newDialog()
+ ->setTitle(pht('Inline Comment'))
+ ->appendChild($thumb)
+ ->appendChild($comment_head)
+ ->appendChild($comment_body)
->addCancelButton($mock_uri, pht('Close'));
}
diff --git a/webroot/rsrc/css/application/pholio/pholio-inline-comments.css b/webroot/rsrc/css/application/pholio/pholio-inline-comments.css
--- a/webroot/rsrc/css/application/pholio/pholio-inline-comments.css
+++ b/webroot/rsrc/css/application/pholio/pholio-inline-comments.css
@@ -2,4 +2,12 @@
* @provides pholio-inline-comments-css
*/
+.pholio-inline-comment-head {
+ padding: 8px 0;
+ color: {$greytext};
+}
+
+.pholio-inline-comment-head a {
+ font-weight: bold;
+}

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 11:01 AM (15 h, 5 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6623456
Default Alt Text
D9630.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility