summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/inline.pm8
-rw-r--r--IkiWiki/Plugin/meta.pm6
-rw-r--r--IkiWiki/Plugin/search.pm4
-rw-r--r--IkiWiki/Plugin/tag.pm19
4 files changed, 32 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 08126c4e6..749e39fb6 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -80,7 +80,15 @@ sub preprocess_inline (@) { #{{{
$template->param(content => get_inline_content($params{page}, $page))
if $params{archive} eq "no";
$template->param(ctime => displaytime($pagectime{$page}));
+
+ if (exists $hooks{pagetemplate}) {
+ foreach my $id (keys %{$hooks{pagetemplate}}) {
+ $hooks{pagetemplate}{$id}{call}->($page, $template);
+ }
+ }
+
$ret.=$template->output;
+ $template->clear_params;
}
# TODO: should really add this to renderedfiles and call
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 41d096e0e..d4b4e5db5 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -56,8 +56,10 @@ sub pagetemplate ($$) { #{{{
my $page=shift;
my $template=shift;
- $template->param(meta => $meta{$page}) if exists $meta{$page};
- $template->param(title => $title{$page}) if exists $title{$page};
+ $template->param(meta => $meta{$page})
+ if exists $meta{$page} && $template->query(name => "meta");
+ $template->param(title => $title{$page})
+ if exists $title{$page} && $template->query(name => "title");
} # }}}
1
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 94b37ca06..8931e3fd4 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -32,7 +32,8 @@ sub pagetemplate ($$) { #{{{
my $template=shift;
# Add search box to page header.
- $template->param(searchform => qq{
+ if ($template->query(name => "searchform")) {
+ $template->param(searchform => qq{
<form method="get" action="$IkiWiki::config{cgiurl}" id="searchform">
<div>
<input type="text" name="phrase" value="" size="16" />
@@ -41,6 +42,7 @@ sub pagetemplate ($$) { #{{{
</div>
</form>
});
+ }
} #}}}
sub delete (@) { #{{{
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 841d508bf..a6eddb019 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -6,10 +6,13 @@ use warnings;
use strict;
use IkiWiki;
-my %tag;
+my %tags;
sub import { #{{{
- IkiWiki::hook(type => "preprocess", id => "tag", call => \&preprocess);
+ IkiWiki::hook(type => "preprocess", id => "tag",
+ call => \&preprocess);
+ IkiWiki::hook(type => "pagetemplate", id => "tag",
+ call => \&pagetemplate);
} # }}}
sub preprocess (@) { #{{{
@@ -20,7 +23,9 @@ sub preprocess (@) { #{{{
my $page = $params{page};
delete $params{page};
+ $tags{$page} = [];
foreach my $tag (keys %params) {
+ push @{$tags{$page}}, $tag;
# hidden WikiLink
push @{$IkiWiki::links{$page}}, $tag;
}
@@ -28,4 +33,14 @@ sub preprocess (@) { #{{{
return "";
} # }}}
+sub pagetemplate ($$) { #{{{
+ my $page=shift;
+ my $template=shift;
+
+ $template->param(tags => join(', ',
+ map { IkiWiki::htmllink($page, $page, $_) }
+ @{$tags{$page}}))
+ if exists $tags{$page} && $template->query(name => "tags");
+} # }}}
+
1