From 819a31ed24cfb95da7e37a7524ecf0655e106903 Mon Sep 17 00:00:00 2001 From: joey Date: Mon, 1 May 2006 22:27:37 +0000 Subject: * Rename inlinepage to depends, so that it can be used to refer to more dependency relationships than just inlining. This will require a rebuild on upgrade to this version. * Move the rss link, put it in the blogpost form if there is one and at the top if not. This is both nicer because easier to find, and it cleans up the code which had used inlinepage as a flag for adding the link later. * Allow the depends GlobList to be built up from multiple sources (such as plugins) during a page render. * Which means that more than one blog is now supported to appear on a single page. (With some limitations.) --- ikiwiki | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ikiwiki') diff --git a/ikiwiki b/ikiwiki index 6c157132f..dfb484f64 100755 --- a/ikiwiki +++ b/ikiwiki @@ -9,7 +9,7 @@ use HTML::Template; use lib '.'; # For use without installation, removed by Makefile. use vars qw{%config %links %oldlinks %oldpagemtime %pagectime - %renderedfiles %pagesources %inlinepages}; + %renderedfiles %pagesources %depends}; sub usage () { #{{{ die "usage: ikiwiki [options] source dest\n"; @@ -399,8 +399,8 @@ sub loadindex () { #{{{ $oldpagemtime{$page}=$items{mtime}[0]; $oldlinks{$page}=[@{$items{link}}]; $links{$page}=[@{$items{link}}]; - $inlinepages{$page}=join(" ", @{$items{inlinepage}}) - if exists $items{inlinepage}; + $depends{$page}=join(" ", @{$items{depends}}) + if exists $items{depends}; $renderedfiles{$page}=$items{dest}[0]; } $pagectime{$page}=$items{ctime}[0]; @@ -421,8 +421,8 @@ sub saveindex () { #{{{ "src=$pagesources{$page} ". "dest=$renderedfiles{$page}"; $line.=" link=$_" foreach @{$links{$page}}; - if (exists $inlinepages{$page}) { - $line.=" inlinepage=$_" foreach split " ", $inlinepages{$page}; + if (exists $depends{$page}) { + $line.=" depends=$_" foreach split " ", $depends{$page}; } print OUT $line."\n"; } -- cgit v1.2.3