* Patch from Ethan Glasser Camp to add a skip option to the inline plugin.

master
joey 2006-11-08 20:39:48 +00:00
parent 68f84e12f2
commit 6e1986cf12
5 changed files with 11 additions and 18 deletions

View File

@ -72,6 +72,10 @@ sub preprocess_inline (@) { #{{{
return "unknown sort type $params{sort}"; return "unknown sort type $params{sort}";
} }
if (exists $params{skip}) {
@list=@list[$params{skip} .. scalar @list - 1];
}
if ($params{show} && @list > $params{show}) { if ($params{show} && @list > $params{show}) {
@list=@list[0..$params{show} - 1]; @list=@list[0..$params{show} - 1];
} }

3
debian/changelog vendored
View File

@ -5,8 +5,9 @@ ikiwiki (1.33) UNRELEASED; urgency=low
ikiwiki. ikiwiki.
* Enable utf8 file IO in aggregate plugin. * Enable utf8 file IO in aggregate plugin.
* Fix some issues with the new registration form. * Fix some issues with the new registration form.
* Patch from Ethan Glasser Camp to add a skip option to the inline plugin.
-- Joey Hess <joeyh@debian.org> Wed, 8 Nov 2006 15:13:40 -0500 -- Joey Hess <joeyh@debian.org> Wed, 8 Nov 2006 15:39:16 -0500
ikiwiki (1.32) unstable; urgency=low ikiwiki (1.32) unstable; urgency=low

View File

@ -1,16 +0,0 @@
This addresses [[todo/skip_option_for_inline_plugin]].
diff -urx .svn ikiwiki-orig/IkiWiki/Plugin/inline.pm ikiwiki/IkiWiki/Plugin/inline.pm
--- ikiwiki-orig/IkiWiki/Plugin/inline.pm 2006-11-08 01:02:33.000000000 -0500
+++ ikiwiki/IkiWiki/Plugin/inline.pm 2006-11-08 15:08:04.000000000 -0500
@@ -72,6 +72,10 @@
return "unknown sort type $params{sort}";
}
+ if (exists $params{skip}) {
+ @list=@list[$params{skip} .. scalar @list - 1];
+
+ }
if ($params{show} && @list > $params{show}) {
@list=@list[0..$params{show} - 1];
}

View File

@ -18,6 +18,8 @@ directive:
* `show` - Specify the maximum number of matching pages to inline. * `show` - Specify the maximum number of matching pages to inline.
Default is 10, unless archiving, when the default is to show all. Default is 10, unless archiving, when the default is to show all.
Set to 0 to show all matching pages. Set to 0 to show all matching pages.
* `skip` - Specify a number of pages to skip displaying. Can be useful
to produce a feed that only shows archived pages.
* `rss` - controls generation of an rss feed. On by default if the wiki is * `rss` - controls generation of an rss feed. On by default if the wiki is
configured to use rss feeds, set to "no" to disable. configured to use rss feeds, set to "no" to disable.
* `atom` - controls generation of an atom feed. On by default if the wiki is * `atom` - controls generation of an atom feed. On by default if the wiki is

View File

@ -3,4 +3,6 @@ How about a skip option for [[plugins/inline]]? This would allow things like th
\[[inline pages="news/*" show="5"]] \[[inline pages="news/*" show="5"]]
\[[inline pages="news/*" skip="5" show="5" archive="yes"]] \[[inline pages="news/*" skip="5" show="5" archive="yes"]]
> I just wrote a patch. [[patchqueue/skip_option_for_inline_plugin]] --Ethan > I just wrote a patch. [[patchqueue/skip_option_for_inline_plugin]] --Ethan
[[todo/done]] --[[Joey]]