projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
recentchanges
[ikiwiki.git]
/
ikiwiki
diff --git
a/ikiwiki
b/ikiwiki
index a9f3b8c51ea5a349cd1ca6c3b61d31f1550a0d7e..b9acc10b5117f5233b5e6e96bad06a29c8f834db 100755
(executable)
--- a/
ikiwiki
+++ b/
ikiwiki
@@
-167,9
+167,10
@@
sub isinlinableimage ($) {
$file=~/\.(png|gif|jpg|jpeg)$/;
}
$file=~/\.(png|gif|jpg|jpeg)$/;
}
-sub htmllink
($$)
{
+sub htmllink {
my $page=shift;
my $link=shift;
my $page=shift;
my $link=shift;
+ my $noimagelink=shift;
my $bestlink=bestlink($page, $link);
my $bestlink=bestlink($page, $link);
@@
-188,7
+189,7
@@
sub htmllink ($$) {
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
- if (isinlinableimage($bestlink)) {
+ if (
! $noimagelink &&
isinlinableimage($bestlink)) {
return "<img src=\"$bestlink\">";
}
return "<a href=\"$bestlink\">$link</a>";
return "<img src=\"$bestlink\">";
}
return "<a href=\"$bestlink\">$link</a>";
@@
-373,8
+374,6
@@
sub rcs_recentchanges ($) {
eval q{use Date::Parse};
eval q{use Time::Duration};
eval q{use Date::Parse};
eval q{use Time::Duration};
- my %sourcepages=reverse %pagesources;
-
if (-d "$srcdir/.svn") {
my $info=`LANG=C svn info $srcdir`;
my ($svn_url)=$info=~/^URL: (.*)$/m;
if (-d "$srcdir/.svn") {
my $info=`LANG=C svn info $srcdir`;
my ($svn_url)=$info=~/^URL: (.*)$/m;
@@
-397,8
+396,8
@@
sub rcs_recentchanges ($) {
$user=$2;
$when=concise(ago(time - str2time($3)));
}
$user=$2;
$when=concise(ago(time - str2time($3)));
}
- elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E(.+)$/) {
- push @pages,
$1
;
+ elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E
\/
(.+)$/) {
+ push @pages,
pagename($1)
;
}
elsif ($state eq 'header' && /^$/) {
$state='body';
}
elsif ($state eq 'header' && /^$/) {
$state='body';
@@
-646,12
+645,10
@@
sub cgi () {
my $list="<ul>\n";
foreach my $change (rcs_recentchanges(100)) {
$list.="<li>";
my $list="<ul>\n";
foreach my $change (rcs_recentchanges(100)) {
$list.="<li>";
- foreach my $page (@{$change->{pages}}) {
- $list.=$page." ";
- }
+ $list.=join(", ", map { htmllink("index", $_, 1) } @{$change->{pages}});
$list.="<br>\n";
$list.="changed ".$change->{when}." by ".
$list.="<br>\n";
$list.="changed ".$change->{when}." by ".
- htmllink("index", $change->{user}).
+ htmllink("index", $change->{user}
, 1
).
": <i>".$change->{message}."</i>\n";
$list.="</li>\n";
}
": <i>".$change->{message}."</i>\n";
$list.="</li>\n";
}