archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Make D3123 more consistent

Browse Source 
Summary:
Put the function in the base class so all the Diffusion views
can use it. Also use shinier tooltips.

Test Plan: Browse Diffusion.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3206
This commit is contained in:
Alan Huang
2012-08-08 18:26:23 -07:00
parent 330b0a3d4b
commit eeb359bae6
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/applications/diffusion/view/DiffusionBrowseTableView.php
View File

@@ -34,19 +34,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
return $this; return $this;
} }
private static function renderName($name) {
$email = new PhutilEmailAddress($name);
if ($email->getDisplayName() || $email->getDomainName()) {
return phutil_render_tag(
'span',
array(
'title' => $email->getAddress(),
),
phutil_escape_html($email->getDisplayName()));
}
return phutil_escape_html($name);
}
public function setUser(PhabricatorUser $user) { public function setUser(PhabricatorUser $user) {
$this->user = $user; $this->user = $user;
return $this; return $this;

4
src/applications/diffusion/view/DiffusionHistoryTableView.php
View File

@@ -108,7 +108,7 @@ final class DiffusionHistoryTableView extends DiffusionView {
if ($author_phid && isset($handles[$author_phid])) { if ($author_phid && isset($handles[$author_phid])) {
$author = $handles[$author_phid]->renderLink(); $author = $handles[$author_phid]->renderLink();
} else { } else {
$author = phutil_escape_html($history->getAuthorName()); $author = self::renderName($history->getAuthorName());
} }
$different_committer = false; $different_committer = false;
@@ -121,7 +121,7 @@ final class DiffusionHistoryTableView extends DiffusionView {
if ($committer_phid && isset($handles[$committer_phid])) { if ($committer_phid && isset($handles[$committer_phid])) {
$committer = $handles[$committer_phid]->renderLink(); $committer = $handles[$committer_phid]->renderLink();
} else { } else {
$committer = phutil_escape_html($committer); $committer = self::renderName($committer);
} }
$author .= '/'.$committer; $author .= '/'.$committer;
} }

4
src/applications/diffusion/view/DiffusionTagListView.php
View File

@@ -84,9 +84,9 @@ final class DiffusionTagListView extends DiffusionView {
if ($commit && $commit->getAuthorPHID()) { if ($commit && $commit->getAuthorPHID()) {
$author = $this->handles[$commit->getAuthorPHID()]->renderLink(); $author = $this->handles[$commit->getAuthorPHID()]->renderLink();
} else if ($commit && $commit->getCommitData()) { } else if ($commit && $commit->getCommitData()) {
$author = phutil_escape_html($commit->getCommitData()->getAuthorName()); $author = self::renderName($commit->getCommitData()->getAuthorName());
} else { } else {
$author = phutil_escape_html($tag->getAuthor()); $author = self::renderName($tag->getAuthor());
} }
$description = null; $description = null;

20
src/applications/diffusion/view/DiffusionView.php
View File

@@ -147,4 +147,24 @@ abstract class DiffusionView extends AphrontView {
"D{$id}"); "D{$id}");
} }
final protected static function renderName($name) {
$email = new PhutilEmailAddress($name);
if ($email->getDisplayName() || $email->getDomainName()) {
Javelin::initBehavior('phabricator-tooltips', array());
require_celerity_resource('aphront-tooltip-css');
return javelin_render_tag(
'span',
array(
'sigil' => 'has-tooltip',
'meta' => array(
'tip' => $email->getAddress(),
'align' => 'E',
'size' => 'auto',
),
),
phutil_escape_html($email->getDisplayName()));
}
return phutil_escape_html($name);
}
} }