X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a547d2685866898665fad221939b0b820a42a088..9257381e8d6e0ec18eac699e22aca63873859e32:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1e11d34e2..d20a3709c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -238,6 +238,7 @@ sub getsetup () {
 		type => "boolean",
 		default => 0,
 		description => "generate HTML5? (experimental)",
+		advanced => 1,
 		safe => 1,
 		rebuild => 1,
 	},
@@ -997,10 +998,18 @@ sub abs2rel ($$) {
 	return $ret;
 }
 
-sub displaytime ($;$) {
+sub displaytime ($;$$) {
 	# Plugins can override this function to mark up the time to
 	# display.
-	return '<span class="date">'.formattime(@_).'</span>';
+	my $time=formattime($_[0], $_[1]);
+	if ($config{html5}) {
+		return '<time datetime="'.date_3339($_[0]).'"'.
+			($_[2] ? ' pubdate' : '').
+			'>'.$time.'</time>';
+	}
+	else {
+		return '<span class="date">'.$time.'</span>';
+	}
 }
 
 sub formattime ($;$) {
@@ -1016,6 +1025,16 @@ sub formattime ($;$) {
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
 }
 
+sub date_3339 ($) {
+	my $time=shift;
+
+	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+	POSIX::setlocale(&POSIX::LC_TIME, "C");
+	my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
+	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+	return $ret;
+}
+
 sub beautify_urlpath ($) {
 	my $url=shift;
 
@@ -1723,21 +1742,29 @@ sub template ($;@) {
 
 sub misctemplate ($$;@) {
 	my $title=shift;
-	my $pagebody=shift;
+	my $content=shift;
 	
-	my $template=template("misc.tmpl");
+	my $template=template("misc.tmpl") || template("page.tmpl");
+
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $template);
+	});
+
 	$template->param(
 		title => $title,
-		indexlink => indexlink(),
 		wikiname => $config{wikiname},
-		pagebody => $pagebody,
+		content => $content,
 		baseurl => baseurl(),
 		html5 => $config{html5},
+		have_actions => 0, # force off
+		searchform => 0,   # ditto
+		parentlinks => [{  # override
+			url => $config{url},
+			page => $config{wikiname},
+		}],
 		@_,
 	);
-	run_hooks(pagetemplate => sub {
-		shift->(page => "", destpage => "", template => $template);
-	});
+
 	return $template->output;
 }