From b1f72d1f57828abf8259a5712481315315c860db Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Sat, 16 Mar 2013 17:21:37 +0100
Subject: Bug 827983: "[reply]" link besides the original description will
 insert ("in reply to comment #N+1") when the comments order is "Newest to
 Oldest, but keep Descritption at the top" r/a=LpSolit

---
 template/en/default/bug/comments.html.tmpl | 41 ++++++++----------------------
 template/en/default/filterexceptions.pl    |  1 +
 2 files changed, 12 insertions(+), 30 deletions(-)

(limited to 'template')

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 170c69349..e3099d94a 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -35,34 +35,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 %]
-
 <!-- 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 %]
 
 [% IF user.settings.comment_box_position.value == "before_comments" && user.id %]
@@ -105,15 +86,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 %]">
@@ -121,8 +102,8 @@
         [% IF mode == "edit" %]
           <span class="bz_comment_actions">
             <script type="text/javascript"><!--
-              addReplyLink([% count %], [% comment.id %]);
-              addCollapseLink([% count %], 'Toggle comment display'); // -->
+              addReplyLink([% comment.count %], [% comment.id %]);
+              addCollapseLink([% comment.count %], 'Toggle comment display'); // -->
             </script>
           </span>
         [% END %]
@@ -134,7 +115,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>
@@ -142,7 +123,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>
 
@@ -175,7 +156,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 d804ad8fa..691241c9c 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -219,6 +219,7 @@
 
 'bug/comments.html.tmpl' => [
   'comment.id',
+  'comment.count',
   'bug.bug_id',
 ],
 
-- 
cgit v1.2.3-24-g4f1b