urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Patch from Roland Mas to support an rss=no parameter to inline directives. 

Closes: #380743
master
joey 2006-08-01 20:08:42 +00:00
parent 845d120a90
commit 53d81ebcd6
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki/Plugin/inline.pm
View File

@ -35,6 +35,9 @@ sub preprocess_inline (@) { #{{{
if (! exists $params{show} && $params{archive} eq "no") { if (! exists $params{show} && $params{archive} eq "no") {
$params{show}=10; $params{show}=10;
} }
if (! exists $params{rss}) {
$params{rss}="yes";
}
# Avoid nested inlines, to avoid loops etc. # Avoid nested inlines, to avoid loops etc.
if ($processing_inline) { if ($processing_inline) {
@ -68,7 +71,7 @@ sub preprocess_inline (@) { #{{{
} }
$ret.=$formtemplate->output; $ret.=$formtemplate->output;
} }
elsif ($config{rss}) { elsif ($config{rss} && $params{rss} eq "yes")) {
# Add a rss link button. # Add a rss link button.
my $linktemplate=template("rsslink.tmpl", blind_cache => 1); my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
$linktemplate->param(rssurl => rsspage(basename($params{page}))); $linktemplate->param(rssurl => rsspage(basename($params{page})));
@ -105,7 +108,7 @@ sub preprocess_inline (@) { #{{{
# TODO: should really add this to renderedfiles and call # TODO: should really add this to renderedfiles and call
# check_overwrite, but currently renderedfiles # check_overwrite, but currently renderedfiles
# only supports listing one file per page. # only supports listing one file per page.
if ($config{rss}) { if ($config{rss} && $params{rss} eq "yes") {
writefile(rsspage($params{page}), $config{destdir}, writefile(rsspage($params{page}), $config{destdir},
genrss($params{page}, @list)); genrss($params{page}, @list));
$toping{$params{page}}=1 unless $config{rebuild}; $toping{$params{page}}=1 unless $config{rebuild};

6
basewiki/blog.mdwn
View File

@ -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 [[SubPage]] of "blog") will be part of the blog, and the newest 10
of them will appear in the page. 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 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. 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 If you want your blog to have an archive page listing every post ever made
to it, you can accomplish that like this: to it, you can accomplish that like this:

5
debian/changelog vendored
View File

@ -6,7 +6,6 @@ ikiwiki (1.13) UNRELEASED; urgency=low
given type. given type.
* Add a savestate hook. * Add a savestate hook.
* Don't put blog post forms on pages if there's no cgiurl set. * 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 * --setup --refresh no longer rebuilds wrappers. Use --setup --refresh
--wrappers to do that. --wrappers to do that.
* Add %IkiWiki::forcerebuild to provide a way for plugins like aggregate * 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. * Title metadata of inlined pages now shows up in blogs and rss feeds.
* Fix issue with unicode filenames and updating the hyper estradier search * Fix issue with unicode filenames and updating the hyper estradier search
index. (Aka Please Please Please, let that be the last one.) 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 ikiwiki (1.12) unstable; urgency=low

2
doc/bugs.mdwn
View File

@ -6,4 +6,4 @@ This is ikiwiki's bug list. Link bugs to [[bugs/done]] when done.
# Full list of open bugs: # 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"]]

2
doc/todo.mdwn
View File

@ -6,4 +6,4 @@ Welcome to ikiwiki's todo list. Link items to [[todo/done]] when done.
# Full list of open items: # 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"]]