summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorReed Loden <reed@reedloden.com>2010-03-28 06:02:42 +0200
committerReed Loden <reed@reedloden.com>2010-03-28 06:02:42 +0200
commitcad688f046229aa4c9cfe25c6d94f300524fb1f3 (patch)
tree1e8b5ab9db2ae10dde81085a20d66c2d07a295b3 /template/en/default
parentddc72fee6655a6c0b38e1bb8a66c32a82c140217 (diff)
downloadbugzilla-cad688f046229aa4c9cfe25c6d94f300524fb1f3.tar.gz
bugzilla-cad688f046229aa4c9cfe25c6d94f300524fb1f3.tar.xz
Bug 529433 - "Show name and full e-mail in a tooltip for flag setters and requestees"
[r=LpSolit a=LpSolit]
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/attachment/list.html.tmpl16
-rw-r--r--template/en/default/flag/list.html.tmpl14
2 files changed, 25 insertions, 5 deletions
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 9efc8a4e0..53f20f236 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -109,10 +109,22 @@ function toggle_display(link) {
<i>no flags</i>
[% ELSE %]
[% FOREACH flag = attachment.flags %]
- [% flag.setter.nick FILTER html %]:
+ [% IF user.id %]
+ <span title="[% flag.setter.identity FILTER html %]">[% flag.setter.nick FILTER html %]</span>:
+ [% ELSIF flag.setter.name %]
+ <span title="[% flag.setter.name FILTER html %]">[% flag.setter.nick FILTER html %]</span>:
+ [% ELSE %]
+ [% flag.setter.nick FILTER html %]:
+ [% END %]
[%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
[%+ IF flag.status == "?" && flag.requestee %]
- ([% flag.requestee.nick FILTER html %])
+ [% IF user.id %]
+ (<span title="[% flag.requestee.identity FILTER html %]">[% flag.requestee.nick FILTER html %]</span>)
+ [% ELSIF flag.requestee.name %]
+ (<span title="[% flag.requestee.name FILTER html %]">[% flag.requestee.nick FILTER html %]</span>)
+ [% ELSE %]
+ ([% flag.requestee.nick FILTER html %])
+ [% END %]
[% END %]<br>
[% END %]
[% END %]
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 1e8974a9f..582da0b54 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -53,7 +53,7 @@
[% FOREACH flag = type.flags %]
<tr>
<td>
- [% flag.setter.nick FILTER html %]:
+ <span title="[% flag.setter.identity FILTER html %]">[% flag.setter.nick FILTER html %]</span>:
</td>
<td>
<label title="[% type.description FILTER html %]"
@@ -147,10 +147,18 @@
<p><b>Flags:</b></p>
[% header_displayed = 1 %]
[% END %]
- [% flag.setter.nick FILTER html %]:
+ [% IF flag.setter.name %]
+ <span title="[% flag.setter.name FILTER html %]">[% flag.setter.nick FILTER html %]</span>:
+ [% ELSE %]
+ [% flag.setter.nick FILTER html %]:
+ [% END %]
[%+ type.name FILTER html FILTER no_break %][% flag.status %]
[% IF flag.requestee %]
- ([% flag.requestee.nick FILTER html %])
+ [% IF flag.requestee.name %]
+ (<span title="[% flag.requestee.name FILTER html %]">[% flag.requestee.nick FILTER html %]</span>)
+ [% ELSE %]
+ ([% flag.requestee.nick FILTER html %])
+ [% END %]
[% END %]<br>
[% END %]
[% END %]