Merge lp:~thumper/launchpad/code-review-comment-formatting into lp:launchpad

[Tim Penhey]

[Tim Penhey (thumper)]

= Summary =

Fixes bug 326129 (firefox-3.{5,6} bug, merge review comments don't get wrapped
in <pre> block).

== Proposed fix ==

Adding the "white-space: pre-wrap" to the nice_pre formatted <pre> tag.

== Implementation details ==

Uses the "pre.wrap" CSS style now, rather than inline styles.

I was reminded of why we don't use the bug formatter for code review comments.
The bug formatter is turning an email into HTML, by grouping lines into
paragraphs. This works really well for actual conversations, but is complete
shite for code.

A question for beuno:
  should the pre.wrap class be added to style-3-0.css?

== Demo and Q/A ==

Look at a code review comment :)

== Reviewers ==

Need a general review:
  reviewer launchpad
And a UI review
  reviewer beuno ui
And a QA review to actually test against FF3.5, Konq, Opera and IE
  reviewer launchpad browser-qa

[Abel Deuring (adeuring)]

review: Approve

[Martin Albisetti (beuno)]

review: Approve (ui)

[Martin Albisetti (beuno)]

Yes, I think pre.wrap should be in the 3.0 CSS

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2009-07-16 04:17:24 +0000
+++ lib/canonical/launchpad/icing/style.css	2009-07-23 04:21:36 +0000
@@ -2418,6 +2418,7 @@
 pre.wrap {
   white-space: -moz-pre-wrap;
   white-space: -o-pre-wrap;
+  white-space: pre-wrap;
   word-wrap: break-word;
 }
 
 
=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2009-07-23 04:21:36 +0000
@@ -2469,8 +2469,6 @@
         fall back for IE by using the IE specific word-wrap property.
 
         TODO: Test IE compatibility. StuartBishop 20041118
-        TODO: This should probably just live in the stylesheet if this
-            CSS implementation is good enough. StuartBishop 20041118
         """
         if not self._stringtoformat:
             return self._stringtoformat
@@ -2478,13 +2476,7 @@
             linkified_text = re_substitute(self._re_linkify,
                 self._linkify_substitution, break_long_words,
                 cgi.escape(self._stringtoformat))
-            return ('<pre style="'
-                    'white-space: -moz-pre-wrap;'
-                    'white-space: -o-pre-wrap;'
-                    'word-wrap: break-word;'
-                    '">%s</pre>'
-                    % linkified_text
-                    )
+            return '<pre class="wrap">%s</pre>' % linkified_text
 
     # Match lines that start with one or more quote symbols followed
     # by a space. Quote symbols are commonly '|', or '>'; they are