update

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

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 06df2efd58cba5697a20f99be8730bd61a06e702..fe8ef09013e0d888fcf7ff879715dfe8020e1842 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -5,7 +5,7 @@ use warnings;
 no warnings 'redefine';
 use strict;
 use IkiWiki 3.00;
 no warnings 'redefine';
 use strict;
 use IkiWiki 3.00;

-use POSIX;
+use POSIX ();

 use Encode;
 
 sub import {
 use Encode;
 
 sub import {


@@ -37,15 +37,16 @@ sub include_javascript ($;$) {
        my $page=shift;
        my $absolute=shift;
        
        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".
                '" 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>';
 }
 
                '" type="text/javascript" charset="utf-8"></script>';
 }
 

-sub mydisplaytime ($;$) {
+sub mydisplaytime ($;$$) {

        my $time=shift;
        my $format=shift;
        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
 
        # 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 mydisplaytime ($;$) {
        my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
                        localtime($time)));
 
        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>';
+       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
 }
 
 1