Add indexpages option

This is the easy part of supporting foo/index.mdwn sources for page foo.

Note that if foo.mdwn exists too, there will be a warning about multiple
sources for the same page, and which is used is indeterminate.

indexpages should also cause web based editing to create index source pages
by default; this and other fallout of the option not yet implemented.
master
Joey Hess 2008-09-29 17:30:30 -04:00
parent 1f1867a6fc
commit a9d7c5453a
3 changed files with 13 additions and 0 deletions

View File

@ -198,6 +198,13 @@ sub getsetup () { #{{{
safe => 0, # changing requires manual transition safe => 0, # changing requires manual transition
rebuild => 1, rebuild => 1,
}, },
indexpages => {
type => "boolean",
defualt => 0,
description => "use page/index.mdwn source files",
safe => 1,
rebuild => 1,
},
discussion => { discussion => {
type => "boolean", type => "boolean",
default => 1, default => 1,
@ -619,6 +626,9 @@ sub pagename ($) { #{{{
my $type=pagetype($file); my $type=pagetype($file);
my $page=$file; my $page=$file;
$page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension}; $page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension};
if ($config{indexpages} && $page=~/(.*)\/index$/) {
$page=$1;
}
return $page; return $page;
} #}}} } #}}}

2
debian/changelog vendored
View File

@ -25,6 +25,8 @@ ikiwiki (2.66) UNRELEASED; urgency=low
page, and is preserved across rebuilds. page, and is preserved across rebuilds.
* editpage: Be more aggressive (and less buggy) about cleaning up * editpage: Be more aggressive (and less buggy) about cleaning up
temporary files rendered during page preview. temporary files rendered during page preview.
* Add an indexpages option, which causes foo/index.mdwn to be the source
for page foo when foo.mdwn doesn't exist. Closes: #474611
-- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400 -- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400

View File

@ -14,6 +14,7 @@ use IkiWiki::Setup::Standard {
syslog => 0, syslog => 0,
userdir => "users", userdir => "users",
usedirs => 0, usedirs => 0,
indexpages => 1,
prefix_directives => 1, prefix_directives => 1,
add_plugins => [qw{goodstuff version haiku polygen fortune}], add_plugins => [qw{goodstuff version haiku polygen fortune}],
} }