diff options
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 51 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 13 | ||||
| -rw-r--r-- | template/en/default/global/setting-descs.none.tmpl | 10 |
3 files changed, 53 insertions, 21 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 7a9dfb4ef..58eaa376c 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -18,21 +18,48 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> # Maxwell Kanat-Alexander <mkanat@kerio.com> + # Shane H. W. Travis <travis@sedsystems.ca> #%] +[% PROCESS bug/time.html.tmpl %] + [% DEFAULT start_at = 0 mode = "show" %] -[% count = 0 %] [% isinsider = Param("insidergroup") && UserInGroup(Param("insidergroup")) %] +[% sort_order = user.settings.comment_sort_order.value %] + +[%# NOTE: (start_at > 0) means we came here from a midair collision, + # in which case we don't care what the user's preference is. + %] +[% IF (start_at > 0) %] + [% 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 %] + + [% FOREACH comment = comments %] [% IF count >= start_at %] [% PROCESS a_comment %] [% END %] - [% count = count + 1 %] + [% count = count + increment %] [% END %] -[% PROCESS bug/time.html.tmpl %] - [%# Note: this template is used in multiple places; if you use this hook, # make sure you are aware of this fact. #%] @@ -46,7 +73,21 @@ [% IF NOT comment.isprivate || isinsider %] <div [% "class=\"bz_private\" " IF comment.isprivate %] [% "class=\"bz_comment_hilite\" " IF marks.$count %]> - [% IF count > 0 %] + [% IF count == description %] + <table> + <tr> + <td align="left"> + <b><a name="c0" href="#c0">Description</a>:</b> <script + type="text/javascript"><!-- + addReplyLink(0); + //--></script> + </td> + <td align="left" width="30%"> + Opened: [% bug.creation_ts FILTER time %] + </td> + </tr> + </table> + [% ELSE %] <br> <span class="bz_comment"> ------- <i>Comment diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 86fb4c6b6..d15cf9102 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -566,19 +566,6 @@ [%# *** Additional Comments *** %] <hr> -<table> - <tr> - <td align="left"> - <b><a name="c0" href="#c0">Description</a>:</b> <script - type="text/javascript"><!-- - addReplyLink(0); - //--></script> - </td> - <td align="right" width="100%"> - Opened: [% bug.creation_ts FILTER time %] - </td> - </tr> -</table> [% PROCESS bug/comments.html.tmpl comments = bug.longdescs diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index 9e7ac9596..1a31754a8 100644 --- a/template/en/default/global/setting-descs.none.tmpl +++ b/template/en/default/global/setting-descs.none.tmpl @@ -20,8 +20,12 @@ [% PROCESS global/variables.none.tmpl %] [% setting_descs = { - "display_quips" => "Show a quip at the top of each bug list", - "off" => "Off", - "on" => "On" + "comment_sort_order" => "When viewing $terms.abug, show comments in this order", + "display_quips" => "Show a quip at the top of each bug list", + "newest_to_oldest" => "Newest to Oldest", + "newest_to_oldest_desc_first" => "Newest to Oldest, but keep Description at the top", + "off" => "Off", + "oldest_to_newest" => "Oldest to Newest", + "on" => "On" } %] |