summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-04-15 17:38:13 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-04-15 17:38:13 -0400
commitd63e043f0abf642ff4048cc20c6caf03db3e55fb (patch)
tree888d018126f548b9627bd3b61d8cb4477098bf83 /IkiWiki/Plugin
parentd7c164dbf29ef57f8ed2963985bd250acbef96df (diff)
allow sidebar directive to enable use of sidebar page
This way, the example blog always has a sidebar on the index page, but not the overhead of sidebars on all the other pages. And if a user wants to, they can enable global_sidebars to switch to sidebars on every page.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/sidebar.pm33
1 files changed, 18 insertions, 15 deletions
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 1b302dcf9..f706480ca 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -23,7 +23,7 @@ sub getsetup () {
global_sidebars => {
type => "boolean",
examples => 1,
- description => "show sidebar page on all pages?"
+ description => "show sidebar page on all pages?",
safe => 1,
rebuild => 1,
},
@@ -36,20 +36,22 @@ sub preprocess (@) {
my $content=shift;
shift;
- if (! defined $content) {
- error(gettext("sidebar content not specified"));
- }
-
my $page=$params{page};
return "" unless $page eq $params{destpage};
- my $file = $pagesources{$page};
- my $type = pagetype($file);
-
- $pagesidebar{$page}=
- IkiWiki::htmlize($page, $page, $type,
- IkiWiki::linkify($page, $page,
- IkiWiki::preprocess($page, $page,
- IkiWiki::filter($page, $page, $content))));
+
+ if (! defined $content) {
+ $pagesidebar{$page}=undef;
+ }
+ else {
+ my $file = $pagesources{$page};
+ my $type = pagetype($file);
+
+ $pagesidebar{$page}=
+ IkiWiki::htmlize($page, $page, $type,
+ IkiWiki::linkify($page, $page,
+ IkiWiki::preprocess($page, $page,
+ IkiWiki::filter($page, $page, $content))));
+ }
return "";
}
@@ -60,9 +62,10 @@ my $oldcontent;
sub sidebar_content ($) {
my $page=shift;
- return $pagesidebar{$page} if exists $pagesidebar{$page};
+ return $pagesidebar{$page} if defined $pagesidebar{$page};
- return if defined $config{global_sidebars} && !$config{global_sidebars};
+ return if ! exists $pagesidebar{$page} &&
+ defined $config{global_sidebars} && ! $config{global_sidebars};
my $sidebar_page=bestlink($page, "sidebar") || return;
my $sidebar_file=$pagesources{$sidebar_page} || return;