--- trunk/lib/Frey/SVK.pm 2008/12/16 21:01:53 863 +++ trunk/lib/Frey/SVK.pm 2009/06/30 15:10:55 1133 @@ -2,8 +2,7 @@ use Moose; extends 'Frey'; -with 'Frey::Web'; -with 'Frey::Path'; +with 'Frey::Web', 'Frey::Path', 'Frey::HTML::Diff'; use Moose::Util::TypeConstraints; @@ -111,26 +110,14 @@ my $diff = `svk diff`; $self->add_status( diff => $diff ); - $diff = $self->html_escape( $diff ); - $self->add_css( qq| - pre span.add, - pre span.del { - float: left; - width: 100%; - } - pre span.add { background: #dfd } - pre span.del { background: #fdd } - pre form.inline { display: inline } - | ); - $diff =~ s{^(\+.*?)$}{$1}gm; - $diff =~ s{^(\-.*?)$}{$1}gm; + $diff = $self->html_diff( $diff ); + sub form { my ( $path, $action ) = @_; qq|
|; }; $diff =~ s{^(===\s+)(\S+)$}{$1 . form($2,'revert') . qq| $2 | . form($2,'postpone') }gem; - $diff = qq|
$diff
| if $diff; warn "diff_as_markup ",length($diff)," bytes"; return $diff; } @@ -194,4 +181,8 @@ return $html; } +__PACKAGE__->meta->make_immutable; +no Moose; +no Moose::Util::TypeConstraints; + 1;