diff options
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 7 | ||||
| -rw-r--r-- | basewiki/blog.mdwn | 6 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/bugs.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo.mdwn | 2 |
5 files changed, 15 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 110410abc..03471668c 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -35,6 +35,9 @@ sub preprocess_inline (@) { #{{{ if (! exists $params{show} && $params{archive} eq "no") { $params{show}=10; } + if (! exists $params{rss}) { + $params{rss}="yes"; + } # Avoid nested inlines, to avoid loops etc. if ($processing_inline) { @@ -68,7 +71,7 @@ sub preprocess_inline (@) { #{{{ } $ret.=$formtemplate->output; } - elsif ($config{rss}) { + elsif ($config{rss} && $params{rss} eq "yes")) { # Add a rss link button. my $linktemplate=template("rsslink.tmpl", blind_cache => 1); $linktemplate->param(rssurl => rsspage(basename($params{page}))); @@ -105,7 +108,7 @@ sub preprocess_inline (@) { #{{{ # TODO: should really add this to renderedfiles and call # check_overwrite, but currently renderedfiles # only supports listing one file per page. - if ($config{rss}) { + if ($config{rss} && $params{rss} eq "yes") { writefile(rsspage($params{page}), $config{destdir}, genrss($params{page}, @list)); $toping{$params{page}}=1 unless $config{rebuild}; diff --git a/basewiki/blog.mdwn b/basewiki/blog.mdwn index df69c9fae..1993f3720 100644 --- a/basewiki/blog.mdwn +++ b/basewiki/blog.mdwn @@ -7,10 +7,14 @@ Any pages that match the specified [[GlobList]] (in the example, any [[SubPage]] of "blog") will be part of the blog, and the newest 10 of them will appear in the page. -The optional `rootpage` setting tells the wiki that new posts to this blog +The optional `rootpage` parameter tells the wiki that new posts to this blog should default to being [[SubPage]]s of "blog", and enables a form at the top of the blog that can be used to add new items. +There is also an optional `rss` parameter that can control whether an RSS +feed is generated. The default is to generate an RSS feed, if the wiki is +globally configured to do so, but you can set `rss=no` to disable this. + If you want your blog to have an archive page listing every post ever made to it, you can accomplish that like this: diff --git a/debian/changelog b/debian/changelog index 2a3418fb0..9e183576b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ ikiwiki (1.13) UNRELEASED; urgency=low given type. * Add a savestate hook. * Don't put blog post forms on pages if there's no cgiurl set. - * Reformat front page. * --setup --refresh no longer rebuilds wrappers. Use --setup --refresh --wrappers to do that. * Add %IkiWiki::forcerebuild to provide a way for plugins like aggregate @@ -23,8 +22,10 @@ ikiwiki (1.13) UNRELEASED; urgency=low * Title metadata of inlined pages now shows up in blogs and rss feeds. * Fix issue with unicode filenames and updating the hyper estradier search index. (Aka Please Please Please, let that be the last one.) + * Patch from Roland Mas to support an rss=no parameter to inline directives. + Closes: #380743 - -- Joey Hess <joeyh@debian.org> Sun, 30 Jul 2006 21:18:16 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 1 Aug 2006 16:00:58 -0400 ikiwiki (1.12) unstable; urgency=low diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn index 9fe267a96..c4895cb7b 100644 --- a/doc/bugs.mdwn +++ b/doc/bugs.mdwn @@ -6,4 +6,4 @@ This is ikiwiki's bug list. Link bugs to [[bugs/done]] when done. # Full list of open bugs: -[[inline pages="bugs/* !bugs/done !link(bugs/done) !*/Discussion" archive="yes"]] +[[inline pages="bugs/* !bugs/done !link(bugs/done) !*/Discussion" archive="yes" rss="no"]] diff --git a/doc/todo.mdwn b/doc/todo.mdwn index 3caa4a88e..b89d2cdf0 100644 --- a/doc/todo.mdwn +++ b/doc/todo.mdwn @@ -6,4 +6,4 @@ Welcome to ikiwiki's todo list. Link items to [[todo/done]] when done. # Full list of open items: -[[inline pages="todo/* !todo/done !link(todo/done) !*/Discussion" archive="yes"]] +[[inline pages="todo/* !todo/done !link(todo/done) !*/Discussion" archive="yes" rss="no"]] |