OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Aug-2003 12:02:04
Branch: HEAD Handle: 2003080611020202
Modified files:
openpkg-src/rt rt.patch rt.spec
openpkg-web news.txt
Log:
fix display of quoted messages, add word wrapping to avoid
'disappearing links syndrome'
Summary:
Revision Changes Path
1.13 +28 -6 openpkg-src/rt/rt.patch
1.91 +1 -1 openpkg-src/rt/rt.spec
1.6053 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 rt.patch
--- openpkg-src/rt/rt.patch 5 Aug 2003 14:54:17 -0000 1.12
+++ openpkg-src/rt/rt.patch 6 Aug 2003 10:02:04 -0000 1.13
@@ -18,8 +18,8 @@
return ( 0, $self->loc('Could not create user') );
}
--- html/Ticket/Elements/ShowMessageStanza.dist 2003-08-05 16:21:42.000000000
+0200
-+++ html/Ticket/Elements/ShowMessageStanza 2003-08-05 16:28:06.000000000 +0200
-@@ -22,22 +22,23 @@
++++ html/Ticket/Elements/ShowMessageStanza 2003-08-06 11:49:29.000000000 +0200
+@@ -22,23 +22,44 @@
%#
%# END LICENSE BLOCK
<%perl>
@@ -29,9 +29,15 @@
- Depth => $Depth + 1,
- Transaction => $Transaction,
- Message => $stanza );
-+ { my $msg = '';
++ { my $msg='';
+ foreach my $stanza (@$Message) {
+ if ( ref $stanza eq "ARRAY" ) {
++ if ($msg ne '') {
++</%perl>
++<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre></font>
++<%perl>
++ $msg = '';
++ }
+ $m->comp( 'ShowMessageStanza',
+ Depth => $Depth + 1,
+ Transaction => $Transaction,
@@ -41,8 +47,20 @@
+ my $content = $stanza->{raw};
+ RT::Interface::Web::EscapeUTF8(\$content);
+ $m->comp('/Elements/Callback', content => \$content, %ARGS);
++ my $max = 0;
++ foreach ( split ( /\n/, $content ) ) {
++ $max = length if length > $max;
++ }
++ if ( $max > 76 ) {
++ require Text::Wrapper;
++ my $wrapper = new Text::Wrapper(
++ columns => 70,
++ body_start => ( $max > 70 * 3 ? ' ' : '' ),
++ par_start => '');
++ $content = $wrapper->wrap($content);
++ }
+ $msg .= "$content\n";
-+ }
++ }
}
- elsif ( ref $stanza eq "HASH" ) {
- my $content = $stanza->{raw};
@@ -53,10 +71,14 @@
</%perl>
-<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
-% }
-+<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre><br></font>
- % }
+-% }
++<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre></font>
++<%perl>
++ }
++</%perl>
<%INIT>
use URI::URL;
+ my $server = 'fsck.com';
--- html/Elements/Header.dist 2003-08-05 16:22:02.000000000 +0200
+++ html/Elements/Header 2003-08-05 16:24:22.000000000 +0200
@@ -40,9 +40,10 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.spec
============================================================================
$ cvs diff -u -r1.90 -r1.91 rt.spec
--- openpkg-src/rt/rt.spec 5 Aug 2003 14:54:17 -0000 1.90
+++ openpkg-src/rt/rt.spec 6 Aug 2003 10:02:04 -0000 1.91
@@ -49,7 +49,7 @@
Group: Database
License: GPL
Version: %{V_here}
-Release: 20030805
+Release: 20030806
# package options
%option with_color_primary 336699
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6052 -r1.6053 news.txt
--- openpkg-web/news.txt 6 Aug 2003 08:52:43 -0000 1.6052
+++ openpkg-web/news.txt 6 Aug 2003 10:02:02 -0000 1.6053
@@ -1,3 +1,4 @@
+06-Aug-2003: Upgraded package: P<rt-3.0.4-20030806>
06-Aug-2003: Upgraded package: P<openssl-0.9.7b-20030806>
06-Aug-2003: Upgraded package: P<delegate-8.5.9-20030806>
06-Aug-2003: Upgraded package: P<pgadmin-0.8.0.20030806-20030806>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
