@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Replace 'Embed' hint on Pholio
Summary: Replaces Embed hint with where the heck you are hint.
Test Plan: Tested current and previous mock images.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T5384
Differential Revision: https://secure.phabricator.com/D9658
+27
-11
+5
-5
resources/celerity/map.php
+5
-5
resources/celerity/map.php
···
81
81
'rsrc/css/application/phame/phame.css' => '19ecc703',
82
82
'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
83
83
'rsrc/css/application/pholio/pholio-inline-comments.css' => '2703fdb9',
84
-
'rsrc/css/application/pholio/pholio.css' => '5591f1e9',
84
+
'rsrc/css/application/pholio/pholio.css' => '209b1f08',
85
85
'rsrc/css/application/phortune/phortune-credit-card-form.css' => 'b25b4beb',
86
86
'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad',
87
87
'rsrc/css/application/phriction/phriction-document-css.css' => '7d7f0071',
···
401
401
'rsrc/js/application/passphrase/phame-credential-control.js' => '1e1c8a59',
402
402
'rsrc/js/application/phame/phame-post-preview.js' => '61d927ec',
403
403
'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => '1e1e8bb0',
404
-
'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => '929d95eb',
404
+
'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => '91a166c7',
405
405
'rsrc/js/application/phortune/behavior-balanced-payment-form.js' => '3b3e1664',
406
406
'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '1693a296',
407
407
'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'b3e5ee60',
···
626
626
'javelin-behavior-phabricator-watch-anchor' => '06e05112',
627
627
'javelin-behavior-phame-post-preview' => '61d927ec',
628
628
'javelin-behavior-pholio-mock-edit' => '1e1e8bb0',
629
-
'javelin-behavior-pholio-mock-view' => '929d95eb',
629
+
'javelin-behavior-pholio-mock-view' => '91a166c7',
630
630
'javelin-behavior-phui-object-box-tabs' => 'a3e2244e',
631
631
'javelin-behavior-phui-timeline-dropdown-menu' => '4d94d9c3',
632
632
'javelin-behavior-policy-control' => 'f3fef818',
···
752
752
'phabricator-uiexample-reactor-sendproperties' => '551add57',
753
753
'phabricator-zindex-css' => 'efb673ac',
754
754
'phame-css' => '19ecc703',
755
-
'pholio-css' => '5591f1e9',
755
+
'pholio-css' => '209b1f08',
756
756
'pholio-edit-css' => '3ad9d1ee',
757
757
'pholio-inline-comments-css' => '2703fdb9',
758
758
'phortune-credit-card-form' => '2290aeef',
···
1520
1520
3 => 'javelin-mask',
1521
1521
4 => 'phabricator-drag-and-drop-file-upload',
1522
1522
),
1523
-
'929d95eb' =>
1523
+
'91a166c7' =>
1524
1524
array(
1525
1525
0 => 'javelin-behavior',
1526
1526
1 => 'javelin-util',
+7
-1
src/applications/pholio/view/PholioMockImagesView.php
+7
-1
src/applications/pholio/view/PholioMockImagesView.php
···
73
73
$engine->addObject($image, 'default');
74
74
}
75
75
$engine->process();
76
-
76
+
$current_set = 0;
77
77
foreach ($mock->getAllImages() as $image) {
78
78
$file = $image->getFile();
79
79
$metadata = $file->getMetadata();
80
80
$x = idx($metadata, PhabricatorFile::METADATA_IMAGE_WIDTH);
81
81
$y = idx($metadata, PhabricatorFile::METADATA_IMAGE_HEIGHT);
82
+
83
+
$is_obs = (bool)$image->getIsObsolete();
84
+
if (!$is_obs) {
85
+
$current_set++;
86
+
}
82
87
83
88
$history_uri = '/pholio/image/history/'.$image->getID().'/';
84
89
$images[] = array(
···
129
134
'navsequence' => $navsequence,
130
135
'fullIcon' => hsprintf('%s', $full_icon),
131
136
'downloadIcon' => hsprintf('%s', $download_icon),
137
+
'currentSetSize' => $current_set,
132
138
);
133
139
Javelin::initBehavior('pholio-mock-view', $config);
134
140
+4
webroot/rsrc/css/application/pholio/pholio.css
+4
webroot/rsrc/css/application/pholio/pholio.css
+11
-5
webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
+11
-5
webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
···
644
644
info.push(title);
645
645
646
646
if (!image.isObsolete) {
647
-
var embed = JX.$N(
647
+
var img_len = config.currentSetSize;
648
+
var rev = JX.$N(
648
649
'div',
649
-
{className: 'pholio-image-embedding'},
650
-
JX.$H('Embed this image: {M' + config.mockID +
651
-
', image=' + image.id + '}'));
652
-
info.push(embed);
650
+
{className: 'pholio-image-revision'},
651
+
JX.$H('Current Revision (' + img_len + ' images)'));
652
+
info.push(rev);
653
+
} else {
654
+
var prev = JX.$N(
655
+
'div',
656
+
{className: 'pholio-image-revision'},
657
+
JX.$H('(Previous Revision)'));
658
+
info.push(prev);
653
659
}
654
660
655
661
for (var ii = 0; ii < info.length; ii++) {