[Rt-commit] r18020 - in rt/3.999/branches/merge_to_3.8.2: share/html/Ticket/Elements

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Jan 29 05:14:07 2009
New Revision: 18020

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments

Log:
 r19224 at sunnavys-mb:  sunnavy | 2009-01-29 18:08:45 +0800
 merged share/html/Ticket/Elements/ShowTransactionAttachments


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Ticket/Elements/ShowTransactionAttachments	Thu Jan 29 05:14:07 2009
@@ -62,12 +62,18 @@
 % if ( $downloadable_headers && !$message->filename && $message->content_type =~ /text/  ) {
  / <a href="<% $attach_path %>/WithHeaders/<% $message->id %>"><% _('with headers') %></a>
 % }
-<br/>
+<br />
 <span class="downloadcontenttype"><% $message->content_type %> <% $size_to_str->( $size ) %></span>
 </div>
 %   }
+% # If there is sub-messages, open a dedicated div
+% if ( scalar ( grep $_->__value('Parent') == $message->id, @$Attachments ) ) {
+<div class="messageattachments">
+% } else {
 
 <div class="messagebody">
+%}
+    
 <%PERL>
 # {{{ if it has a content-disposition: attachment, don't show inline
 unless ( ($message->get_header('Content-Disposition')||"") =~ /attachment/i ) {
@@ -111,7 +117,12 @@
 
             # if it's a text/html clean the body and show it
             if ( $message->content_type =~ m{^text/(?:html|enriched)$}i ) {
-                $m->out( $m->comp( '/Elements/ScrubHTML', content => $content ) );
+                $content = $m->comp( '/Elements/ScrubHTML', Content => $content );
+                if ( $message->ContentType eq 'text/html' ) {
+                    $m->comp('/Elements/MakeClicky', 
+                            content => \$content, html => 1 );
+                }
+                $m->out( $content );
             }
 
             # if it's a text/plain show the body
@@ -139,6 +150,10 @@
               . '/" />' );
     }
     elsif ( $message->content_length > 0 ) {
+        $m->out( '<p>' .
+            _( 'Message body not shown because it is too large or is not plain text.' ) .
+            '</p>'
+      
         $m->out(
             _( 'Message body not shown because it is too large or is not plain text.' )
         );