]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/relativedate.pm
Follow up.
[git.ikiwiki.info.git] / IkiWiki / Plugin / relativedate.pm
index 2895f6d57ecf84876ed0be1de8d07254ab52ca9f..06df2efd58cba5697a20f99be8730bd61a06e702 100644 (file)
@@ -2,34 +2,38 @@
 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);
-} # }}}
+       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;
        
@@ -37,6 +41,20 @@ 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 mydisplaytime ($;$) {
+       my $time=shift;
+       my $format=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
+       # as the title if javascript is not available.
+       my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
+                       localtime($time)));
+
+       return '<span class="relativedate" title="'.$gmtime.'">'.
+               IkiWiki::formattime($time, $format).'</span>';
+}
 
 1