fix example

[git.ikiwiki.info.git] / IkiWiki / Plugin / sidebar.pm

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 41812e1c1f671da84be1a06a5821695fc5dc6f11..c1146b7b4394c7203f452ef36606c5a51242ea14 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "getsetup", id => "sidebar", call => \&getsetup);
+       hook(type => "preprocess", id => "sidebar", call => \&preprocess);
        hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
 }
 
@@ -19,11 +20,50 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
+               global_sidebars => {
+                       type => "boolean",
+                       example => 1,
+                       description => "show sidebar page on all pages?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+my %pagesidebar;
+
+sub preprocess (@) {
+       my %params=@_;
+
+       my $page=$params{page};
+       return "" unless $page eq $params{destpage};
+       
+       if (! defined $params{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, $params{content})));
+       }
+
+       return "";
 }
 
+my $oldfile;
+my $oldcontent;
+
 sub sidebar_content ($) {
        my $page=shift;
        
+       return delete $pagesidebar{$page} if defined $pagesidebar{$page};
+
+       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;
        my $sidebar_type=pagetype($sidebar_file);
@@ -34,7 +74,16 @@ sub sidebar_content ($) {
                # currently requires a wiki rebuild.
                add_depends($page, $sidebar_page);
 
-               my $content=readfile(srcfile($sidebar_file));
+               my $content;
+               if (defined $oldfile && $sidebar_file eq $oldfile) {
+                       $content=$oldcontent;
+               }
+               else {
+                       $content=readfile(srcfile($sidebar_file));
+                       $oldcontent=$content;
+                       $oldfile=$sidebar_file;
+               }
+
                return unless length $content;
                return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
                       IkiWiki::linkify($sidebar_page, $page,
@@ -47,11 +96,10 @@ sub sidebar_content ($) {
 sub pagetemplate (@) {
        my %params=@_;
 
-       my $page=$params{page};
        my $template=$params{template};
-       
-       if ($template->query(name => "sidebar")) {
-               my $content=sidebar_content($page);
+       if ($params{destpage} eq $params{page} &&
+           $template->query(name => "sidebar")) {
+               my $content=sidebar_content($params{destpage});
                if (defined $content && length $content) {
                        $template->param(sidebar => $content);
                }