summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-03-18 07:48:55 +0100
committerByron Jones <bjones@mozilla.com>2013-03-18 07:48:55 +0100
commit5772a0035b3db7d261cc81401216aa2bdf3537d0 (patch)
tree243dc8558c37665028c38a80f1a2908904ac3cb2 /template
parent4383966dda2103ac5dd290b96b3ba3edd6e08271 (diff)
parentb1f72d1f57828abf8259a5712481315315c860db (diff)
downloadbugzilla-5772a0035b3db7d261cc81401216aa2bdf3537d0.tar.gz
bugzilla-5772a0035b3db7d261cc81401216aa2bdf3537d0.tar.xz
merge with bugzilla/4.2
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/comments.html.tmpl42
-rw-r--r--template/en/default/filterexceptions.pl1
2 files changed, 12 insertions, 31 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index a876fb081..b0611024b 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -92,36 +92,15 @@
[% sort_order = "oldest_to_newest" %]
[% END %]
-
-[%# Set up the variables as needed, depending on the sort order %]
-[% IF sort_order == "oldest_to_newest" %]
- [% count = 0 %]
- [% description = 0 %]
- [% increment = 1 %]
-[% ELSE %]
- [% increment = -1 %]
- [% IF sort_order == "newest_to_oldest" %]
- [% count = comments.size - 1 %]
- [% description = 0 %]
- [% ELSIF sort_order == "newest_to_oldest_desc_first" %]
- [% count = comments.size %]
- [% description = comments.size %]
- [% END %]
-[% END %]
-
-[% Hook.process("comment_banner") %]
-
<!-- This auto-sizes the comments and positions the collapse/expand links
to the right. -->
<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
<td>
[% FOREACH comment = comments %]
- [% IF count >= start_at %]
+ [% IF comment.count >= start_at %]
[% PROCESS a_comment %]
[% END %]
-
- [% count = count + increment %]
[% END %]
[%# Note: this template is used in multiple places; if you use this hook,
@@ -151,15 +130,15 @@
[% comment_text = comment.body_full %]
[% RETURN IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
- <div id="c[% count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
- [% " bz_comment_hilite" IF marks.$count %]
- [% " bz_first_comment" IF count == description %]">
- [% IF count == description %]
+ <div id="c[% comment.count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
+ [% " bz_comment_hilite" IF marks.${comment.count} %]
+ [% " bz_first_comment" IF comment.count == 0 %]">
+ [% IF comment.count == 0 %]
[% class_name = "bz_first_comment_head" %]
[% comment_label = "Description" %]
[% ELSE %]
[% class_name = "bz_comment_head" %]
- [% comment_label = "Comment " _ count %]
+ [% comment_label = "Comment " _ comment.count %]
[% END %]
<div class="[% class_name FILTER html %]">
@@ -178,7 +157,8 @@
>reply</a>]
[% END %]
<script type="text/javascript"><!--
- addCollapseLink([% count %], 'Toggle comment display'); // -->
+ addReplyLink([% comment.count %], [% comment.id %]);
+ addCollapseLink([% comment.count %], 'Toggle comment display'); // -->
</script>
</span>
[% END %]
@@ -190,7 +170,7 @@
<input type="checkbox"
name="isprivate_[% comment.id %]" value="1"
id="isprivate_[% comment.id %]"
- onClick="updateCommentPrivacy(this, [% count %])"
+ onClick="updateCommentPrivacy(this, [% comment.count %])"
[% " checked=\"checked\"" IF comment.is_private %]>
<label for="isprivate_[% comment.id %]">Private</label>
</div>
@@ -198,7 +178,7 @@
<span class="bz_comment_number">
<a
- href="show_bug.cgi?id=[% bug.bug_id %]#c[% count %]">
+ href="show_bug.cgi?id=[% bug.bug_id %]#c[% comment.count %]">
[%- comment_label FILTER html %]</a>
</span>
@@ -238,7 +218,7 @@
# generated HTML
#%]
<pre class="bz_comment_text"
- [% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
+ [% ' id="comment_text_' _ comment.count _ '"' IF mode == "edit" %]>
[%- comment_text FILTER quoteUrls(bug, comment) -%]
</pre>
</div>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 08757cfe7..cc3cd2441 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -218,6 +218,7 @@
'bug/comments.html.tmpl' => [
'comment.id',
+ 'comment.count',
'bug.bug_id',
],