Page MenuHomePhabricator
Files F15388897

D9547.id22880.diff
No OneTemporary
Actions

D9547.id22880.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
@@ -81,7 +81,7 @@
'rsrc/css/application/phame/phame.css' => '19ecc703',
'rsrc/css/application/pholio/pholio-edit.css' => 'b9e59b6d',
'rsrc/css/application/pholio/pholio-inline-comments.css' => '3d14984a',
- 'rsrc/css/application/pholio/pholio.css' => '96cf492a',
+ 'rsrc/css/application/pholio/pholio.css' => 'c76e27ee',
'rsrc/css/application/phortune/phortune-credit-card-form.css' => 'b25b4beb',
'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad',
'rsrc/css/application/phriction/phriction-document-css.css' => '7d7f0071',
@@ -389,7 +389,7 @@
'rsrc/js/application/passphrase/phame-credential-control.js' => '1e1c8a59',
'rsrc/js/application/phame/phame-post-preview.js' => '61d927ec',
'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => '1e1e8bb0',
- 'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => '8818401f',
+ 'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => '09c4fe2d',
'rsrc/js/application/phortune/behavior-balanced-payment-form.js' => '3b3e1664',
'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '1693a296',
'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'b3e5ee60',
@@ -613,7 +613,7 @@
'javelin-behavior-phabricator-watch-anchor' => '06e05112',
'javelin-behavior-phame-post-preview' => '61d927ec',
'javelin-behavior-pholio-mock-edit' => '1e1e8bb0',
- 'javelin-behavior-pholio-mock-view' => '8818401f',
+ 'javelin-behavior-pholio-mock-view' => '09c4fe2d',
'javelin-behavior-phui-object-box-tabs' => 'a3e2244e',
'javelin-behavior-phui-timeline-dropdown-menu' => '4d94d9c3',
'javelin-behavior-policy-control' => 'f3fef818',
@@ -739,7 +739,7 @@
'phabricator-uiexample-reactor-sendproperties' => '551add57',
'phabricator-zindex-css' => 'efb673ac',
'phame-css' => '19ecc703',
- 'pholio-css' => '96cf492a',
+ 'pholio-css' => 'c76e27ee',
'pholio-edit-css' => 'b9e59b6d',
'pholio-inline-comments-css' => '3d14984a',
'phortune-credit-card-form' => '2290aeef',
@@ -874,6 +874,21 @@
7 => 'javelin-uri',
8 => 'javelin-routable',
),
+ '09c4fe2d' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-util',
+ 2 => 'javelin-stratcom',
+ 3 => 'javelin-dom',
+ 4 => 'javelin-vector',
+ 5 => 'javelin-magical-init',
+ 6 => 'javelin-request',
+ 7 => 'javelin-history',
+ 8 => 'javelin-workflow',
+ 9 => 'javelin-mask',
+ 10 => 'javelin-behavior-device',
+ 11 => 'phabricator-keyboard-shortcut',
+ ),
'0a3f3021' =>
array(
0 => 'javelin-behavior',
@@ -1254,11 +1269,6 @@
2 => 'javelin-util',
3 => 'phabricator-shaped-request',
),
- '7319e029' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-dom',
- ),
'62e18640' =>
array(
0 => 'javelin-install',
@@ -1331,6 +1341,11 @@
1 => 'javelin-stratcom',
2 => 'javelin-dom',
),
+ '7319e029' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-dom',
+ ),
'76f4ebed' =>
array(
0 => 'javelin-install',
@@ -1442,21 +1457,6 @@
1 => 'javelin-dom',
2 => 'javelin-reactor-dom',
),
- '8818401f' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-util',
- 2 => 'javelin-stratcom',
- 3 => 'javelin-dom',
- 4 => 'javelin-vector',
- 5 => 'javelin-magical-init',
- 6 => 'javelin-request',
- 7 => 'javelin-history',
- 8 => 'javelin-workflow',
- 9 => 'javelin-mask',
- 10 => 'javelin-behavior-device',
- 11 => 'phabricator-keyboard-shortcut',
- ),
'8a3ed18b' =>
array(
0 => 'javelin-magical-init',
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -31,7 +31,7 @@
->setViewer($user)
->withIDs(array($this->id))
->needImages(true)
- ->needCoverFiles(true)
+ ->needInlineComments(true)
->executeOne();
if (!$mock) {
diff --git a/src/applications/pholio/view/PholioMockThumbGridView.php b/src/applications/pholio/view/PholioMockThumbGridView.php
--- a/src/applications/pholio/view/PholioMockThumbGridView.php
+++ b/src/applications/pholio/view/PholioMockThumbGridView.php
@@ -119,6 +119,16 @@
$classes[] = 'pholio-mock-thumb-grid-item-obsolete';
}
+ $inline_count = null;
+ if ($image->getInlineComments()) {
+ $inline_count[] = phutil_tag(
+ 'span',
+ array(
+ 'class' => 'pholio-mock-thumb-grid-comment-count',
+ ),
+ pht('%s', new PhutilNumber(count($image->getInlineComments()))));
+ }
+
return javelin_tag(
'a',
array(
@@ -129,7 +139,10 @@
'imageID' => $image->getID(),
),
),
- $tag);
+ array(
+ $tag,
+ $inline_count,
+ ));
}
}
diff --git a/webroot/rsrc/css/application/pholio/pholio.css b/webroot/rsrc/css/application/pholio/pholio.css
--- a/webroot/rsrc/css/application/pholio/pholio.css
+++ b/webroot/rsrc/css/application/pholio/pholio.css
@@ -158,3 +158,18 @@
font-size: 14px;
color: {$lightgreytext};
}
+
+.pholio-mock-thumb-grid-comment-count {
+ position: absolute;
+ right: 4px;
+ bottom: 4px;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ line-height: 20px;
+ border-radius: 10px;
+ font-weight: bold;
+ color: #fff;
+ text-decoration: none;
+ background: {$indigo};
+}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 4:36 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705776
Default Alt Text
D9547.id22880.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility