Merge branch 'ready/tag-test' into transient-tag

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 62f030f4eda9dd384b5127a0656eebc0170d6120..fd5ce1e8a91488ce5d5b20709001fd3d177def97 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -55,6 +55,17 @@ sub taglink ($) {
        return $tag;
 }
 
        return $tag;
 }
 

+# Returns a tag name from a tag link
+sub tagname ($) {
+       my $tag=shift;
+       if (defined $config{tagbase}) {
+               $tag =~ s!^/\Q$config{tagbase}\E/!!;
+       } else {
+               $tag =~ s!^\.?/!!;
+       }
+       return pagetitle($tag, 1);
+}
+

 sub htmllink_tag ($$$;@) {
        my $page=shift;
        my $destpage=shift;
 sub htmllink_tag ($$$;@) {
        my $page=shift;
        my $destpage=shift;


@@ -84,13 +95,13 @@ sub gentag ($) {
                        debug($message);
 
                        my $template=template("autotag.tmpl");
                        debug($message);
 
                        my $template=template("autotag.tmpl");

-                       $template->param(tagname => IkiWiki::basename($tag));
+                       $template->param(tagname => tagname($tag));

                        $template->param(tag => $tag);
                        writefile($tagfile, $config{srcdir}, $template->output);
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_add($tagfile);
                        $template->param(tag => $tag);
                        writefile($tagfile, $config{srcdir}, $template->output);
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_add($tagfile);

-                               IkiWiki::rcs_commit_staged($message, undef, undef);
+                               IkiWiki::rcs_commit_staged(message => $message);

                                IkiWiki::enable_commit_hook();
                        }
                });
                                IkiWiki::enable_commit_hook();
                        }
                });


@@ -154,14 +165,15 @@ sub pagetemplate (@) {
 
        $template->param(tags => [
                map { 
 
        $template->param(tags => [
                map { 

-                       link => htmllink_tag($page, $destpage, $_, rel => "tag")
+                       link => htmllink_tag($page, $destpage, $_,
+                                       rel => "tag", linktext => tagname($_))

                }, sort keys %$tags
        ]) if defined $tags && %$tags && $template->query(name => "tags");
 
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.
                if (defined $tags && %$tags) {
                }, sort keys %$tags
        ]) if defined $tags && %$tags && $template->query(name => "tags");
 
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.
                if (defined $tags && %$tags) {

-                       $template->param(categories => [map { category => $_ },
+                       $template->param(categories => [map { category => tagname($_) },

                                sort keys %$tags]);
                }
        }
                                sort keys %$tags]);
                }
        }