X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/de3657747ab2b1fed00557497f3bf6531fd0b3ce..965afd875cd168713e9351d3c4c992c31f0bea0a:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index a89b24bb7..e59051860 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -167,9 +167,10 @@ sub isinlinableimage ($) {
 	$file=~/\.(png|gif|jpg|jpeg)$/;
 }
 
-sub htmllink ($$) {
+sub htmllink {
 	my $page=shift;
 	my $link=shift;
+	my $noimagelink=shift;
 
 	my $bestlink=bestlink($page, $link);
 
@@ -188,7 +189,7 @@ sub htmllink ($$) {
 	
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
-	if (isinlinableimage($bestlink)) {
+	if (! $noimagelink && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\">";
 	}
 	return "<a href=\"$bestlink\">$link</a>";
@@ -373,15 +374,13 @@ sub rcs_recentchanges ($) {
 	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;
 
-		# FIXME: currently assumes that the wiki is under trunk in
-		# svn.
-		my ($svn_base)=$svn_url=~m!(/trunk/.*)!;
+		# FIXME: currently assumes that the wiki is somewhere
+		# under trunk in svn, doesn't support other layouts.
+		my ($svn_base)=$svn_url=~m!(/trunk(?:/.*)?)$!;
 		
 		my $div=qr/^--------------------+$/;
 		my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
@@ -397,8 +396,8 @@ sub rcs_recentchanges ($) {
 				$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';
@@ -406,7 +405,7 @@ sub rcs_recentchanges ($) {
 			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';
@@ -646,12 +645,10 @@ sub cgi () {
 		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 ".
-			       htmllink("index", $change->{user}).
+			       htmllink("", $change->{user}, 1).
 			       ": <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"),
+		      $q->end_hi,
 		      $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"),
+		      $q->end_hi,
 		      $q->start_form(-action => $action),
 		      $q->hidden('do'),
 		      $q->hidden('page'),