X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/edfe8693814ef48426dc35fa76cdd145871fbc96..db146d9f1e70b69b13b02b7484027b288de5decf:/IkiWiki/Plugin/tag.pm diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index b0a0e53be..158657507 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -10,6 +10,7 @@ my %tags; sub import { #{{{ hook(type => "getopt", id => "tag", call => \&getopt); + hook(type => "getsetup", id => "tag", call => \&getsetup); hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1); hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1); hook(type => "pagetemplate", id => "tag", call => \&pagetemplate); @@ -22,11 +23,25 @@ sub getopt () { #{{{ GetOptions("tagbase=s" => \$config{tagbase}); } #}}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, + tagbase => { + type => "string", + example => "tag", + description => "parent page tags are located under", + safe => 1, + rebuild => 1, + }, +} #}}} + sub tagpage ($) { #{{{ my $tag=shift; if ($tag !~ m{^\.?/} && - exists $config{tagbase} && defined $config{tagbase}) { $tag=$config{tagbase}."/".$tag; } @@ -34,6 +49,21 @@ sub tagpage ($) { #{{{ return $tag; } #}}} +sub taglink ($$$;@) { #{{{ + my $page=shift; + my $destpage=shift; + my $tag=shift; + my %opts=@_; + + my $link=tagpage($tag); + + # Force tag creation links to create the tag under /tagbase, + # if there is a tagbase and this tag used it. + $link="/".$link if $tag ne $link; + + return htmllink($page, $destpage, $link, %opts); +} #}}} + sub preprocess_tag (@) { #{{{ if (! @_) { return ""; @@ -45,7 +75,7 @@ sub preprocess_tag (@) { #{{{ delete $params{preview}; foreach my $tag (keys %params) { - $tag=IkiWiki::linkpage($tag); + $tag=linkpage($tag); $tags{$page}{$tag}=1; # hidden WikiLink push @{$links{$page}}, tagpage($tag); @@ -61,19 +91,17 @@ sub preprocess_taglink (@) { #{{{ my %params=@_; return join(" ", map { if (/(.*)\|(.*)/) { - my $tag=IkiWiki::linkpage($2); + my $tag=linkpage($2); $tags{$params{page}}{$tag}=1; push @{$links{$params{page}}}, tagpage($tag); - return htmllink($params{page}, $params{destpage}, - tagpage($tag), - linktext => IkiWiki::pagetitle($1)); + return taglink($params{page}, $params{destpage}, $tag, + linktext => pagetitle($1)); } else { - my $tag=IkiWiki::linkpage($_); + my $tag=linkpage($_); $tags{$params{page}}{$tag}=1; push @{$links{$params{page}}}, tagpage($tag); - return htmllink($params{page}, $params{destpage}, - tagpage($tag)); + return taglink($params{page}, $params{destpage}, $tag); } } grep { @@ -89,8 +117,7 @@ sub pagetemplate (@) { #{{{ $template->param(tags => [ map { - link => htmllink($page, $destpage, tagpage($_), - rel => "tag") + link => taglink($page, $destpage, $_, rel => "tag") }, sort keys %{$tags{$page}} ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");