Bug 170822 - Linkification process destroys whitespace. Patch by gerv; r=bbaetz.

diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl
index 8c854e2bd8af358e8fbdb378c2f8380f4ee21343..c3d02885c69506e33385d831522975b6c2654a95 100644 (file)
--- a/template/en/default/pages/linked.html.tmpl
+++ b/template/en/default/pages/linked.html.tmpl
@@ -26,18 +26,29 @@
   Copy and paste the text below:
 </p>
 
+<hr>
+
 <p>
-  <tt>
-    [% quoteUrls(form.text) FILTER html %]
-  </tt>
+<pre>
+[%- quoteUrls(form.text) FILTER html -%]
+</pre>
 </p>
 
+<hr>
+
 <p>
-  It will end up looking like this:
+  If you place it in <tt>&lt;pre&gt;</tt> tags, 
+  the text will end up looking like this:
 </p>
 
+<hr>
+
 <p>
-  [% quoteUrls(form.text) %]
+<pre>
+[%- quoteUrls(form.text) -%]
+</pre>
 </p>
 
+<hr>
+
 [% INCLUDE global/footer.html.tmpl %]

diff --git a/template/en/default/pages/linkify.html.tmpl b/template/en/default/pages/linkify.html.tmpl
index 57f455dd2892e1544c58137adcb1f27f3b870f24..dd45c8fe2abec0d55aba5bd7ec35920c4bad534d 100644 (file)
--- a/template/en/default/pages/linkify.html.tmpl
+++ b/template/en/default/pages/linkify.html.tmpl
@@ -29,7 +29,7 @@
 </p>
 
 <form action="page.cgi" method="post">
-  <textarea cols="80" rows="20" name="text"></textarea>
+  <textarea cols="80" rows="20" name="text" wrap="hard"></textarea>
   <br>    
   <input type="hidden" name="id" value="linked.html">
   <input value="Linkify" type="submit">