]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/relativedate.pm
(no commit message)
[git.ikiwiki.info.git] / IkiWiki / Plugin / relativedate.pm
index f4dba61a4e8e1511dff8cd9053c1c514e321be92..06df2efd58cba5697a20f99be8730bd61a06e702 100644 (file)
@@ -4,36 +4,36 @@ package IkiWiki::Plugin::relativedate;
 use warnings;
 no warnings 'redefine';
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use POSIX;
 use Encode;
 
-sub import { #{{{
+sub import {
        add_underlay("javascript");
        hook(type => "getsetup", id => "relativedate", call => \&getsetup);
        hook(type => "format", id => "relativedate", call => \&format);
-       hook(type => "displaytime", id => "relativedate", call => \&display);
-} # }}}
+       inject(name => "IkiWiki::displaytime", call => \&mydisplaytime);
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+}
 
-sub format (@) { #{{{
+sub format (@) {
         my %params=@_;
 
-       if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
+       if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
                # no </body> tag, probably in preview mode
                $params{content}=include_javascript($params{page}, 1).$params{content};
        }
        return $params{content};
-} # }}}
+}
 
-sub include_javascript ($;$) { #{{{
+sub include_javascript ($;$) {
        my $page=shift;
        my $absolute=shift;
        
@@ -41,9 +41,9 @@ sub include_javascript ($;$) { #{{{
                '" type="text/javascript" charset="utf-8"></script>'."\n".
                '<script src="'.urlto("relativedate.js", $page, $absolute).
                '" type="text/javascript" charset="utf-8"></script>';
-} #}}}
+}
 
-sub display ($;$) { #{{{
+sub mydisplaytime ($;$) {
        my $time=shift;
        my $format=shift;
 
@@ -55,6 +55,6 @@ sub display ($;$) { #{{{
 
        return '<span class="relativedate" title="'.$gmtime.'">'.
                IkiWiki::formattime($time, $format).'</span>';
-} #}}}
+}
 
 1