projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
up
[ikiwiki.git]
/
ikiwiki
diff --git
a/ikiwiki
b/ikiwiki
index a9f3b8c51ea5a349cd1ca6c3b61d31f1550a0d7e..e590518607927001c9ccd2a541372890a867dbd5 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) if length
$1;
}
elsif ($state eq 'header' && /^$/) {
$state='body';
}
elsif ($state eq 'header' && /^$/) {
$state='body';
@@
-406,7
+405,7
@@
sub rcs_recentchanges ($) {
elsif ($state eq 'body' && /$div/) {
push @ret, { rev => $rev, user => $user,
when => $when, message => $message,
elsif ($state eq 'body' && /$div/) {
push @ret, { rev => $rev, user => $user,
when => $when, message => $message,
- pages => [@pages] };
+ pages => [@pages] }
if @pages
;
return @ret if @ret >= $num;
$state='header';
return @ret if @ret >= $num;
$state='header';
@@
-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("", $_, 1) } @{$change->{pages}});
$list.="<br>\n";
$list.="changed ".$change->{when}." by ".
$list.="<br>\n";
$list.="changed ".$change->{when}." by ".
- htmllink("
index", $change->{user}
).
+ htmllink("
", $change->{user}, 1
).
": <i>".$change->{message}."</i>\n";
$list.="</li>\n";
}
": <i>".$change->{message}."</i>\n";
$list.="</li>\n";
}
@@
-704,6
+701,7
@@
sub cgi () {
print $q->header,
$q->start_html("Creating $page"),
$q->start_h1("<a href=\"$url\">$wikiname</a>/ Creating $page"),
print $q->header,
$q->start_html("Creating $page"),
$q->start_h1("<a href=\"$url\">$wikiname</a>/ Creating $page"),
+ $q->end_hi,
$q->start_form(-action => $action),
$q->hidden('do'),
"Select page location:",
$q->start_form(-action => $action),
$q->hidden('do'),
"Select page location:",
@@
-731,6
+729,7
@@
sub cgi () {
print $q->header,
$q->start_html("Editing $page"),
$q->h1("<a href=\"$url\">$wikiname</a>/ Editing $page"),
print $q->header,
$q->start_html("Editing $page"),
$q->h1("<a href=\"$url\">$wikiname</a>/ Editing $page"),
+ $q->end_hi,
$q->start_form(-action => $action),
$q->hidden('do'),
$q->hidden('page'),
$q->start_form(-action => $action),
$q->hidden('do'),
$q->hidden('page'),