[Rt-commit] rt branch, history-folding, updated. rt-3.9.5-430-g564fcaa

[Jesse Vincent]

The branch, history-folding has been updated
       via  564fcaafd88119f44b720ec2a6c6a35db66174f1 (commit)
       via  1a85cfc12735d7e394cd93ca6b74c2dd75badd1a (commit)
      from  8ef6bc59fd5e717401418bf9322e6d16659de3f9 (commit)

Summary of changes:
 share/html/Ticket/Elements/FoldStanzaJS      |    5 ++++-
 share/html/Ticket/Elements/ShowMessageStanza |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 1a85cfc12735d7e394cd93ca6b74c2dd75badd1a
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Nov 23 17:09:34 2010 -0500

    First pass at fixing up "PlainTextPre"

diff --git a/share/html/Ticket/Elements/ShowMessageStanza b/share/html/Ticket/Elements/ShowMessageStanza
index f69fa62..967c019 100755
--- a/share/html/Ticket/Elements/ShowMessageStanza
+++ b/share/html/Ticket/Elements/ShowMessageStanza
@@ -47,6 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <%perl>
 if ( ref $Message ) {
+    $m->out('<pre>') if $plain_text_pre && !$Depth && !$plain_text_mono;
     $m->comp('FoldStanzaJS', Depth => $Depth);
 
     my @stack;

commit 564fcaafd88119f44b720ec2a6c6a35db66174f1
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Nov 23 17:18:05 2010 -0500

    restore plaintextmono

diff --git a/share/html/Ticket/Elements/FoldStanzaJS b/share/html/Ticket/Elements/FoldStanzaJS
index a1db7b3..50b5b63 100644
--- a/share/html/Ticket/Elements/FoldStanzaJS
+++ b/share/html/Ticket/Elements/FoldStanzaJS
@@ -3,7 +3,10 @@
     class="message-stanza-folder"
     onclick="fold_message_stanza(this, '<%loc('Show quoted text')%>', '<%loc('Hide quoted text')%>');"><%loc('Show quoted text')%></div>
 % }
-<div class="message-stanza" <%($Depth == 1)? 'style="display: none;" ' : ''|n%>>
+<div class="message-stanza<%($plain_text_mono ? " plain-text-white-space" : "")%>" <%($Depth == 1)? 'style="display: none;" ' : ''|n%>>
 <%ARGS>
 $Depth => 0
 </%ARGS>
+<%init>
+my $plain_text_mono = RT->Config->Get('PlainTextMono', $session{'CurrentUser'});
+</%init>

-----------------------------------------------------------------------