From: <de...@de...> - 2007-09-17 20:58:38
|
Author: SteffenPoulsen Date: 2007-09-17 15:58:37 -0500 (Mon, 17 Sep 2007) New Revision: 14916 Modified: twiki/branches/MAIN/lib/TWiki/UI/RDiff.pm twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl Log: Item4599: Timestamps added to revisions (similar to breadcrump popup) Modified: twiki/branches/MAIN/lib/TWiki/UI/RDiff.pm =================================================================== --- twiki/branches/MAIN/lib/TWiki/UI/RDiff.pm 2007-09-17 20:46:02 UTC (rev 14915) +++ twiki/branches/MAIN/lib/TWiki/UI/RDiff.pm 2007-09-17 20:58:37 UTC (rev 14916) @@ -476,6 +476,7 @@ $diff =~ s/%REVTITLE1%/$r1/go; my $rInfo = ''; + my $rInfo2 = ''; my $text; if ( $r1 > $r2 + 1) { $rInfo = $session->i18n->maketext( @@ -483,14 +484,18 @@ } else { $rInfo = $session->renderer->renderRevisionInfo( $webName, $topic, undef, $r1, '$date - $wikiusername' ); + $rInfo2 = $session->renderer->renderRevisionInfo( + $webName, $topic, undef, $r1, '$rev ($date - $time) - $wikiusername' ); } # eliminate white space to prevent wrap around in HR table: $rInfo =~ s/\s+/ /g; + $rInfo2 =~ s/\s+/ /g; my $diffArrayRef = $session->{store}->getRevisionDiff( $session->{user}, $webName, $topic, $r2, $r1, $contextLines ); $text = _renderRevisionDiff( $session, $webName, $topic, $diffArrayRef, $renderStyle ); $diff =~ s/%REVINFO1%/$rInfo/go; + $diff =~ s/%REVINFO2%/$rInfo2/go; $diff =~ s/%TEXT%/$text/go; $page .= $diff; $r1 = $r1 - 1; Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl 2007-09-17 20:46:02 UTC (rev 14915) +++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/rdiff.pattern.tmpl 2007-09-17 20:58:37 UTC (rev 14916) @@ -16,7 +16,7 @@ -%TMPL:DEF{"header:left"}%<b><a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?rev=%REVTITLE1%" rel='nofollow'>%MAKETEXT{"Revision"}% %REVTITLE1%</a></b>%TMPL:END% +%TMPL:DEF{"header:left"}%<b><a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?rev=%REVTITLE1%" title='%MAKETEXT{"Topic revision:"}% %REVINFO2%' rel='nofollow'>%MAKETEXT{"Revision"}% %REVTITLE1%</a></b>%TMPL:END% %TMPL:DEF{"header:right"}%%REVINFO1%%TMPL:END% |