Correctly handle filenames starting with a dash in add/rm/mv.

[git.ikiwiki.info.git] / IkiWiki / Plugin / relativedate.pm
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm

index d9d8f7776c18ace866eaef44a690844b5793b556..4ae0be8615852db38222ebd892fd5c216bd5b4bf 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -4,57 +4,68 @@ package IkiWiki::Plugin::relativedate;
  use warnings;
  no warnings 'redefine';
  use strict;
  use warnings;
  no warnings 'redefine';
  use strict;
-use IkiWiki 2.00;
-use POSIX;
+use IkiWiki 3.00;
+use POSIX ();
  use Encode;
  
  use Encode;
  
-sub import { #{{{
+sub import {
         add_underlay("javascript");
         hook(type => "getsetup", id => "relativedate", call => \&getsetup);
         hook(type => "format", id => "relativedate", call => \&format);
         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,
                 },
         return
                 plugin => {
                         safe => 1,
                         rebuild => 1,
                 },
-} #}}}
+}
  
  
-sub format (@) { #{{{
+sub format (@) {
          my %params=@_;
  
          my %params=@_;
  
-       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};
+       if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
+               # no <body> tag, probably in preview mode
+               $params{content}=include_javascript(undef).$params{content};
         }
         return $params{content};
         }
         return $params{content};
-} # }}}
+}
  
  
-sub include_javascript ($;$) { #{{{
-       my $page=shift;
-       my $absolute=shift;
+sub include_javascript ($) {
+       my $from=shift;
         
         
-       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+       return '<script src="'.urlto("ikiwiki/ikiwiki.js", $from).
                 '" 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", $from).
                 '" type="text/javascript" charset="utf-8"></script>';
                 '" type="text/javascript" charset="utf-8"></script>';
-} #}}}
+}
  
  
-sub display ($;$) { #{{{
+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.
  
         # 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.
+       # (Being fairly human readable is also nice, as it will be exposed
+       # as the title if javascript is not available.)
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+       POSIX::setlocale(&POSIX::LC_TIME, "C");
         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)));
+       POSIX::setlocale(&POSIX::LC_TIME, $lc_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="pubdate"' : '').$mid.'</time>';
+       }
+       else {
+               return '<span'.$mid.'</span>';
+       }
+}
  
  1
  
  1