]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/relativedate.pm
bugfix
[git.ikiwiki.info.git] / IkiWiki / Plugin / relativedate.pm
index d9d8f7776c18ace866eaef44a690844b5793b556..fe8ef09013e0d888fcf7ff879715dfe8020e1842 100644 (file)
@@ -4,48 +4,49 @@ package IkiWiki::Plugin::relativedate;
 use warnings;
 no warnings 'redefine';
 use strict;
-use IkiWiki 2.00;
-use POSIX;
+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;
        
-       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+       return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
                '" type="text/javascript" charset="utf-8"></script>'."\n".
-               '<script src="'.urlto("relativedate.js", $page, $absolute).
+               '<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute).
                '" type="text/javascript" charset="utf-8"></script>';
-} #}}}
+}
 
-sub display ($;$) { #{{{
+sub mydisplaytime ($;$$) {
        my $time=shift;
        my $format=shift;
+       my $pubdate=shift;
 
        # This needs to be in a form that can be parsed by javascript.
        # Being fairly human readable is also nice, as it will be exposed
@@ -53,8 +54,16 @@ sub display ($;$) { #{{{
        my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
                        localtime($time)));
 
-       return '<span class="date" title="'.$gmtime.'">'.
-               IkiWiki::formattime($time, $format).'</span>';
-} #}}}
+       my $mid=' class="relativedate" title="'.$gmtime.'">'.
+               IkiWiki::formattime($time, $format);
+
+       if ($config{html5}) {
+               return '<time datetime="'.IkiWiki::date_3339($time).'"'.
+                       ($pubdate ? ' pubdate' : '').$mid.'</time>';
+       }
+       else {
+               return '<span'.$mid.'</span>';
+       }
+}
 
 1