diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-12 03:48:50 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-12 03:48:50 +0000 |
commit | 8ddbcbf18467e702fe32be7de0f125677d3251ce (patch) | |
tree | 3b803e741305c0e9ad68897f5edea436278877da | |
parent | e622b275c576ff4939cada803b07eaa372119218 (diff) |
improve message
-rwxr-xr-x | ikiwiki | 6 | ||||
-rw-r--r-- | templates/recentchanges.tmpl | 10 |
2 files changed, 11 insertions, 5 deletions
@@ -407,7 +407,7 @@ sub rcs_recentchanges ($) { #{{{ my $div=qr/^--------------------+$/; my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/; my $state='start'; - my ($rev, $user, $when, @pages, $message); + my ($rev, $user, $when, @pages, @message); foreach (`LANG=C svn log -v '$svn_url'`) { chomp; if ($state eq 'start' && /$div/) { @@ -427,7 +427,7 @@ sub rcs_recentchanges ($) { #{{{ } elsif ($state eq 'body' && /$div/) { push @ret, { rev => $rev, user => $user, - when => $when, message => $message, + when => $when, message => [@message], pages => [@pages] } if @pages; return @ret if @ret >= $num; @@ -436,7 +436,7 @@ sub rcs_recentchanges ($) { #{{{ @pages=(); } elsif ($state eq 'body') { - $message.="$_<br>\n"; + push @message, {line => $_}, } } } diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl index 8433e3ae0..4637906e2 100644 --- a/templates/recentchanges.tmpl +++ b/templates/recentchanges.tmpl @@ -12,11 +12,17 @@ <TMPL_LOOP NAME="CHANGELOG"> <li> <!-- <TMPL_VAR NAME="REV"> --> <TMPL_LOOP NAME="PAGES"> - <TMPL_VAR NAME="LINK"></a> + <TMPL_VAR NAME="LINK"> </TMPL_LOOP> <br> changed <TMPL_VAR NAME="WHEN"> by <TMPL_VAR NAME="USER">: - <i><TMPL_VAR NAME="MESSAGE"></i> + <i> + <TMPL_LOOP NAME="MESSAGE"> + <TMPL_IF NAME="LINE"> + <TMPL_VAR NAME="LINE"><br> + </TMPL_IF> + </TMPL_LOOP> + </i> </li> </TMPL_LOOP> </ul> |