Page MenuHomePhabricator
Files F15421023

D9644.id23149.diff
No OneTemporary
Actions

D9644.id23149.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' => '3ad9d1ee',
'rsrc/css/application/pholio/pholio-inline-comments.css' => '2703fdb9',
- 'rsrc/css/application/pholio/pholio.css' => 'c1510ea2',
+ 'rsrc/css/application/pholio/pholio.css' => '5591f1e9',
'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',
@@ -752,7 +752,7 @@
'phabricator-uiexample-reactor-sendproperties' => '551add57',
'phabricator-zindex-css' => 'efb673ac',
'phame-css' => '19ecc703',
- 'pholio-css' => 'c1510ea2',
+ 'pholio-css' => '5591f1e9',
'pholio-edit-css' => '3ad9d1ee',
'pholio-inline-comments-css' => '2703fdb9',
'phortune-credit-card-form' => '2290aeef',
diff --git a/src/applications/metamta/constants/MetaMTANotificationType.php b/src/applications/metamta/constants/MetaMTANotificationType.php
--- a/src/applications/metamta/constants/MetaMTANotificationType.php
+++ b/src/applications/metamta/constants/MetaMTANotificationType.php
@@ -19,4 +19,9 @@
const TYPE_MANIPHEST_COMMENT = 'maniphest-comment';
const TYPE_MANIPHEST_OTHER = 'maniphest-other';
+ const TYPE_PHOLIO_STATUS = 'pholio-status';
+ const TYPE_PHOLIO_COMMENT = 'pholio-comment';
+ const TYPE_PHOLIO_UPDATED = 'pholio-updated';
+ const TYPE_PHOLIO_OTHER = 'pholio-other';
+
}
diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
--- a/src/applications/pholio/storage/PholioTransaction.php
+++ b/src/applications/pholio/storage/PholioTransaction.php
@@ -79,6 +79,31 @@
return parent::getIcon();
}
+ public function getMailTags() {
+ $tags = array();
+ switch ($this->getTransactionType()) {
+ case PholioTransactionType::TYPE_INLINE:
+ $tags[] = MetaMTANotificationType::TYPE_PHOLIO_COMMENT;
+ break;
+ case PholioTransactionType::TYPE_STATUS:
+ $tags[] = MetaMTANotificationType::TYPE_PHOLIO_STATUS;
+ break;
+ case PholioTransactionType::TYPE_NAME:
+ case PholioTransactionType::TYPE_DESCRIPTION:
+ case PholioTransactionType::TYPE_IMAGE_NAME:
+ case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
+ case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
+ case PholioTransactionType::TYPE_IMAGE_FILE:
+ case PholioTransactionType::TYPE_IMAGE_REPLACE:
+ $tags[] = MetaMTANotificationType::TYPE_PHOLIO_UPDATED;
+ break;
+ default:
+ $tags[] = MetaMTANotificationType::TYPE_PHOLIO_OTHER;
+ break;
+ }
+ return $tags;
+ }
+
public function getTitle() {
$author_phid = $this->getAuthorPHID();
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
@@ -67,8 +67,16 @@
}
$grid = array();
+ $jj = (count($depth) + 1);
for ($ii = 0; $ii < $depth; $ii++) {
$row = array();
+ $row[] = phutil_tag(
+ 'th',
+ array(
+ 'valign' => 'middle',
+ 'class' => 'pholio-history-header',
+ ),
+ pht('Revision %d', $jj--));
foreach ($cols as $col) {
if (empty($col[$ii])) {
$row[] = phutil_tag('td', array(), null);
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
@@ -58,6 +58,11 @@
$all_tags = array_diff_key($all_tags, $this->getManiphestMailTags());
}
+ $pholio = 'PhabricatorApplicationPholio';
+ if (!PhabricatorApplication::isClassInstalled($pholio)) {
+ $all_tags = array_diff_key($all_tags, $this->getPholioMailTags());
+ }
+
foreach ($all_tags as $key => $label) {
$mailtags[$key] = (bool)idx($new_tags, $key, false);
}
@@ -180,12 +185,15 @@
"\n\n".
'**Phabricator will send an email to your primary account when:**'));
- $form
- ->appendChild(
- $this->buildMailTagCheckboxes(
- $this->getDifferentialMailTags(),
- $mailtags)
- ->setLabel(pht('Differential')));
+ $differential = 'PhabricatorApplicationDifferential';
+ if (PhabricatorApplication::isClassInstalled($differential)) {
+ $form
+ ->appendChild(
+ $this->buildMailTagCheckboxes(
+ $this->getDifferentialMailTags(),
+ $mailtags)
+ ->setLabel(pht('Differential')));
+ }
$maniphest = 'PhabricatorApplicationManiphest';
if (PhabricatorApplication::isClassInstalled($maniphest)) {
@@ -196,6 +204,15 @@
->setLabel(pht('Maniphest')));
}
+ $pholio = 'PhabricatorApplicationPholio';
+ if (PhabricatorApplication::isClassInstalled($pholio)) {
+ $form->appendChild(
+ $this->buildMailTagCheckboxes(
+ $this->getPholioMailTags(),
+ $mailtags)
+ ->setLabel(pht('Pholio')));
+ }
+
$form
->appendChild(
id(new AphrontFormSubmitControl())
@@ -244,7 +261,14 @@
pht("A task's associated projects change."),
MetaMTANotificationType::TYPE_MANIPHEST_OTHER =>
pht('Other task activity not listed above occurs.'),
-
+ MetaMTANotificationType::TYPE_PHOLIO_STATUS =>
+ pht("A mock's status changes."),
+ MetaMTANotificationType::TYPE_PHOLIO_COMMENT =>
+ pht('Someone comments on a mock.'),
+ MetaMTANotificationType::TYPE_PHOLIO_UPDATED =>
+ pht('Mock images or descriptions change.'),
+ MetaMTANotificationType::TYPE_PHOLIO_OTHER =>
+ pht('Other task activity not listed above occurs.'),
);
}
@@ -276,6 +300,17 @@
));
}
+ private function getPholioMailTags() {
+ return array_select_keys(
+ $this->getMailTags(),
+ array(
+ MetaMTANotificationType::TYPE_PHOLIO_STATUS,
+ MetaMTANotificationType::TYPE_PHOLIO_COMMENT,
+ MetaMTANotificationType::TYPE_PHOLIO_UPDATED,
+ MetaMTANotificationType::TYPE_PHOLIO_OTHER,
+ ));
+ }
+
private function buildMailTagCheckboxes(
array $tags,
array $prefs) {
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
@@ -239,3 +239,12 @@
padding: 12px 8px;
border-top: 1px solid {$thinblueborder};
}
+
+.pholio-history-header {
+ vertical-align: middle;
+ color: {$lightbluetext};
+ font-weight: bold;
+ padding-right: 8px;
+ -webkit-font-smoothing: antialiased;
+ white-space: nowrap;
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 8:20 PM (2 w, 9 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7652801
Default Alt Text
D9644.id23149.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility