From: Matt McHenry <mozilla@matt.mchenryfamily.org>
Date: Tue, 22 Jun 2010 02:30:36 +0000 (-0700)
Subject: Bug 398473: User preference for the position of the comment box
X-Git-Tag: bugzilla-3.7.1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b25ce729062f54cc0520eecffc97e775ce75ab3c;p=thirdparty%2Fbugzilla.git

Bug 398473: User preference for the position of the comment box
r=mkanat, a=mkanat
---

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 9c798ceb95..e90fe41dba 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -65,6 +65,9 @@ sub SETTINGS {
     # 2007-07-02 altlist@gmail.com -- Bug 225731
     quote_replies      => { options => ['quoted_reply', 'simple_reply', 'off'],
                             default => "quoted_reply" },
+    # 2009-02-01 mozilla@matt.mchenryfamily.org -- Bug 398473
+    comment_box_position => { options => ['before_comments', 'after_comments'],
+                              default => 'before_comments' },
     # 2008-08-27 LpSolit@gmail.com -- Bug 182238
     timezone           => { subclass => 'Timezone', default => 'local' },
     }
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index d9342a93c2..479e67c1e8 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -218,7 +218,9 @@
                show_attachment_flags = bug.show_attachment_flags
     %]
 
-    [% PROCESS comment_box %]
+    [% IF user.settings.comment_box_position.value == 'before_comments' %]
+      [% PROCESS comment_box %]
+    [% END %]
   </td>
   <td>
     [% PROCESS section_restrict_visibility %]
@@ -233,6 +235,11 @@
     %]
   </div>
 
+  [% IF user.settings.comment_box_position.value == 'after_comments' %]
+    <hr>
+    [% PROCESS comment_box %]
+  [% END %]        
+
 </form>
 
 [%############################################################################%]
diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index 661334c38d..e96e3169d2 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -43,6 +43,9 @@
    "quote_replies"                    => "Quote the associated comment when you click on its reply link",
    "quoted_reply"                     => "Quote the full comment",
    "simple_reply"                     => "Reference the comment number only",
+   "comment_box_position"             => "Position of the Additional Comments box",
+   "before_comments"                  => "Before other comments",
+   "after_comments"                   => "After other comments",
    "timezone"                         => "Timezone used to display dates and times",
    "local"                            => "Same as the server",
                    }