summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authortravis%sedsystems.ca <>2005-02-10 02:30:17 +0100
committertravis%sedsystems.ca <>2005-02-10 02:30:17 +0100
commit6db4590f9bc598179bbed35b66a3e583a04984c0 (patch)
tree59be5eafc7bb24cc931fcdf3b960c7d7830db935 /template/en
parent6a20f783538986e8caf60b31a659248dd552f63f (diff)
downloadbugzilla-6db4590f9bc598179bbed35b66a3e583a04984c0.tar.gz
bugzilla-6db4590f9bc598179bbed35b66a3e583a04984c0.tar.xz
Bug 11901 : Change Bugzilla comments line-wrapping policy
Patch by Max Kanat-Alexander <mkanat@kerio.com> r=gerv,justdave a=justdave
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/bug/comments.html.tmpl8
-rw-r--r--template/en/default/bug/create/create-guided.html.tmpl14
-rw-r--r--template/en/default/bug/create/create.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl2
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl2
-rw-r--r--template/en/default/pages/linked.html.tmpl4
-rw-r--r--template/en/default/pages/linkify.html.tmpl2
7 files changed, 18 insertions, 16 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 2f82b46dc..bf41200b7 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -17,6 +17,7 @@
# Rights Reserved.
#
# Contributor(s): Gervase Markham <gerv@gerv.net>
+ # Maxwell Kanat-Alexander <mkanat@kerio.com>
#%]
[% DEFAULT start_at = 0 mode = "show" %]
@@ -82,8 +83,13 @@
[%# Don't indent the <pre> block, since then the spaces are displayed in the
# generated HTML
#%]
+[% IF comment.already_wrapped %]
+ [% wrapped_comment = comment.body %]
+[% ELSE %]
+ [% wrapped_comment = comment.body FILTER wrap_comment %]
+[% END %]
<pre[% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
- [%- comment.body FILTER quoteUrls -%]
+ [%- wrapped_comment FILTER quoteUrls -%]
</pre>
</div>
[% END %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 47454d303..a4256a6d5 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -323,8 +323,7 @@ function PutDescription() {
<b>Details</b>
</td>
<td valign="top">
- <textarea rows="6" cols="80" name="comment"
- wrap="hard"></textarea>
+ <textarea rows="6" cols="80" name="comment"></textarea>
<p>
Expand on the Summary. Please be
as specific as possible about what is wrong.
@@ -372,7 +371,7 @@ function PutDescription() {
<b>Steps to Reproduce</b>
</td>
<td valign="top">
-<textarea rows="4" cols="80" name="reproduce_steps" wrap="hard">
+<textarea rows="4" cols="80" name="reproduce_steps">
1.
2.
3.
@@ -389,8 +388,7 @@ function PutDescription() {
<b>Actual Results</b>
</td>
<td valign="top">
- <textarea rows="4" cols="80" name="actual_results"
- wrap="hard"></textarea>
+ <textarea rows="4" cols="80" name="actual_results"></textarea>
<p>
What happened after you performed the steps above?
</p>
@@ -402,8 +400,7 @@ function PutDescription() {
<b>Expected Results</b>
</td>
<td valign="top">
- <textarea rows="4" cols="80" name="expected_results"
- wrap="hard"></textarea>
+ <textarea rows="4" cols="80" name="expected_results"></textarea>
<p>
What should the software have done instead?
</p>
@@ -415,8 +412,7 @@ function PutDescription() {
<b>Additional Information</b>
</td>
<td valign="top">
- <textarea rows="8" cols="80" name="additional_info"
- wrap="hard"></textarea>
+ <textarea rows="8" cols="80" name="additional_info"></textarea>
<p>
Add any additional information you feel may be
relevant to this [% terms.bug %], such as the <b>theme</b> you were
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index a5d5e213c..013a05f24 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -251,7 +251,7 @@ function set_assign_to() {
<tr><td align="right" valign="top"><strong>Description:</strong></td>
<td colspan="3">
- <textarea wrap="hard" name="comment" rows="10" cols="80">
+ <textarea name="comment" rows="10" cols="80">
[% IF cloned_bug_id %]
+++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id %] +++
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index cf2ed5d7b..613bfb4d4 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -481,7 +481,7 @@
[% END %]
<br>
<a name="add_comment"></a>
- <textarea wrap="hard" name="comment" id="comment" rows="10" cols="80"
+ <textarea name="comment" id="comment" rows="10" cols="80"
accesskey="c"></textarea>
[% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index b705ba574..c2c8bf4d8 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -186,7 +186,7 @@
</table>
<label for="comment"><b>Additional Comments:</b></label><br>
-<textarea id="comment" name="comment" rows="5" cols="80" wrap="hard"></textarea><br>
+<textarea id="comment" name="comment" rows="5" cols="80"></textarea><br>
[% IF groups.size > 0 %]
diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl
index fcb5ee9d0..bd5933094 100644
--- a/template/en/default/pages/linked.html.tmpl
+++ b/template/en/default/pages/linked.html.tmpl
@@ -32,7 +32,7 @@
<p>
<pre>
-[%- cgi.param("text") FILTER quoteUrls FILTER html -%]
+[%- cgi.param("text") FILTER wrap_comment FILTER quoteUrls FILTER html -%]
</pre>
</p>
@@ -47,7 +47,7 @@
<p>
<pre>
-[%- cgi.param("text") FILTER quoteUrls -%]
+[%- cgi.param("text") FILTER wrap_comment FILTER quoteUrls -%]
</pre>
</p>
diff --git a/template/en/default/pages/linkify.html.tmpl b/template/en/default/pages/linkify.html.tmpl
index 40cda81cb..896f7d41f 100644
--- a/template/en/default/pages/linkify.html.tmpl
+++ b/template/en/default/pages/linkify.html.tmpl
@@ -30,7 +30,7 @@
</p>
<form action="page.cgi" method="post">
- <textarea cols="80" rows="20" name="text" wrap="hard"></textarea>
+ <textarea cols="80" rows="20" name="text"></textarea>
<br>
<input type="hidden" name="id" value="linked.html">
<input value="Linkify" type="submit">