Skip to content

bugzilla
bugzilla
Commit 41732933 authored by db48x%yahoo.com's avatar db48x%yahoo.com
Browse files
Options

bug 369429: bug reports should contain microformat markup in order to make the…

bug 369429: bug reports should contain microformat markup in order to make the information in them more useable. r=LpSolit
parent 4827e4de
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 19 deletions
Bugzilla/Bug.pm
View file @ 41732933
......@@ -1475,7 +1475,6 @@ sub GetComments {
my %comment = %$comment_ref;
$comment{'email'} .= Bugzilla->params->{'emailsuffix'};
$comment{'name'} = $comment{'name'} || $comment{'email'};
# If raw data is requested, do not format 'special' comments.
$comment{'body'} = format_comment(\%comment) unless $raw;
......
Bugzilla/BugMail.pm
View file @ 41732933
......@@ -704,11 +704,11 @@ sub prepare_comments {
foreach my $comment (@$raw_comments) {
if ($count) {
$result .= "\n\n--- Comment #$count from ";
if ($comment->{'name'} eq $comment->{'email'}) {
$result .= $comment->{'email'} . Bugzilla->params->{'emailsuffix'};
} else {
if ($comment->{'name'}) {
$result .= $comment->{'name'} . " <" . $comment->{'email'} .
Bugzilla->params->{'emailsuffix'} . ">";
} else {
$result .= $comment->{'email'} . Bugzilla->params->{'emailsuffix'};
}
$result .= " " . format_time($comment->{'time'}) . " ---\n";
}
......
template/en/default/bug/comments.html.tmpl
View file @ 41732933
......@@ -113,8 +113,11 @@
<span class="comment_rule">-------</span> <i>Comment
<a name="c[% count %]" href="show_bug.cgi?id=[% bug.bug_id %]#c[% count %]">
#[% count %]</a> From
<a href="mailto:[% comment.email FILTER html %]">
[% comment.name FILTER html %]</a>
<span class="vcard">
<a class="fn email" href="mailto:[% comment.email FILTER html %]">
[% (comment.name || comment.email) FILTER html %]
</a>
</span>
[%+ comment.time FILTER time %]
</i>
[% IF mode == "edit" %]
......
template/en/default/bug/edit.html.tmpl
View file @ 41732933
......@@ -673,8 +673,7 @@
<b>Reporter</b>:
</td>
<td>
<a href="mailto:[% bug.reporter.email FILTER html %]">
[% bug.reporter.identity FILTER html %]</a>
[% INCLUDE user_identity user => bug.reporter %]
</td>
</tr>
......@@ -683,8 +682,7 @@
<b><a href="page.cgi?id=fields.html#assigned_to">Assigned&nbsp;To</a></b>:
</td>
<td>
<a href="mailto:[% bug.assigned_to.email FILTER html %]">
[% bug.assigned_to.identity FILTER html %]</a>
[% INCLUDE user_identity user => bug.assigned_to %]
</td>
</tr>
......@@ -705,15 +703,7 @@
[% ELSE %]
<input type="hidden" name="qa_contact" id="qa_contact"
value="[% bug.qa_contact.login FILTER html %]">
<a href="mailto:[% bug.qa_contact.email FILTER html %]">
[% IF bug.qa_contact.login && bug.qa_contact.login.length > 30 %]
<span title="[% bug.qa_contact.login FILTER html %]">
[% bug.qa_contact.identity FILTER truncate(30) FILTER html %]
</span>
[% ELSE %]
[% bug.qa_contact.identity FILTER html %]
[% END %]
</a>
[% INCLUDE user_identity user => bug.qa_contact %]
[% END %]
</td>
</tr>
......@@ -837,3 +827,22 @@
[% size = 0 %]
[% value = undef %]
[% END %]
[%############################################################################%]
[%# Block for user identities. Wraps the information inside of an hCard. #%]
[%############################################################################%]
[% BLOCK user_identity %]
<span class="vcard">
[% IF user.name %]
<a class="email" href="mailto:[% user.email FILTER html %]">
<span class="fn">[% user.name FILTER html %]</span>
&lt;[% user.email FILTER html %]&gt;
</a>
[% ELSE %]
<a class="fn email" href="mailto:[% user.email FILTER html %]">
[% user.email FILTER html %]
</a>
[% END %]
</span>
[% END %]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment