summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/bug/comments.html.tmpl7
-rw-r--r--template/en/default/bug/edit.html.tmpl35
2 files changed, 27 insertions, 15 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 5add6d54f..9d05ba4ac 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -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" %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 5389af666..c97077d69 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -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 %]